diff --git a/Makefile.am b/Makefile.am
index bac06c5..6d1c8eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 SUBDIRS = man src
-EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK touchconfig.sh contrib policy src/parser src/test-harness src/buildnum.h src/core/md5.cpp src/core/sha.cpp
+EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging README-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy
 
 install-data-hook:
 	prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
diff --git a/Makefile.in b/Makefile.in
index 53cc007..ba70ddd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -320,7 +320,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 SUBDIRS = man src
-EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK touchconfig.sh contrib policy src/parser src/test-harness src/buildnum.h src/core/md5.cpp src/core/sha.cpp
+EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging README-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/clean b/contrib/clean.sh
similarity index 100%
rename from clean
rename to contrib/clean.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index 81df04b..f8e10cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = cryptlib core db fco fs tw twcrypto twparser util
 SUBDIRS+= twprint twadmin siggen tripwire twtest
+EXTRA_DIST = buildnum.h buildnum.txt buildnuminc.pl dep_addprefix.pl rmcr.pl check_st.pl prime.pl parser test-harness core/md5.cpp core/sha.cpp
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 4c1e838..e921be7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -295,6 +295,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = cryptlib core db fco fs tw twcrypto twparser util twprint \
 	twadmin siggen tripwire twtest
+EXTRA_DIST = buildnum.h buildnum.txt buildnuminc.pl dep_addprefix.pl rmcr.pl check_st.pl prime.pl parser test-harness core/md5.cpp core/sha.cpp
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/cryptlib/Makefile.am b/src/cryptlib/Makefile.am
index 75e3e5c..6ec973b 100644
--- a/src/cryptlib/Makefile.am
+++ b/src/cryptlib/Makefile.am
@@ -3,9 +3,10 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = -I.. -I../..
 LN=@LN@
 DEFAULT_INCLUDES = $(D_INCLUDES)
+EXTRA_DIST=license.txt readme.txt rmcr.pl
 
 noinst_LIBRARIES = libcryptlib.a
-libcryptlib_adir=l
+libcryptlib_adir=.
 libcryptlib_a_SOURCES = \
   algebra.cpp asn.cpp cryptlib.cpp des.cpp dessp.cpp elgamal.cpp \
   eprecomp.cpp filters.cpp forkjoin.cpp integer.cpp iterhash.cpp misc.cpp \
diff --git a/src/cryptlib/Makefile.in b/src/cryptlib/Makefile.in
index e4a246b..f5ca84b 100644
--- a/src/cryptlib/Makefile.in
+++ b/src/cryptlib/Makefile.in
@@ -318,8 +318,9 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = -I.. -I../..
 DEFAULT_INCLUDES = $(D_INCLUDES)
+EXTRA_DIST = license.txt readme.txt rmcr.pl
 noinst_LIBRARIES = libcryptlib.a
-libcryptlib_adir = l
+libcryptlib_adir = .
 libcryptlib_a_SOURCES = \
   algebra.cpp asn.cpp cryptlib.cpp des.cpp dessp.cpp elgamal.cpp \
   eprecomp.cpp filters.cpp forkjoin.cpp integer.cpp iterhash.cpp misc.cpp \