diff --git a/Makefile.am b/Makefile.am
index 61ea08e4..3d1e4af1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = bootstrap
 
 if XRDP_FREERDP
 FREERDPDIR = freerdp
diff --git a/common/Makefile.am b/common/Makefile.am
index c7d4590f..a3fd85fb 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = d3des.h arch.h os_calls.h list.h file.h parse.h defines.h file_loc.h log.h os_calls.h ssl_calls.h thread_calls.h trans.h xrdp_constants.h
+
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index 697ad484..9b85f7f7 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = libxrdp.h libxrdpinc.h
 
 if XRDP_DEBUG
 EXTRA_DEFINES = -DXRDP_DEBUG
diff --git a/mc/Makefile.am b/mc/Makefile.am
index c2cf54f3..5d1cb0fa 100644
--- a/mc/Makefile.am
+++ b/mc/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = mc.h
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
diff --git a/rdp/Makefile.am b/rdp/Makefile.am
index 5a55d565..4565838d 100644
--- a/rdp/Makefile.am
+++ b/rdp/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = rdp.h
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 95c237ea..7edb539a 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = sesman.ini startwm.sh
+EXTRA_DIST = sesman.ini startwm.sh sesman.h access.h auth.h config.h env.h lock.h scp.h scp_v0.h scp_v1.h scp_v1_mng.h session.h sig.h thread.h
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am
index e1784f82..27ae1fd0 100644
--- a/sesman/libscp/Makefile.am
+++ b/sesman/libscp/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = libscp_connection.h libscp_commands.h libscp.h libscp_session.h libscp_types_mng.h libscp_v1c_mng.h libscp_vX.h libscp_commands_mng.h libscp_init.h libscp_tcp.h libscp_v0.h libscp_v1s.h libscp_lock.h \
+libscp_types.h libscp_v1c.h libscp_v1s_mng.h 
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
diff --git a/sesman/tools/Makefile.am b/sesman/tools/Makefile.am
index 8282e237..8596e77e 100644
--- a/sesman/tools/Makefile.am
+++ b/sesman/tools/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = tcp.h
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
diff --git a/vnc/Makefile.am b/vnc/Makefile.am
index fe227ffa..81f44c38 100644
--- a/vnc/Makefile.am
+++ b/vnc/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = vnc.h
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index 8da12298..4fe6f6a5 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = xrdp.ini rsakeys.ini ad24b.bmp ad256.bmp xrdp24b.bmp xrdp256.bmp sans-10.fv1 cursor0.cur cursor1.cur xrdp.h xrdp_types.h
 
 if XRDP_DEBUG
 EXTRA_DEFINES = -DXRDP_DEBUG
diff --git a/xup/Makefile.am b/xup/Makefile.am
index 2689a2c1..41d7e3f5 100644
--- a/xup/Makefile.am
+++ b/xup/Makefile.am
@@ -1,3 +1,4 @@
+EXTRA_DIST = xup.h
 
 AM_CFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \