diff --git a/debian/changelog b/debian/changelog
index ad4f20c0c..4b2a6f8ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cmake (3.2.2-3) UNRELEASED; urgency=medium
+
+  * Move bash_completion from /etc to /usr/share.
+    - Stop using dh_bash-completion. It still installs files to /etc and
+      dh_install works just fine.
+
+ -- Felix Geyer <fgeyer@debian.org>  Sat, 30 May 2015 13:56:37 +0200
+
 cmake (3.2.2-2) unstable; urgency=medium
 
   * Make cmake.bash-completion use wildcards for the minor version
diff --git a/debian/cmake.bash-completion b/debian/cmake.bash-completion
deleted file mode 100644
index 0184dfb15..000000000
--- a/debian/cmake.bash-completion
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/cmake-3.*/completions/cmake
-debian/tmp/usr/share/cmake-3.*/completions/cpack
-debian/tmp/usr/share/cmake-3.*/completions/ctest
diff --git a/debian/cmake.install b/debian/cmake.install
index c856c826a..2b872c6e2 100644
--- a/debian/cmake.install
+++ b/debian/cmake.install
@@ -4,3 +4,6 @@ usr/bin/ctest
 usr/share/man/man1/cmake.1
 usr/share/man/man1/cpack.1
 usr/share/man/man1/ctest.1
+usr/share/cmake-*/completions/cmake usr/share/bash-completion/completions/
+usr/share/cmake-*/completions/cpack usr/share/bash-completion/completions/
+usr/share/cmake-*/completions/ctest usr/share/bash-completion/completions/
diff --git a/debian/cmake.maintscript b/debian/cmake.maintscript
index 0afca56bc..6d059e6a5 100644
--- a/debian/cmake.maintscript
+++ b/debian/cmake.maintscript
@@ -1,2 +1,5 @@
 symlink_to_dir /usr/share/doc/cmake /usr/share/doc/cmake-data 2.8.12.2-2~
 rm_conffile /etc/emacs/site-start.d/50cmake.el 2.8.9~rc3-1~
+rm_conffile /etc/bash_completion.d/cmake 3.2.2-3~
+rm_conffile /etc/bash_completion.d/cpack 3.2.2-3~
+rm_conffile /etc/bash_completion.d/ctest 3.2.2-3~
diff --git a/debian/control b/debian/control
index 975f1b203..480999037 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: A. Maitland Bottoms <bottoms@debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
            Felix Geyer <fgeyer@debian.org>,
            Mario Lang <mlang@debian.org>
-Build-Depends: bash-completion,
-               debhelper (>= 9.20131104),
+Build-Depends: debhelper (>= 9.20131104),
                libarchive-dev (>= 2.8.0),
                libbz2-dev,
                libcurl4-openssl-dev | libcurl-ssl-dev,
diff --git a/debian/rules b/debian/rules
index 17418728b..b5ba0e1c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,6 @@ override_dh_sphinxdoc:
 	dh_sphinxdoc -pcmake-doc
 
 %:
-	dh $@ --with=bash-completion,sphinxdoc --parallel --builddirectory=Build --dbg-package=cmake-dbg
+	dh $@ --with=sphinxdoc --parallel --builddirectory=Build --dbg-package=cmake-dbg
 
 .PHONY: override_dh_auto_configure override_dh_auto_clean