diff --git a/README.txt b/README
similarity index 100%
rename from README.txt
rename to README
diff --git a/autogen.sh b/autogen.sh
index d896e3a..a70bbae 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -54,7 +54,7 @@ Pretty Curved Privacy - File encryption using eliptic curve cryptography.
 
     # generate the top level readme
     cat man/pcp.pod man/install.pod man/footer.pod > README.pod
-    pod2text README.pod > README.txt
+    pod2text README.pod > README
 
     # generate usage.h
     (cd src && ./usage.sh)
@@ -73,7 +73,6 @@ fi
 
 if test "$mode" = "config"; then
   mkdir -p ./config
-  touch README
   
   if ! command -v libtool >/dev/null 2>&1; then
       echo "could not find libtool." 1>&2
@@ -112,7 +111,7 @@ EOF
 chmod 700 clean.sh
 
 
-rm -rf README include/pcp/config.h.in~ libpcp/stamp-h1 autom4te.cache
+rm -rf include/pcp/config.h.in~ libpcp/stamp-h1 autom4te.cache
 
 sleep 1
 touch Makefile.in configure */Makefile.in
diff --git a/bindings/cpp/Makefile.am b/bindings/cpp/Makefile.am
index 360abb1..48d3b6b 100644
--- a/bindings/cpp/Makefile.am
+++ b/bindings/cpp/Makefile.am
@@ -20,6 +20,8 @@
 #
 AM_CXXFLAGS = -I../../include -I../../libpcp/scrypt/crypto -I../../libpcp/scrypt/util
 
+EXTRA_DIST = *.h
+
 lib_LTLIBRARIES      = libpcp1++.la
 
 libpcp1___la_SOURCES = pcp++.h ptx.cpp key.cpp vault.cpp crypto.cpp sign.cpp buffer.cpp
diff --git a/bindings/py/Makefile.am b/bindings/py/Makefile.am
index 6739383..e52c646 100644
--- a/bindings/py/Makefile.am
+++ b/bindings/py/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = setup.py Makefile.am pypcp/*.py Makefile.in
+
 all:
 	python setup.py build
 
diff --git a/configure.ac b/configure.ac
index 9902c1d..0b4df96 100755
--- a/configure.ac
+++ b/configure.ac
@@ -363,7 +363,7 @@ AM_CONDITIONAL([BUILDPY], [test "x$python" = "xyes"])
 AC_SUBST(PACKAGE_VERSION)
 
 # Specify output files
-AC_CONFIG_FILES([Makefile include/Makefile libpcp/Makefile src/Makefile man/Makefile \
+AC_CONFIG_FILES([Makefile include/Makefile libpcp/Makefile libpcp/scrypt/Makefile src/Makefile man/Makefile \
 		 tests/Makefile libpcp/libpcp1.pc bindings/cpp/Makefile bindings/py/Makefile])
 
 
diff --git a/libpcp/Makefile.am b/libpcp/Makefile.am
index c5227c7..b3922f2 100644
--- a/libpcp/Makefile.am
+++ b/libpcp/Makefile.am
@@ -20,8 +20,7 @@
 #
 AM_CFLAGS =  -I../include/pcp -Iscrypt/crypto -Iscrypt/util
 
-
-
+SUBDIRS = scrypt
 lib_LTLIBRARIES      = libpcp1.la
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/libpcp/scrypt/Makefile.am b/libpcp/scrypt/Makefile.am
new file mode 100644
index 0000000..76ed268
--- /dev/null
+++ b/libpcp/scrypt/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = README crypto/crypto_aesctr.c crypto/crypto_aesctr.h crypto/crypto_scrypt-nosse.c crypto/crypto_scrypt-nosse.o crypto/crypto_scrypt-ref.c crypto/crypto_scrypt-sse.c crypto/crypto_scrypt.h crypto/scrypt_platform.h crypto/sha256.c crypto/sha256.h crypto/sha256.o scrypt_platform.h scryptenc/scryptenc.c scryptenc/scryptenc.h scryptenc/scryptenc_cpuperf.c scryptenc/scryptenc_cpuperf.h util/memlimit.c util/memlimit.h util/readpass.c util/readpass.h util/sysendian.h util/warn.c util/warn.h Makefile.am Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d162af..1384302 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,8 @@
 
 AM_CFLAGS = -I../include/pcp -I../libpcp/scrypt/crypto
 
+EXTRA_DIST = *.h
+
 bin_PROGRAMS = pcp1
 
 pcp1_LDADD = ../libpcp/.libs/libpcp1.a
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e402ee5..44b4ebf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,6 +23,8 @@ AM_CFLAGS = -I../include/pcp -I../src -I../libpcp/scrypt/crypto
 check_PROGRAMS = col invalidkeys gencheader statictest cpptest \
 		 buffertest sample streamtest pipetest decodertest mangle
 
+EXTRA_DIST = Makefile.am Makefile.in *.c *.h *.sh *.pl *.py *.cfg *.cpp \
+	     jot key-* unkn* README bart* env/* md5
 
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
         --mode=link $(CCLD) $(AM_LDFLAGS) \
@@ -77,7 +79,7 @@ if BUILDPY
   MAYPY=pytest
 endif
 
-test: check $(MAYPY)
+test: check ctest $(MAYPY)
 
 ctest:
 	rm -f test* v* stresstest/*