diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 2ae3c0f91..f4b92e354 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -14,10 +14,11 @@ libroken_la_LDFLAGS = -version-info 8:1:3
 
 noinst_PROGRAMS = make-roken
 
+nodist_make_roken_SOURCES = make-roken.c
+
 check_PROGRAMS = parse_bytes-test \
 		strpftime-test \
-		getaddrinfo-test \
-		snprintf-test
+		getaddrinfo-test
 
 TESTS = $(check_PROGRAMS)
 
@@ -26,8 +27,8 @@ LIB_crypt = @LIB_crypt@
 common_LDADD = libroken.la $(LIB_crypt)
 
 strpftime_test_SOURCES = strpftime-test.c strftime.c strptime.c snprintf.c
-snprintf_test_SOURCES  = snprintf-test.c snprintf.c
-snprintf_test_LDADD    = $(common_LDADD) -lm
+##snprintf_test_SOURCES  = snprintf-test.c snprintf.c
+##snprintf_test_LDADD    = $(common_LDADD) -lm
 getaddrinfo_test_LDADD = $(common_LDADD)
 parse_bytes_test_LDADD = $(common_LDADD)
 
@@ -148,10 +149,13 @@ libroken_la_LIBADD = @LTLIBOBJS@
 
 $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h
 
+BUILT_SOURCES = make-roken.c roken.h
+
 include_HEADERS = $(err_h) base64.h getarg.h		\
 	parse_bytes.h parse_time.h parse_units.h	\
-	resolve.h roken.h roken-common.h		\
+	resolve.h roken-common.h		\
 	$(err_h) $(fnmatch_h) $(glob_h) rtbl.h xdbm.h
+nodist_include_HEADERS = roken.h
 
 if have_err_h
 err_h =