diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index 92bff2137..f913221e9 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -67,7 +67,10 @@ check_PROGRAMS = $(TESTS)
 asn1_gen_SOURCES = asn1_gen.c
 asn1_print_SOURCES = asn1_print.c
 if ASN1_TEMPLATING
+asn1_print_SOURCES += $(gen_files_x690sample_template:.x=.c)
 asn1_print_CPPFLAGS = -DASN1_PRINT_SUPPORTED
+else
+asn1_print_SOURCES += $(gen_files_x690sample:.x=.c)
 endif
 check_der_SOURCES = check-der.c check-common.c check-common.h
 
diff --git a/lib/asn1/asn1_print.c b/lib/asn1/asn1_print.c
index 27ea87ad9..08c64b7df 100644
--- a/lib/asn1/asn1_print.c
+++ b/lib/asn1/asn1_print.c
@@ -122,6 +122,11 @@ const struct types {
 #include "pkinit_asn1_syms.x"
 #include "rfc2459_asn1_syms.x"
 #include "rfc4108_asn1_syms.x"
+#ifdef ASN1_PRINT_SUPPORTED
+#include "x690sample_template_asn1_syms.x"
+#else
+#include "x690sample_asn1_syms.x"
+#endif
 };
 
 struct types sorted_types[sizeof(types)/sizeof(types[0])];
diff --git a/lib/asn1/fuzz-inputs/x690sample.der b/lib/asn1/fuzz-inputs/x690sample.der
new file mode 100644
index 000000000..ec1c2c221
--- /dev/null
+++ b/lib/asn1/fuzz-inputs/x690sample.der
@@ -0,0 +1,5 @@
+`…aJohn
PSmith 
+DirectorB
3”
+C19710917¢aMary
TSmith£B1aRalph
TSmith 
+C195711111aSusan
BSmith 
+C19590717
\ No newline at end of file