diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in
index 27f3f4b..829a42f 100644
--- a/asn1c/tests/Makefile.in
+++ b/asn1c/tests/Makefile.in
@@ -164,9 +164,8 @@
 EXTRA_DIST = \
 	$(check_SCRIPTS)	\
 	check-*.c*		\
-	data-*/Makefile		\
-	data-*/README		\
-	data-*/*.*
+	data-62			\
+	data-70
 
 all: all-am
 
@@ -291,7 +290,6 @@
 	else :; fi
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/data-*
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -318,6 +316,9 @@
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
@@ -393,9 +394,9 @@
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	clean-libtool dist-hook distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
@@ -403,6 +404,9 @@
 	uninstall uninstall-am uninstall-info-am
 
 
+dist-hook:
+	rm -rf `find $(distdir) -name CVS -or -name .cvsignore`
+
 clean:
 	rm -rf test-*
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index d0ecbd0..7cc7d24 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -26,11 +26,16 @@
 	./crfc2asn1.pl $(ASN1_SOURCE_3)
 
 EXTRA_DIST = $(srcdir)/rfc*.txt					\
-	$(srcdir)/sample.makefile.regen				\
-	$(srcdir)/sample.source.*/README			\
-	$(srcdir)/sample.source.*/config.h			\
-	$(srcdir)/sample.source.*/Makefile			\
-	$(srcdir)/sample.source.*/sample-*
+	$(srcdir)/sample.source.LDAP3				\
+	$(srcdir)/sample.source.MEGACO				\
+	$(srcdir)/sample.source.MHEG5				\
+	$(srcdir)/sample.source.RRC				\
+	$(srcdir)/sample.source.TAP3				\
+	$(srcdir)/sample.source.PKIX1				\
+	$(srcdir)/sample.makefile.regen
+
+dist-hook:
+	rm -rf `find $(distdir) -name CVS -or -name .cvsignore`
 
 CLEANFILES = $(ASN1_FILES_1) $(ASN1_FILES_2) $(ASN1_FILES_3)
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 26fa5c6..22722f5 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -177,11 +177,13 @@
 	rfc4511-Lightweight-Directory-Access-Protocol-V3.asn1
 
 EXTRA_DIST = $(srcdir)/rfc*.txt					\
-	$(srcdir)/sample.makefile.regen				\
-	$(srcdir)/sample.source.*/README			\
-	$(srcdir)/sample.source.*/config.h			\
-	$(srcdir)/sample.source.*/Makefile			\
-	$(srcdir)/sample.source.*/sample-*
+	$(srcdir)/sample.source.LDAP3				\
+	$(srcdir)/sample.source.MEGACO				\
+	$(srcdir)/sample.source.MHEG5				\
+	$(srcdir)/sample.source.RRC				\
+	$(srcdir)/sample.source.TAP3				\
+	$(srcdir)/sample.source.PKIX1				\
+	$(srcdir)/sample.makefile.regen
 
 CLEANFILES = $(ASN1_FILES_1) $(ASN1_FILES_2) $(ASN1_FILES_3)
 all: all-am
@@ -253,7 +255,7 @@
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/sample.source.*
+	$(mkdir_p) $(distdir)/$(srcdir)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -280,6 +282,9 @@
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
@@ -359,9 +364,9 @@
 uninstall-am: uninstall-dist_binSCRIPTS uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am \
+	clean-local dist-hook distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
 	install-dist_binSCRIPTS install-exec install-exec-am \
 	install-info install-info-am install-man install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
@@ -381,6 +386,9 @@
 $(ASN1_FILES_3): crfc2asn1.pl $(ASN1_SOURCE_3)
 	./crfc2asn1.pl $(ASN1_SOURCE_3)
 
+dist-hook:
+	rm -rf `find $(distdir) -name CVS -or -name .cvsignore`
+
 clean-local:
 	for dir in sample.source.*; do (cd $$dir && make distclean); done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.