diff --git a/Makefile.am b/Makefile.am
index 7e5f977d0..3014f6da1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,9 +142,11 @@ EXTRA_DIST = \
 	.lvimrc \
 	.mailmap \
 	.tx/config \
+	bootstrap \
 	bugs-in-changelog.sh \
 	autogen.sh \
 	bindtests \
+	cfg.mk \
 	contrib/autobuild/autobuild.sh \
 	contrib/intro/libguestfs-intro.html \
 	contrib/intro/overview.png \
@@ -169,6 +171,7 @@ EXTRA_DIST = \
 	contrib/visualize-alignment/qemu-0.13-trace-block-device-access.patch \
 	contrib/visualize-alignment/README \
 	contrib/visualize-alignment/tracetops.ml \
+	contrib/windows-icons.pl \
 	guestfs-release-notes.pod \
 	guestfs-release-notes.txt \
 	html/draft.png \
@@ -182,7 +185,14 @@ EXTRA_DIST = \
 	tmp/.gitignore \
 	tx-pull.sh \
 	update-bugs.sh \
-	valgrind-suppressions
+	valgrind-suppressions \
+	.x-sc_avoid_ctype_macros \
+	.x-sc_prohibit_have_config_h \
+	.x-sc_prohibit_magic_number_exit \
+	.x-sc_prohibit_strcmp \
+	.x-sc_prohibit_strcmp_and_strncmp \
+	.x-sc_TAB_in_indentation \
+	.x-sc_trailing_blank
 
 # The website.
 HTMLFILES = \
diff --git a/builder/Makefile.am b/builder/Makefile.am
index f9cd49f8b..55be592b0 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -26,6 +26,9 @@ EXTRA_DIST = \
 	website/README \
 	website/index \
 	website/index.asc \
+	website/debian-6.preseed \
+	website/debian-6.sh \
+	website/debian-6.xz.sig \
 	website/debian-7.preseed \
 	website/debian-7.sh \
 	website/debian-7.xz.sig \
@@ -34,7 +37,16 @@ EXTRA_DIST = \
 	website/fedora-18.xz.sig \
 	website/fedora-19.ks \
 	website/fedora-19.sh \
-	website/fedora-19.xz.sig
+	website/fedora-19.xz.sig \
+	website/ubuntu-10.04.preseed \
+	website/ubuntu-10.04.sh \
+	website/ubuntu-10.04.xz.sig \
+	website/ubuntu-12.04.preseed \
+	website/ubuntu-12.04.sh \
+	website/ubuntu-12.04.xz.sig \
+	website/ubuntu-13.10.preseed \
+	website/ubuntu-13.10.sh \
+	website/ubuntu-13.10.xz.sig
 
 CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-builder
 
diff --git a/golang/Makefile.am b/golang/Makefile.am
index 068d7488e..a7dd1b26a 100644
--- a/golang/Makefile.am
+++ b/golang/Makefile.am
@@ -29,6 +29,7 @@ generator_built = \
 	bindtests.go
 
 EXTRA_DIST = \
+	src/libguestfs.org/guestfs/.gitignore \
 	$(generator_built) \
 	config-test.go \
 	run-bindtests \
diff --git a/java/Makefile.am b/java/Makefile.am
index 524302f2b..0076a9efc 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -42,6 +42,7 @@ java_tests = \
 	t/GuestFS420LogMessages.java
 
 EXTRA_DIST = \
+	com/redhat/et/libguestfs/.gitignore \
 	$(java_sources) \
 	$(java_tests) \
 	run-bindtests \