diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index e731b33f3..cccab6d86 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -93,20 +93,20 @@ asn1_print_LDADD = $(check_der_LDADD)
 
 TESTS = check-der
 
-CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) \
+CLEANFILES = lex.c parse.c parse.h krb5_asn1.h $(BUILT_SOURCES) \
 	$(gen_files) asn1_files
 
-include_HEADERS = asn1.h asn1_err.h der.h
+include_HEADERS = krb5_asn1.h asn1_err.h der.h
 
 $(asn1_compile_OBJECTS): parse.h
 
-$(gen_files) asn1.h: asn1_files
+$(gen_files) krb5_asn1.h: asn1_files
 
 asn1_files: asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
-	./asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
+	./asn1_compile$(EXEEXT) $(srcdir)/k5.asn1 krb5_asn1
 
-$(libasn1_la_OBJECTS): asn1.h asn1_err.h
+$(libasn1_la_OBJECTS): krb5_asn1.h asn1_err.h
 
-$(asn1_print_OBJECTS): asn1.h
+$(asn1_print_OBJECTS): krb5_asn1.h
 
 EXTRA_DIST = asn1_err.et
diff --git a/lib/asn1/libasn1.h b/lib/asn1/libasn1.h
index cda36b18f..53155f2c6 100644
--- a/lib/asn1/libasn1.h
+++ b/lib/asn1/libasn1.h
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "asn1.h"
+#include "krb5_asn1.h"
 #include "der.h"
 #include "asn1_err.h"
 #include <parse_units.h>