diff --git a/doc/Makefile.am b/doc/Makefile.am
index 644f2ae4..6ee920a0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,10 @@
 
 docsdir = $(datadir)/doc/asn1c
 
-docs_DATA = *.pdf *.html
+docs_DATA =	$(srcdir)/*.pdf	\
+		$(srcdir)/*.html
 
-EXTRA_DIST = *.pdf *.html
+EXTRA_DIST =	$(srcdir)/*.pdf	\
+		$(srcdir)/*.html
 
 CLEANFILES = *.*~
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7d105e25..666e28dc 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -160,8 +160,12 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 docsdir = $(datadir)/doc/asn1c
-docs_DATA = *.pdf *.html
-EXTRA_DIST = *.pdf *.html
+docs_DATA = $(srcdir)/*.pdf	\
+		$(srcdir)/*.html
+
+EXTRA_DIST = $(srcdir)/*.pdf	\
+		$(srcdir)/*.html
+
 CLEANFILES = *.*~
 all: all-am
 
@@ -230,6 +234,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/$(srcdir)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 716ec2cf..d280de0e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -11,15 +11,15 @@ all: $(ASN1_FILES_1)
 $(ASN1_FILES_1): crfc2asn1.pl $(ASN1_SOURCE_1)
 	./crfc2asn1.pl $(ASN1_SOURCE_1)
 
-EXTRA_DIST = rfc*.txt				\
-	sample.source.PKIX1/README		\
-	sample.source.PKIX1/config.h		\
-	sample.source.PKIX1/Makefile		\
-	sample.source.PKIX1/regenerate.Makefile	\
-	sample.source.TAP3/README		\
-	sample.source.TAP3/config.h		\
-	sample.source.TAP3/Makefile		\
-	sample.source.TAP3/regenerate.Makefile
+EXTRA_DIST = $(srcdir)/rfc*.txt					\
+	$(srcdir)/sample.source.PKIX1/README			\
+	$(srcdir)/sample.source.PKIX1/config.h			\
+	$(srcdir)/sample.source.PKIX1/Makefile			\
+	$(srcdir)/sample.source.PKIX1/regenerate.Makefile	\
+	$(srcdir)/sample.source.TAP3/README			\
+	$(srcdir)/sample.source.TAP3/config.h			\
+	$(srcdir)/sample.source.TAP3/Makefile			\
+	$(srcdir)/sample.source.TAP3/regenerate.Makefile
 
 CLEANFILES = $(ASN1_FILES_1)
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 721d5fb3..07bc3263 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -166,15 +166,15 @@ ASN1_FILES_1 = \
 	rfc3280-PKIX1Explicit88.asn1	\
 	rfc3280-PKIX1Implicit88.asn1
 
-EXTRA_DIST = rfc*.txt				\
-	sample.source.PKIX1/README		\
-	sample.source.PKIX1/config.h		\
-	sample.source.PKIX1/Makefile		\
-	sample.source.PKIX1/regenerate.Makefile	\
-	sample.source.TAP3/README		\
-	sample.source.TAP3/config.h		\
-	sample.source.TAP3/Makefile		\
-	sample.source.TAP3/regenerate.Makefile
+EXTRA_DIST = $(srcdir)/rfc*.txt					\
+	$(srcdir)/sample.source.PKIX1/README			\
+	$(srcdir)/sample.source.PKIX1/config.h			\
+	$(srcdir)/sample.source.PKIX1/Makefile			\
+	$(srcdir)/sample.source.PKIX1/regenerate.Makefile	\
+	$(srcdir)/sample.source.TAP3/README			\
+	$(srcdir)/sample.source.TAP3/config.h			\
+	$(srcdir)/sample.source.TAP3/Makefile			\
+	$(srcdir)/sample.source.TAP3/regenerate.Makefile
 
 CLEANFILES = $(ASN1_FILES_1)
 all: all-am
@@ -246,7 +246,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/sample.source.PKIX1 $(distdir)/sample.source.TAP3
+	$(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/sample.source.PKIX1 $(distdir)/$(srcdir)/sample.source.TAP3
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/libasn1parser/Makefile.in b/libasn1parser/Makefile.in
index cb9ebd03..76a6ef23 100644
--- a/libasn1parser/Makefile.in
+++ b/libasn1parser/Makefile.in
@@ -448,8 +448,8 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f asn1p_l.c
-	-rm -f asn1p_y.c
 	-rm -f asn1p_y.h
+	-rm -f asn1p_y.c
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
diff --git a/skeletons/Makefile.am b/skeletons/Makefile.am
index a029345c..4a07f704 100644
--- a/skeletons/Makefile.am
+++ b/skeletons/Makefile.am
@@ -1,7 +1,9 @@
 
 SUBDIRS = tests
 
-dist_pkgdata_DATA = *.[ch] file-dependencies
+dist_pkgdata_DATA =				\
+		$(srcdir)/*.[ch]		\
+		$(srcdir)/file-dependencies
 uninstall-local:
 	-@echo -n " "
 	-rm -f -r $(DESTDIR)$(pkgdatadir)
diff --git a/skeletons/Makefile.in b/skeletons/Makefile.in
index 15a236b1..502fdad6 100644
--- a/skeletons/Makefile.in
+++ b/skeletons/Makefile.in
@@ -170,7 +170,10 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 SUBDIRS = tests
-dist_pkgdata_DATA = *.[ch] file-dependencies
+dist_pkgdata_DATA = \
+		$(srcdir)/*.[ch]		\
+		$(srcdir)/file-dependencies
+
 all: all-recursive
 
 .SUFFIXES: