diff --git a/configure.ac b/configure.ac
index 8e0928e96e3dad1e6d6b549933b85a63a39fe6af..f9a2260cd39feca7ebc51715614c0a9a64958d33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2551,14 +2551,12 @@ AC_CONFIG_FILES([Makefile \
            packages/Linux/RPM/curl.spec \
            packages/Linux/RPM/curl-ssl.spec \
            packages/Solaris/Makefile \
-           packages/DOS/Makefile \
            packages/EPM/curl.list \
            packages/EPM/Makefile \
            packages/vms/Makefile \
            packages/AIX/Makefile \
            packages/AIX/RPM/Makefile \
            packages/AIX/RPM/curl.spec \
-           packages/TPF/Makefile \
            curl-config \
            libcurl.pc
 ])
diff --git a/packages/AIX/Makefile.am b/packages/AIX/Makefile.am
deleted file mode 100644
index 4b038ed31cae1c50dced08e47553ec3c0a30f876..0000000000000000000000000000000000000000
--- a/packages/AIX/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = RPM
-
-EXTRA_DIST = Makefile.am
diff --git a/packages/AIX/RPM/Makefile.am b/packages/AIX/RPM/Makefile.am
deleted file mode 100644
index d1e7bf9d93b88441b805d4e3a4fa2767e19d8de8..0000000000000000000000000000000000000000
--- a/packages/AIX/RPM/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = README curl.spec.in
-
diff --git a/packages/DOS/Makefile.am b/packages/DOS/Makefile.am
deleted file mode 100644
index 70313cb009c2ce7f4da469fb90e232cf703f69cc..0000000000000000000000000000000000000000
--- a/packages/DOS/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = README common.dj
diff --git a/packages/Makefile.am b/packages/Makefile.am
index 3f731721e7373292df8dfaaf68c79d749ac1ce1d..88fed435a66329d2aec1948b3ff602310c15fa72 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -1,10 +1,32 @@
-SUBDIRS = Win32 Linux Solaris EPM DOS AIX vms TPF
+SUBDIRS = Win32 Linux Solaris EPM AIX vms
+
+EXTRA_DIST = README 			\
+	DOS/README 			\
+	DOS/common.dj 			\
+	NetWare/get_ver.awk 		\
+	OS400/README.OS400 		\
+	OS400/ccsidcurl.c 		\
+	OS400/ccsidcurl.h 		\
+	OS400/curl.inc.in 		\
+	OS400/initscript.sh 		\
+	OS400/make-include.sh 		\
+	OS400/make-lib.sh 		\
+	OS400/make-src.sh 		\
+	OS400/make-tests.sh 		\
+	OS400/makefile.sh 		\
+	OS400/os400sys.c 		\
+	OS400/os400sys.h 		\
+	Symbian/bwins/libcurlu.def 	\
+	Symbian/eabi/libcurlu.def 	\
+	Symbian/group/bld.inf 		\
+	Symbian/group/curl.iby 		\
+	Symbian/group/curl.mmp 		\
+	Symbian/group/curl.pkg 		\
+	Symbian/group/libcurl.iby 	\
+	Symbian/group/libcurl.mmp 	\
+	Symbian/group/libcurl.pkg 	\
+	Symbian/readme.txt 		\
+	TPF/curl.mak 			\
+	TPF/maketpf.env_curl 		\
+	TPF/maketpf.env_curllib 
 
-EXTRA_DIST = README NetWare/get_ver.awk OS400/ccsidcurl.c OS400/ccsidcurl.h   \
-OS400/curl.inc.in OS400/initscript.sh OS400/makefile.sh OS400/make-include.sh \
-OS400/make-lib.sh OS400/make-src.sh OS400/make-tests.sh OS400/os400sys.c      \
-OS400/os400sys.h OS400/README.OS400 \
-Symbian/bwins/libcurlu.def Symbian/eabi/libcurlu.def Symbian/group/bld.inf \
-Symbian/group/curl.iby Symbian/group/curl.mmp Symbian/group/libcurl.iby    \
-Symbian/group/libcurl.mmp Symbian/group/curl.pkg Symbian/group/libcurl.pkg \
-Symbian/readme.txt
diff --git a/packages/TPF/Makefile.am b/packages/TPF/Makefile.am
deleted file mode 100644
index 225d3c7a09e1f6a1a5f7c22914eb3ed92323a9c0..0000000000000000000000000000000000000000
--- a/packages/TPF/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = curl.mak maketpf.env_curl maketpf.env_curllib