diff --git a/common/jpeg/Makefile.am b/common/jpeg/Makefile.am
index cd1c221..3e43874 100644
--- a/common/jpeg/Makefile.am
+++ b/common/jpeg/Makefile.am
@@ -1,5 +1,6 @@
 noinst_LTLIBRARIES = libjpeg.la
-noinst_HEADERS = jconfig.h jerror.h jmorecfg.h jpeglib.h
+noinst_HEADERS = jerror.h jmorecfg.h jpeglib.h
+nodist_noinst_HEADERS = jconfig.h
 
 HDRS = jchuff.h jdct.h jdhuff.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
 	jpegint.h jpeglib.h jversion.h jsimd.h jsimddct.h
@@ -57,7 +58,8 @@
 jpegtran_LDADD = libjpeg.la
 
 
-DOCS= README README-turbo.txt LICENSE.txt LGPL.txt
+DOCS= jconfig.doc README README-turbo.txt LICENSE.txt LGPL.txt \
+	README_TigerVNC.txt
 
 TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \
 	testimgfst.jpg testimgint.jpg testimgp.jpg testimgflt.ppm testimgfst.ppm \
diff --git a/common/zlib/Makefile.am b/common/zlib/Makefile.am
index 743ac5c..07a0174 100644
--- a/common/zlib/Makefile.am
+++ b/common/zlib/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libz.la
 
-HDRS = deflate.h infblock.h infcodes.h inffast.h inffixed.h inftrees.h \
-	infutil.h trees.h zconf.h zlib.h zutil.h
+HDRS = crc32.h deflate.h gzguts.h inffast.h inffixed.h inflate.h inftrees.h \
+	trees.h zconf.h zlib.h zutil.h
 
 libz_la_SOURCES = $(HDRS) adler32.c compress.c crc32.c deflate.c gzclose.c \
 	gzlib.c gzread.c gzwrite.c inflate.c infback.c inftrees.c inffast.c \