diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index fb1803de6..369a5e5c1 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -5,103 +5,62 @@ include $(top_srcdir)/Makefile.am.common
 YFLAGS = -d
 
 lib_LTLIBRARIES = libasn1.la
+libasn1_la_LDFLAGS = -version-info 1:0:0
 
-BUILT_SOURCES =					\
-	asn1_APOptions.c			\
-	asn1_AP_REP.c				\
-	asn1_AP_REQ.c				\
-	asn1_AS_REP.c				\
-	asn1_AS_REQ.c				\
-	asn1_Authenticator.c			\
-	asn1_AuthorizationData.c		\
-	asn1_Checksum.c				\
-	asn1_EncAPRepPart.c			\
-	asn1_EncASRepPart.c			\
-	asn1_EncKDCRepPart.c			\
-	asn1_EncKrbCredPart.c			\
-	asn1_EncKrbPrivPart.c			\
-	asn1_EncTGSRepPart.c			\
-	asn1_EncTicketPart.c			\
-	asn1_EncryptedData.c			\
-	asn1_EncryptionKey.c			\
-	asn1_ETYPE_INFO.c			\
-	asn1_ETYPE_INFO_ENTRY.c			\
-	asn1_HostAddress.c			\
-	asn1_HostAddresses.c			\
-	asn1_KDCOptions.c			\
-	asn1_KDC_REP.c				\
-	asn1_KDC_REQ.c				\
-	asn1_KDC_REQ_BODY.c			\
-	asn1_KRB_CRED.c				\
-	asn1_KRB_ERROR.c			\
-	asn1_KRB_PRIV.c				\
-	asn1_KRB_SAFE.c				\
-	asn1_KRB_SAFE_BODY.c			\
-	asn1_KerberosTime.c			\
-	asn1_KrbCredInfo.c			\
-	asn1_LastReq.c				\
-	asn1_METHOD_DATA.c			\
-	asn1_PA_DATA.c				\
-	asn1_PA_ENC_TS_ENC.c			\
-	asn1_Principal.c			\
-	asn1_PrincipalName.c			\
-	asn1_Realm.c				\
-	asn1_TGS_REP.c				\
-	asn1_TGS_REQ.c				\
-	asn1_Ticket.c				\
-	asn1_TicketFlags.c			\
-	asn1_TransitedEncoding.c		\
-	asn1_err.h				\
+BUILT_SOURCES =			\
+	$(gen_files:.x=.c)	\
+	asn1_err.h		\
 	asn1_err.c
 
