diff --git a/Makefile.am b/Makefile.am
index 1aa632f..dc7508d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ m4/ltoptions.m4 \
 m4/ltsugar.m4 \
 m4/ltversion.m4
 
-SUBDIRS = lzma man
+SUBDIRS = lzma man doc
 
 AM_CFLAGS = -I lzma/C -DNDEBUG
 
@@ -32,14 +32,15 @@ bin_PROGRAMS = lrzip
 lrzip_SOURCES = \
   zpipe.cpp \
   main.c \
+  rzip.h \
   rzip.c \
   runzip.c \
   stream.c \
   util.c \
-  md5.c
+  md5.c \
+  md5.h
 lrzip_LDADD = lzma/C/liblzma.la
 
-
 dist_doc_DATA = \
   AUTHORS \
   BUGS \
@@ -50,3 +51,10 @@ dist_doc_DATA = \
   TODO \
   WHATS-NEW
 
+EXTRA_DIST = \
+		lrztar \
+		regression_test.sh \
+		description-pak \
+		autogen.sh \
+		INSTALL \
+		$(dist_doc_DATA)
diff --git a/autogen.sh b/autogen.sh
index 881ede7..1ea4d92 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ rm -f "${bs_dir}"/aclocal.m4 "${bs_dir}"/ltmain.sh
 
 echo 'Running autoreconf -if...'
 autoreconf -if || exit 1
-if test -n "$NOCONFIGURE" ; then
+if test -z "$NOCONFIGURE" ; then
 	echo 'Configuring...'
 	cd "${bs_dir}" &> /dev/null
 	test "$?" = "0" || e=1
diff --git a/lzma/C/Makefile.am b/lzma/C/Makefile.am
index bbd7cc4..a059ba2 100644
--- a/lzma/C/Makefile.am
+++ b/lzma/C/Makefile.am
@@ -5,12 +5,25 @@ ASM_S =
 if USE_ASM
   ASM_LIBS += @ASM_OBJ@
 else
-  ASM_S += 7zCrc.c
+  ASM_S += 7zCrc.c 7zCrc.h
 endif
 
 noinst_LTLIBRARIES = liblzma.la
 liblzma_la_SOURCES = \
   $(ASM_S) \
+		Alloc.h \
+		basetyps.h \
+		LzFind.h \
+		LzFindMt.h \
+		LzHash.h \
+		LzmaDec.h \
+		LzmaEnc.h \
+		LzmaLib.h \
+		MyGuidDef.h \
+		MyWindows.h \
+		Threads.h \
+		Types.h \
+		windows.h \
   Threads.c \
   LzFind.c \
   LzFindMt.c \
diff --git a/lzma/Makefile.am b/lzma/Makefile.am
index 04fde04..7489e1d 100644
--- a/lzma/Makefile.am
+++ b/lzma/Makefile.am
@@ -10,3 +10,5 @@ lzmadoc_DATA = \
   lzma.txt \
   README \
   README-Alloc
+
+EXTRA_DIST = $(lzmadoc_DATA)
diff --git a/man/Makefile.am b/man/Makefile.am
index 4d01ccf..51b754a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -2,3 +2,5 @@ MAINTAINERCLEANFILES = Makefile.in lrunzip.1 lrztar.1 lrzuntar.1
 
 man1_MANS = lrzip.1 lrunzip.1.pod lrztar.1.pod lrzuntar.1.pod
 man5_MANS = lrzip.conf.5
+
+EXTRA_DIST = $(man1_MANS) $(man5_MANS)