diff --git a/asn1c/Makefile.am b/asn1c/Makefile.am
index 2005f73..a4b1091 100644
--- a/asn1c/Makefile.am
+++ b/asn1c/Makefile.am
@@ -22,7 +22,6 @@
 
 dist_man1_MANS = asn1c.1 unber.1 enber.1
 
-check_SCRIPTS = check-xxber.sh check-parsing.sh
+dist_check_SCRIPTS = check-xxber.sh check-parsing.sh
 TESTS = $(check_SCRIPTS)
-EXTRA_DIST = $(check_SCRIPTS)
 CLEANFILES = .check-xxber.*.tmp .check-parsing.*.tmp
diff --git a/asn1c/Makefile.in b/asn1c/Makefile.in
index bcc7638..0c39c71 100644
--- a/asn1c/Makefile.in
+++ b/asn1c/Makefile.in
@@ -40,8 +40,8 @@
 target_triplet = @target@
 bin_PROGRAMS = asn1c$(EXEEXT) unber$(EXEEXT) enber$(EXEEXT)
 subdir = asn1c
-DIST_COMMON = README $(dist_man1_MANS) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(dist_check_SCRIPTS) $(dist_man1_MANS) \
+	$(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -224,9 +224,8 @@
 
 noinst_HEADERS = sys-common.h
 dist_man1_MANS = asn1c.1 unber.1 enber.1
-check_SCRIPTS = check-xxber.sh check-parsing.sh
+dist_check_SCRIPTS = check-xxber.sh check-parsing.sh
 TESTS = $(check_SCRIPTS)
-EXTRA_DIST = $(check_SCRIPTS)
 CLEANFILES = .check-xxber.*.tmp .check-parsing.*.tmp
 all: all-recursive
 
@@ -633,7 +632,7 @@
 	  fi; \
 	done
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
 all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS)
diff --git a/asn1c/tests/Makefile.am b/asn1c/tests/Makefile.am
index 38b8ca6..d6be48b 100644
--- a/asn1c/tests/Makefile.am
+++ b/asn1c/tests/Makefile.am
@@ -1,14 +1,13 @@
 
 AM_CFLAGS = @ADD_CFLAGS@
 
-check_SCRIPTS = check-assembly.sh
+dist_check_SCRIPTS = check-assembly.sh
 
 TESTS_ENVIRONMENT= CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh
 
 TESTS = check-*.c
 
 EXTRA_DIST =			\
-	$(check_SCRIPTS)	\
 	check-*.c*		\
 	data-62			\
 	data-70			\
@@ -18,5 +17,4 @@
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-clean:
-	rm -rf test-*
+CLEANFILES = test-*
diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in
index d8ee839..656f9b5 100644
--- a/asn1c/tests/Makefile.in
+++ b/asn1c/tests/Makefile.in
@@ -37,7 +37,8 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = asn1c/tests
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(dist_check_SCRIPTS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -164,17 +165,17 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AM_CFLAGS = @ADD_CFLAGS@
-check_SCRIPTS = check-assembly.sh
+dist_check_SCRIPTS = check-assembly.sh
 TESTS_ENVIRONMENT = CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh
 TESTS = check-*.c
 EXTRA_DIST = \
-	$(check_SCRIPTS)	\
 	check-*.c*		\
 	data-62			\
 	data-70			\
 	data-119		\
 	data-126
 
+CLEANFILES = test-*
 all: all-am
 
 .SUFFIXES:
@@ -328,7 +329,7 @@
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile
@@ -350,6 +351,7 @@
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -357,6 +359,8 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
@@ -414,9 +418,6 @@
 
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-
-clean:
-	rm -rf test-*
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/asn1c/webcgi/Makefile.am b/asn1c/webcgi/Makefile.am
index 0f76e3c..a0e7fe1 100644
--- a/asn1c/webcgi/Makefile.am
+++ b/asn1c/webcgi/Makefile.am
@@ -1,5 +1,4 @@
 
-noinst_SCRIPTS = asn1c.cgi
+dist_noinst_SCRIPTS = asn1c.cgi
 noinst_PROGRAMS = asn1c-suid-helper
 
-EXTRA_DIST = asn1c.cgi
diff --git a/asn1c/webcgi/Makefile.in b/asn1c/webcgi/Makefile.in
index d3ef9e9..f469886 100644
--- a/asn1c/webcgi/Makefile.in
+++ b/asn1c/webcgi/Makefile.in
@@ -40,7 +40,8 @@
 target_triplet = @target@
 noinst_PROGRAMS = asn1c-suid-helper$(EXEEXT)
 subdir = asn1c/webcgi
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -52,7 +53,7 @@
 asn1c_suid_helper_SOURCES = asn1c-suid-helper.c
 asn1c_suid_helper_OBJECTS = asn1c-suid-helper.$(OBJEXT)
 asn1c_suid_helper_LDADD = $(LDADD)
-SCRIPTS = $(noinst_SCRIPTS)
+SCRIPTS = $(dist_noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -184,8 +185,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-noinst_SCRIPTS = asn1c.cgi
-EXTRA_DIST = asn1c.cgi
+dist_noinst_SCRIPTS = asn1c.cgi
 all: all-am
 
 .SUFFIXES:
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a78996d..0d832ee 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -35,9 +35,8 @@
 	$(srcdir)/sample.makefile.regen
 
 dist-hook:
-	rm -rf `find $(distdir) -name .svn`
-	rm -rf `find $(distdir) -name "*.core" -or -name ".tmp.*"`
-	rm -rf `find $(distdir) -name "*.[ch].??????"`
+	rm -f `find $(distdir) -name "*.core" -or -name ".tmp.*"`
+	rm -f `find $(distdir) -name "*.[ch].??????"`
 
 CLEANFILES = $(ASN1_FILES_1) $(ASN1_FILES_2) $(ASN1_FILES_3)
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 79973d0..685cfd3 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -393,9 +393,8 @@
 	./crfc2asn1.pl $(ASN1_SOURCE_3)
 
 dist-hook:
-	rm -rf `find $(distdir) -name .svn`
-	rm -rf `find $(distdir) -name "*.core" -or -name ".tmp.*"`
-	rm -rf `find $(distdir) -name "*.[ch].??????"`
+	rm -f `find $(distdir) -name "*.core" -or -name ".tmp.*"`
+	rm -f `find $(distdir) -name "*.[ch].??????"`
 
 clean-local:
 	for dir in sample.source.*; do (cd $$dir && make distclean); done