diff --git a/Makefile.fips b/Makefile.fips
index 5bc8e9248..8d967b7f2 100644
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -148,7 +148,7 @@ SHLIBDIRS= crypto
 SDIRS=  \
 	sha hmac des aes modes \
 	bn ec rsa dsa ecdsa dh \
-	buffer rand evp ecdh # cmac
+	buffer rand evp ecdh cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -156,7 +156,7 @@ LINKDIRS=  \
 	objects sha hmac des aes modes \
 	bn ec rsa dsa ecdh ecdsa dh engine \
 	buffer bio stack lhash rand err \
-	evp asn1 ui cmac
+	evp asn1 ui
 
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
@@ -301,6 +301,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 	../crypto/bn/bn_word.o \
 	../crypto/bn/bn_x931p.o \
 	../crypto/buffer/buf_str.o \
+	../crypto/cmac/cmac.o \
 	../crypto/cryptlib.o \
 	../crypto/des/cfb64ede.o \
 	../crypto/des/cfb64enc.o \