diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
index 500436723..8ef0b5428 100644
--- a/lib/hx509/Makefile.am
+++ b/lib/hx509/Makefile.am
@@ -36,6 +36,21 @@ gen_files_pkcs10 = 			\
 	asn1_CertificationRequestInfo.x	\
 	asn1_CertificationRequest.x
 
+gen_files_crmf = 			\
+	asn1_CRMFRDNSequence.x		\
+	asn1_CertReqMessages.x		\
+	asn1_CertReqMsg.x		\
+	asn1_CertRequest.x		\
+	asn1_CertTemplate.x		\
+	asn1_Controls.x			\
+	asn1_PBMParameter.x		\
+	asn1_PKMACValue.x		\
+	asn1_POPOPrivKey.x		\
+	asn1_POPOSigningKey.x		\
+	asn1_POPOSigningKeyInput.x	\
+	asn1_ProofOfPossession.x	\
+	asn1_SubsequentMessage.x	
+
 libhx509_la_LIBADD = $(LIB_des) ../asn1/libasn1.la
 
 libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_des)
@@ -64,6 +79,7 @@ libhx509_la_SOURCES = \
 
 $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1_files
 $(gen_files_pkcs10) pkcs10_asn1.h: pkcs10_asn1_files
+$(gen_files_crmf) crmf_asn1.h: crmf_asn1_files
 
 ocsp_asn1_files: $(srcdir)/ocsp.asn1
 	../asn1/asn1_compile$(EXEEXT) --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1)
@@ -71,6 +87,9 @@ ocsp_asn1_files: $(srcdir)/ocsp.asn1
 pkcs10_asn1_files: $(srcdir)/pkcs10.asn1
 	../asn1/asn1_compile$(EXEEXT) --preserve-binary=CertificationRequestInfo $(srcdir)/pkcs10.asn1 pkcs10_asn1 || (rm -f pkcs10_asn1_files ; exit 1)
 
+crmf_asn1_files: $(srcdir)/crmf.asn1
+	../asn1/asn1_compile$(EXEEXT) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
+
 
 $(libhx509_la_OBJECTS): $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h
 
@@ -102,10 +121,12 @@ hxtool_LDFLAGS = -pthread
 EXTRA_DIST = hx509_err.et
 
 CLEANFILES = $(BUILT_SOURCES) \
-	$(gen_files_ocsp) ocsp_asn1_files ocsp_asn1.h\
-	$(gen_files_pkcs10) pkcs10_asn1_files pkcs10_asn1.h\
+	$(gen_files_ocsp) ocsp_asn1_files ocsp_asn1.h \
+	$(gen_files_pkcs10) pkcs10_asn1_files pkcs10_asn1.h \
+	$(gen_files_crmf) crmf_asn1_files crmf_asn1.h \
 	$(TESTS) \
 	hxtool-commands.c hxtool-commands.h *.tmp \
+	request.out \
 	sd.data sd.data.out \
 	ev.data ev.data.out