diff --git a/Makefile.am b/Makefile.am
index 2d07552844751f35bd7ea59f19538da79655e0db..63ac5a16044e8a265ac380446f4b2f9e3120876a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,14 @@ endif
 SUBDIRS += src doc
 
 EXTRA_DIST = \
+	BUGS \
+	HACKING \
+	NEWTAPS \
+	PATCHES.txt \
+	README.Win32 \
 	Doxyfile.in \
-	tools/logger.pl
+	tools/logger.pl \
+	contrib/loaders
 
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
@@ -78,7 +84,6 @@ install-data-hook:
 uninstall-hook:
 	rm -rf $(DESTDIR)$(pkgdatadir)/scripts
 
-
 distclean-local:
 	rm -rf Doxyfile doxygen
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8e8e0d18f2b84279a44f7c01bb48778151838544..6759ed5e7d0405893ca851af53a27e2d85cfe564 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,8 @@
 info_TEXINFOS = openocd.texi
 openocd_TEXINFOS = fdl.texi
 man_MANS = openocd.1
-EXTRA_DIST = openocd.1
+EXTRA_DIST = openocd.1 \
+	INSTALL.txt
 
 dist-hook:
 	mkdir $(distdir)/manual
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 02bf0f42c62b19269aecac688d29c3e16c8b2d39..27ad054fb1a1916b69956aa53cd109765641478f 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -157,7 +157,6 @@ noinst_HEADERS = \
 	target_request.h \
 	trace.h \
 	xscale.h \
-	xscale_debug.h \
 	smp.h \
 	avr32_ap7k.h \
 	avr32_jtag.h \