diff --git a/Makefile.am b/Makefile.am
index 14241e1b..50074560 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ bash_completion.sh: bash_completion.sh.in Makefile
 
 CLEANFILES = bash_completion.sh
 
-EXTRA_DIST = CHANGES $(sysconf_DATA) bash_completion.sh.in
+EXTRA_DIST = CHANGES $(sysconf_DATA) $(pkgdata_DATA) bash_completion.sh.in
 
 install-data-hook:
 	tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \
diff --git a/completions/Makefile.am b/completions/Makefile.am
index a034b487..a5f6e84a 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -1,3 +1,4 @@
+bashcompdir = $(pkgdatadir)/completions
 bashcomp_DATA = abook \
 		ant \
 		apache2ctl \
diff --git a/configure.ac b/configure.ac
index fb61bb22..875811dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
 AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror])
-AC_SUBST(bashcompdir, $pkgdatadir/completions)
 AC_SUBST(compatdir, $sysconfdir/bash_completion.d)
-AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile completions/Makefile helpers/Makefile test/Makefile])
 AC_OUTPUT
diff --git a/helpers/Makefile.am b/helpers/Makefile.am
index 4ad4b439..0c8ed300 100644
--- a/helpers/Makefile.am
+++ b/helpers/Makefile.am
@@ -1,3 +1,4 @@
+helpersdir = $(pkgdatadir)/helpers
 helpers_DATA = perl
 
 EXTRA_DIST = $(helpers_DATA)