diff --git a/debian/changelog b/debian/changelog
index da8e36f..d78df50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ ubuntu-dev-tools (0.155) UNRELEASED; urgency=medium
   [ Benjamin Drung ]
   * Move python*-ubuntutools to section Python
   * Bump Standards-Version to 3.9.6 (no changes needed)
+  * Install bash completions into /usr/share/bash-completion/completions
+    instead of deprecated /etc/bash_completion.d
 
  -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>  Mon, 19 Jan 2015 14:15:32 +0000
 
diff --git a/debian/rules b/debian/rules
index 9baf9c1..accbc51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,5 @@ export PYBUILD_NAME=ubuntutools
 override_dh_install:
 	dh_install
 	mkdir -p debian/ubuntu-dev-tools/usr
-	mv debian/python-ubuntutools/etc debian/ubuntu-dev-tools
 	mv debian/python-ubuntutools/usr/bin debian/ubuntu-dev-tools/usr/
 	mv debian/python-ubuntutools/usr/share debian/ubuntu-dev-tools/usr/
diff --git a/setup.py b/setup.py
index 665b6de..a2c4a04 100755
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ else:
            'update-maintainer',
           ]
     data_files = [
-        ('/etc/bash_completion.d', glob.glob("bash_completion/*")),
+        ('share/bash-completion/completions', glob.glob("bash_completion/*")),
         ('share/man/man1', glob.glob("doc/*.1")),
         ('share/man/man5', glob.glob("doc/*.5")),
         ('share/ubuntu-dev-tools', ['enforced-editing-wrapper']),