diff --git a/Makefile.fips b/Makefile.fips
index ef988fc03855b75aab391f1d1acdfa028287e3eb..7ed8a34f93cb8234385df7f1e6300cfe45fe9844 100644
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -152,6 +152,13 @@ SDIRS=  \
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
+LINKDIRS=  \
+	objects sha hmac des aes modes \
+	bn ec rsa dsa ecdsa dh ecdh dso engine \
+	buffer bio stack lhash rand err \
+	evp asn1 pem x509 x509v3 pkcs7 ocsp ui krb5 \
+	cmac
+
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
 TESTS = alltests
@@ -516,7 +523,8 @@ files:
 links:
 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
 	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-	@set -e; target=links; $(RECURSIVE_BUILD_CMD)
+	$(MAKE) -C fips links
+	SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
 
 gentests:
 	@(cd test && echo "generating dummy tests (if needed)..." && \