diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
index 68407506f..80723f7dd 100644
--- a/lib/hx509/Makefile.am
+++ b/lib/hx509/Makefile.am
@@ -78,7 +78,8 @@ libhx509_la_LIBADD = \
 	$(LIB_roken) $(LIB_dlopen)
 
 libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_des)
-libhx509_la_SOURCES = $(libhx509_la_files) $(BUILT_SOURCES)
+dist_libhx509_la_SOURCES = $(libhx509_la_files)
+nodist_libhx509_la_SOURCES = $(BUILT_SOURCES)
 
 $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1_files
 $(gen_files_pkcs10) pkcs10_asn1.h: pkcs10_asn1_files
@@ -102,7 +103,8 @@ $(srcdir)/hx509-protos.h:
 $(srcdir)/hx509-private.h:
 	cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p hx509-private.h $(libhx509_la_files) || rm -f hx509-private.h
 
-include_HEADERS = hx509.h hx509-protos.h hx509_err.h
+dist_include_HEADERS = hx509.h hx509-protos.h
+nodist_include_HEADERS = hx509_err.h
 
 SLC = $(top_builddir)/lib/sl/slc
 
@@ -111,9 +113,8 @@ bin_PROGRAMS = hxtool
 hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
 	$(SLC) $(srcdir)/hxtool-commands.in
 
-hxtool_SOURCES = \
-	hxtool.c \
-	hxtool-commands.c
+dist_hxtool_SOURCES = hxtool.c
+nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
 
 $(hxtool_SOURCES): hxtool-commands.h
 
@@ -138,11 +139,13 @@ CLEANFILES = $(BUILT_SOURCES) \
 # regression tests
 #
 
-check_PROGRAMS = $(TESTS)
+check_SCRIPTS = $(SCRIPT_TESTS)
 
 LDADD = libhx509.la
 
-TESTS = 			\
+TESTS = $(SCRIPT_TESTS)
+
+SCRIPT_TESTS = 			\
 	test_chain		\
 	test_cms		\
 	test_crypto		\
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index 6e1eb9dee..8a1f486f0 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -59,7 +59,7 @@ ERR_FILES = krb5_err.c heim_err.c k524_err.c
 
 libkrb5_la_CPPFLAGS = -DBUILD_KRB5_LIB $(AM_CPPFLAGS)
 
-libkrb5_la_SOURCES =				\
+dist_libkrb5_la_SOURCES =			\
 	acache.c				\
 	acl.c					\
 	add_et_list.c				\
@@ -160,7 +160,9 @@ libkrb5_la_SOURCES =				\
 	verify_user.c				\
 	version.c				\
 	warn.c					\
-	write_message.c				\
+	write_message.c
+
+nodist_libkrb5_la_SOURCES =			\
 	$(ERR_FILES)
 
 libkrb5_la_LDFLAGS = -version-info 21:0:4
@@ -235,7 +237,8 @@ man_MANS =					\
 	krb5_warn.3				\
 	verify_krb5_conf.8
 
-include_HEADERS = krb5.h krb5-protos.h krb5-private.h krb5_err.h heim_err.h k524_err.h krb5_ccapi.h
+dist_include_HEADERS = krb5.h krb5-protos.h krb5-private.h krb5_ccapi.h
+nodist_include_HEADERS = krb5_err.h heim_err.h k524_err.h 
 
 CLEANFILES = krb5_err.c krb5_err.h heim_err.c heim_err.h k524_err.c k524_err.h