diff --git a/common/jpeg/simd/Makefile.am b/common/jpeg/simd/Makefile.am
index 92a095e..0f1d125 100644
--- a/common/jpeg/simd/Makefile.am
+++ b/common/jpeg/simd/Makefile.am
@@ -2,7 +2,9 @@
 
 BUILT_SOURCES = jsimdcfg.inc
 
-EXTRA_DIST = nasm_lt.sh
+EXTRA_DIST = nasm_lt.sh jcclrmmx.asm jcclrss2.asm jdclrmmx.asm jdclrss2.asm \
+	jdmrgmmx.asm jdmrgss2.asm jcclrss2-64.asm jdclrss2-64.asm \
+	jdmrgss2-64.asm
 
 if SIMD_X86_64
 
@@ -19,9 +21,6 @@
 jccolss2-64.lo: jcclrss2-64.asm
 jdcolss2-64.lo: jdclrss2-64.asm
 jdmerss2-64.lo: jdmrgss2-64.asm
-
-EXTRA_DIST += jcclrss2-64.asm jdclrss2-64.asm jdmrgss2-64.asm
-
 endif
 
 if SIMD_I386
@@ -48,12 +47,6 @@
 jdcolss2.lo: jdclrss2.asm
 jdmermmx.lo: jdmrgmmx.asm
 jdmerss2.lo: jdmrgss2.asm
-
-EXTRA_DIST += \
-	jcclrmmx.asm jcclrss2.asm \
-	jdclrmmx.asm jdclrss2.asm \
-	jdmrgmmx.asm jdmrgss2.asm
-
 endif
 
 .asm.lo:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bfe70a4..0704ba7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,12 @@
 # vncviewer_unix
-vncviewer/AboutDialog.h
-vncviewer/CConn.cxx
-vncviewer/CConn.h
-vncviewer/DesktopWindow.cxx
-vncviewer/DesktopWindow.h
-vncviewer/InfoDialog.h
-vncviewer/OptionsDialog.h
-vncviewer/parameters.h
-vncviewer/PasswdDialog.h
-vncviewer/ServerDialog.h
-vncviewer/vncviewer.cxx
+unix/vncviewer/AboutDialog.h
+unix/vncviewer/CConn.cxx
+unix/vncviewer/CConn.h
+unix/vncviewer/DesktopWindow.cxx
+unix/vncviewer/DesktopWindow.h
+unix/vncviewer/InfoDialog.h
+unix/vncviewer/OptionsDialog.h
+unix/vncviewer/parameters.h
+unix/vncviewer/PasswdDialog.h
+unix/vncviewer/ServerDialog.h
+unix/vncviewer/vncviewer.cxx
diff --git a/unix/Makefile.am b/unix/Makefile.am
index 870f221..854956b 100644
--- a/unix/Makefile.am
+++ b/unix/Makefile.am
@@ -4,4 +4,12 @@
 
 man1_MANS = vncserver.man
 
-EXTRA_DIST = vncserver.man
+XVNCDIR = xserver/hw/vnc
+
+EXTRA_DIST = vncserver.man $(XVNCDIR)/RegionHelper.h $(XVNCDIR)/vncExtInit.cc \
+	$(XVNCDIR)/buildtime.c $(XVNCDIR)/XserverDesktop.h $(XVNCDIR)/xvnc.cc \
+	$(XVNCDIR)/Xvnc.man $(XVNCDIR)/Input.cc $(XVNCDIR)/xf86vncModule.cc \
+	$(XVNCDIR)/XserverDesktop.cc $(XVNCDIR)/Input.h \
+	$(XVNCDIR)/xorg-version.h $(XVNCDIR)/vncHooks.h \
+	$(XVNCDIR)/Makefile.am $(XVNCDIR)/vncHooks.cc $(XVNCDIR)/vncExtInit.h \
+	xserver15.patch xserver16.patch