diff --git a/Makefile.am b/Makefile.am
index 94016028..dcecc32c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = completions helpers test
+SUBDIRS = completions test
 
 sysconf_DATA = bash_completion
 
diff --git a/helpers/Makefile.am b/completions/helpers/Makefile.am
similarity index 100%
rename from helpers/Makefile.am
rename to completions/helpers/Makefile.am
diff --git a/helpers/perldoc b/completions/helpers/perldoc
similarity index 100%
rename from helpers/perldoc
rename to completions/helpers/perldoc
diff --git a/completions/perl b/completions/perl
index 9a1d84bf..55d07cf8 100644
--- a/completions/perl
+++ b/completions/perl
@@ -49,7 +49,7 @@ _perl()
 }
 complete -F _perl -o nospace -o filenames perl
 
-complete -C $BASH_COMPLETION_DIR/helpers/perldoc -o nospace -o default perldoc
+complete -C ${BASH_SOURCE[0]%/*}/helpers/perldoc -o nospace -o default perldoc
 }
 
 # Local variables:
diff --git a/configure.ac b/configure.ac
index 8cb69952..6f516f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,5 +3,5 @@ AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
 AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
-AC_CONFIG_FILES([Makefile completions/Makefile helpers/Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile])
 AC_OUTPUT
diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index d4461df9..b084dda2 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -11,12 +11,6 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "perldoc -"
-
-
-sync_after_int
-
-
 set test "perldoc should complete word containing colons"
 set cmd "perldoc File::"
 send "$cmd\t"