diff --git a/.cvsignore b/.cvsignore
index 331b068d..f1ce50bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -20,3 +20,4 @@ stamp-h1
 
 tags
 cscope.out
+pacman-*.tar.gz
diff --git a/Makefile.am b/Makefile.am
index 68f2e240..9d3f6187 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,9 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest
+SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot
 
 # Some files automatically included, so they aren't specified below:
 #   AUTHORS, COPYING, NEWS, README
-# TODO: move translation-help to ABOUT-NLS?
 EXTRA_DIST = HACKING
 
 # TODO : figure out a way to get 'make distcheck' to build with
diff --git a/configure.ac b/configure.ac
index 8890cd07..436c5fbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,7 @@ etc/pacman.d/Makefile
 etc/pacman.d/mirrorlist
 etc/abs/Makefile
 pactest/Makefile
+contrib/Makefile
 Makefile
 ])
 
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 00000000..9a3f3b3d
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = \
+	bash_completion \
+	pacsearch \
+	zsh_completion
+