diff --git a/Makefile.am b/Makefile.am
index 5b85fb57e..1a11f0bc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,14 @@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-EXTRA_DIST = curl.spec curl-ssl.spec \
-	CHANGES FILES LEGAL MITX.txt MPL-1.1.txt \
-	config-win32.h reconf 
+EXTRA_DIST = \
+	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt \
+	config-win32.h reconf packages/README \
+	packages/Linux/RPM/README \
+	packages/Linux/RPM/curl-ssl.spec.in \
+	packages/Linux/RPM/curl.spec.in \
+	packages/Linux/RPM/make_curl_rpm \
+	packages/Win32/README
 
 SUBDIRS = docs lib src include tests
 
@@ -31,7 +36,7 @@ rpms:
 
 rpm:
 	RPM_TOPDIR=`rpm --showrc | $(PERL) -n -e 'print if(s/.*_topdir\s+(.*)/$$1/)'` ; \
-	cp $(srcdir)/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \
+	cp $(srcdir)/packages/Linux/RPM/$(RPMDIST).spec $$RPM_TOPDIR/SPECS ; \
 	cp $(PACKAGE)-$(VERSION).tar.gz $$RPM_TOPDIR/SOURCES ; \
 	rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \
 	mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \
diff --git a/configure.in b/configure.in
index b98c2ef86..763f91944 100644
--- a/configure.in
+++ b/configure.in
@@ -609,14 +609,12 @@ dnl AC_SUBST(RANLIB)
 
 AC_OUTPUT( Makefile \
 	   docs/Makefile \
+           docs/examples/Makefile \
 	   include/Makefile \
 	   include/curl/Makefile \
 	   src/Makefile \
            lib/Makefile \
            tests/Makefile \
-	   curl.spec \
-	   curl-ssl.spec)
-dnl	   perl/checklinks.pl \
-dnl	   perl/getlinks.pl \
-dnl        perl/formfind.pl \
-dnl	   perl/recursiveftpget.pl  )
+	   packages/Linux/RPM/curl.spec \
+	   packages/Linux/RPM/curl-ssl.spec )
+
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 45c42c8d9..40c1defeb 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -21,5 +21,6 @@ man_MANS = \
 
 EXTRA_DIST = $(man_MANS) \
 	MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \
-	LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting \
-	examples/README examples/*.c
+	LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting
+
+SUBDIRS = examples
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2090cb013..d27ca673e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -58,7 +58,7 @@ download.h     getenv.c       ldap.h         ssluse.h       \
 escape.c       getenv.h       mprintf.c      telnet.c       \
 escape.h       getpass.c      netrc.c        telnet.h       \
 getinfo.c highlevel.c strequal.c strequal.h easy.c \
-security.h security.c krb4.c memdebug.c memdebug.h inet_ntoa_r.h
+security.h security.c krb4.c krb4.h memdebug.c memdebug.h inet_ntoa_r.h
 
 noinst_HEADERS = setup.h highlevel.h