diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index f804b760..78611022 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -58,9 +58,23 @@ clean-local:
 # because we include entire directories with EXTRA_DIST, we need to clean up
 # the source control files
 dist-hook:
-	rm -rf `find $(distdir)/ -name '*.pyc'`
+	-rm -rf `find $(distdir)/ -name '*.pyc'`
 
-DISTCLEANFILES	= Makefile.in core/*.pyc MANIFEST 
+distclean-local:
+	-rm -rf core.egg-info
+	
+
+DISTCLEANFILES = Makefile.in
 
 # files to include with distribution tarball
-EXTRA_DIST = $(SETUPPY) core doc $(LOGROTATE_FILE)
+EXTRA_DIST = $(SETUPPY) \
+	     core \
+	     data \
+	     doc/conf.py.in \
+	     examples \
+	     sbin \
+	     tests \
+	     test.py \
+	     setup.cfg \
+	     requirements.txt \
+	     $(LOGROTATE_FILE)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 379b7d99..781977a0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,9 +13,9 @@ SUBDIRS 	= man figures
 # extra cruft to remove
 DISTCLEANFILES	= Makefile.in stamp-vti
 
-rst_files = conf.py  constants.txt credits.rst  ctrlnet.rst devguide.rst  \
+rst_files = conf.py.in  constants.txt credits.rst  ctrlnet.rst devguide.rst  \
 	    emane.rst  index.rst  install.rst  intro.rst  machine.rst  \
-	    ns3.rst  performance.rst  scripting.rst usage.rst
+	    ns3.rst  performance.rst  scripting.rst usage.rst requirements.txt
 
 EXTRA_DIST = $(rst_files)
 
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 3a1a09d0..0d0d2b47 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -30,8 +30,12 @@ dist_coreaddons_DATA = $(ADDONS_FILES)
 coreconfigsdir = $(datadir)/core/examples/configs
 dist_coreconfigs_DATA = $(CONFIG_FILES)
 
+# remove generated file from dist
+dist-hook:
+	-rm -f $(distdir)/version.tcl
+
 # extra cruft to remove
 DISTCLEANFILES = Makefile.in
 
 # files to include in source tarball not included elsewhere
-EXTRA_DIST = addons
+EXTRA_DIST = core-gui.in
diff --git a/netns/Makefile.am b/netns/Makefile.am
index ee34df62..f3001ead 100644
--- a/netns/Makefile.am
+++ b/netns/Makefile.am
@@ -57,6 +57,9 @@ clean-local: clean-local-check
 clean-local-check:
 	-rm -rf build
 
+distclean-local:
+	-rm -rf core_netns.egg-info
+
 # extra cruft to remove
 DISTCLEANFILES = Makefile.in MANIFEST
 
diff --git a/ns3/Makefile.am b/ns3/Makefile.am
index bf398426..caa0c1c0 100644
--- a/ns3/Makefile.am
+++ b/ns3/Makefile.am
@@ -10,10 +10,6 @@
 SETUPPY	= setup.py
 SETUPPYFLAGS = -v
 
-#EXAMPLE_FILES := $(wildcard examples/*)
-#coreexampledir = $(datadir)/core/examples/corens3
-#dist_coreexample_SCRIPTS = $(EXAMPLE_FILES)
-
 # Python package build
 noinst_SCRIPTS = build
 build:
@@ -30,10 +26,10 @@ install-exec-hook:
 
 # Python package uninstall
 uninstall-hook:
-	rm -rf core_ns3.egg-info
-	rm -rf $(DESTDIR)/$(pythondir)/core_ns3-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg-info
-	rm -rf $(DESTDIR)/$(pythondir)/corens3
-	rm -rf $(DESTDIR)/$(datadir)/corens3
+	-rm -rf core_ns3.egg-info
+	-rm -rf $(DESTDIR)/$(pythondir)/core_ns3-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg-info
+	-rm -rf $(DESTDIR)/$(pythondir)/corens3
+	-rm -rf $(DESTDIR)/$(datadir)/corens3
 
 # Python package cleanup
 clean-local:
@@ -42,9 +38,12 @@ clean-local:
 # because we include entire directories with EXTRA_DIST, we need to clean up
 # the source control files
 dist-hook:
-	rm -rf `find $(distdir)/ -name '*.pyc'`
+	-rm -rf `find $(distdir)/ -name '*.pyc'`
 
-DISTCLEANFILES = Makefile.in *.pyc corens3/*.pyc MANIFEST
+distclean-local:
+	-rm -rf core_ns3.egg-info
+
+DISTCLEANFILES = Makefile.in 
 
 # files to include with distribution tarball
-EXTRA_DIST = LICENSE $(SETUPPY) corens3
+EXTRA_DIST = LICENSE $(SETUPPY) corens3 examples
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4a1cc6ad..9c521923 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -9,7 +9,7 @@
 
 CLEANFILES	= core-daemon
 
-DISTCLEANFILES	= Makefile.in 
+DISTCLEANFILES	= Makefile.in core-daemon.service
 
 EXTRA_DIST	= core-daemon-init.d \
 		  core-daemon.service.in \