-foo =						\
-	asn1_APOptions.x			\
-	asn1_AP_REP.x				\
-	asn1_AP_REQ.x				\
-	asn1_AS_REP.x				\
-	asn1_AS_REQ.x				\
-	asn1_Authenticator.x			\
-	asn1_AuthorizationData.x		\
-	asn1_Checksum.x				\
-	asn1_EncAPRepPart.x			\
-	asn1_EncASRepPart.x			\
-	asn1_EncKDCRepPart.x			\
-	asn1_EncKrbCredPart.x			\
-	asn1_EncKrbPrivPart.x			\
-	asn1_EncTGSRepPart.x			\
-	asn1_EncTicketPart.x			\
-	asn1_EncryptedData.x			\
-	asn1_EncryptionKey.x			\
-	asn1_ETYPE_INFO.x			\
-	asn1_ETYPE_INFO_ENTRY.x			\
-	asn1_HostAddress.x			\
-	asn1_HostAddresses.x			\
-	asn1_KDCOptions.x			\
-	asn1_KDC_REP.x				\
-	asn1_KDC_REQ.x				\
-	asn1_KDC_REQ_BODY.x			\
-	asn1_KRB_CRED.x				\
-	asn1_KRB_ERROR.x			\
-	asn1_KRB_PRIV.x				\
-	asn1_KRB_SAFE.x				\
-	asn1_KRB_SAFE_BODY.x			\
-	asn1_KerberosTime.x			\
-	asn1_KrbCredInfo.x			\
-	asn1_LastReq.x				\
-	asn1_METHOD_DATA.x			\
-	asn1_PA_DATA.x				\
-	asn1_PA_ENC_TS_ENC.x			\
-	asn1_Principal.x			\
-	asn1_PrincipalName.x			\
-	asn1_Realm.x				\
-	asn1_TGS_REP.x				\
-	asn1_TGS_REQ.x				\
-	asn1_Ticket.x				\
-	asn1_TicketFlags.x			\
+gen_files =				\
+	asn1_APOptions.x		\
+	asn1_AP_REP.x			\
+	asn1_AP_REQ.x			\
+	asn1_AS_REP.x			\
+	asn1_AS_REQ.x			\
+	asn1_Authenticator.x		\
+	asn1_AuthorizationData.x	\
+	asn1_Checksum.x			\
+	asn1_EncAPRepPart.x		\
+	asn1_EncASRepPart.x		\
+	asn1_EncKDCRepPart.x		\
+	asn1_EncKrbCredPart.x		\
+	asn1_EncKrbPrivPart.x		\
+	asn1_EncTGSRepPart.x		\
+	asn1_EncTicketPart.x		\
+	asn1_EncryptedData.x		\
+	asn1_EncryptionKey.x		\
+	asn1_ETYPE_INFO.x		\
+	asn1_ETYPE_INFO_ENTRY.x		\
+	asn1_HostAddress.x		\
+	asn1_HostAddresses.x		\
+	asn1_KDCOptions.x		\
+	asn1_KDC_REP.x			\
+	asn1_KDC_REQ.x			\
+	asn1_KDC_REQ_BODY.x		\
+	asn1_KRB_CRED.x			\
+	asn1_KRB_ERROR.x		\
+	asn1_KRB_PRIV.x			\
+	asn1_KRB_SAFE.x			\
+	asn1_KRB_SAFE_BODY.x		\
+	asn1_KerberosTime.x		\
+	asn1_KrbCredInfo.x		\
+	asn1_LastReq.x			\
+	asn1_METHOD_DATA.x		\
+	asn1_PA_DATA.x			\
+	asn1_PA_ENC_TS_ENC.x		\
+	asn1_Principal.x		\
+	asn1_PrincipalName.x		\
+	asn1_Realm.x			\
+	asn1_TGS_REP.x			\
+	asn1_TGS_REQ.x			\
+	asn1_Ticket.x			\
+	asn1_TicketFlags.x		\
 	asn1_TransitedEncoding.x
 
 
-noinst_PROGRAMS = asn1_compile check-der
+noinst_PROGRAMS = asn1_compile
+check_PROGRAMS = check-der
 
 asn1_compile_SOURCES = parse.y lex.l main.c hash.c symbol.c gen.c \
 	gen_encode.c gen_decode.c gen_free.c gen_length.c gen_copy.c \
@@ -118,21 +77,22 @@ libasn1_la_SOURCES = \
 
 asn1_compile_LDADD = ../roken/libroken.la $(LEXLIB)
 
-check_der_LDADD = libasn1.la ../roken/libroken.la
+check_der_LDADD = libasn1.la ../com_err/libcom_err.la ../roken/libroken.la
 
 TESTS = check-der
 
-CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) $(foo) asn1_files
+CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) \
+	$(gen_files) asn1_files
 
 include_HEADERS = asn1.h asn1_err.h der.h
 
 lex.lo: parse.h
 
-$(foo) asn1.h: asn1_files
+$(gen_files) asn1.h: asn1_files
 
 asn1_files: asn1_compile $(srcdir)/k5.asn1
 	./asn1_compile $(srcdir)/k5.asn1
 
 $(libasn1_la_OBJECTS): asn1.h asn1_err.h
 
-EXTRA_DIST = asn1_err.et
\ No newline at end of file
+EXTRA_DIST = asn1_err.et