diff --git a/Makefile b/Makefile
index 25a4f8f..da50283 100644
--- a/Makefile
+++ b/Makefile
@@ -111,8 +111,8 @@ install-etc:
 	cp etc/xm.tmpl        ${prefix}/etc/xen-tools/
 	cp etc/xm-nfs.tmpl    ${prefix}/etc/xen-tools/
 	cp partitions/*-*     ${prefix}/etc/xen-tools/partitions.d/
-	-mkdir -p                         ${prefix}/etc/bash_completion.d/
-	cp misc/xen-tools.bash-completion ${prefix}/etc/bash_completion.d/xen-tools
+	-mkdir -p                         ${prefix}/usr/share/bash-completion/completions/
+	cp misc/xen-tools.bash-completion ${prefix}/usr/share/bash-completion/completions/xen-tools
 	-mkdir -p                         ${prefix}/etc/initramfs-tools/conf.d/
 	cp misc/xen-tools.initramfs-tools ${prefix}/etc/initramfs-tools/conf.d/xen-tools
 
diff --git a/debian/changelog b/debian/changelog
index 1cac11e..7a5fcd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium
       #774936) Thanks Lukas Schwaighofer!
     + Change all occurrences of http.debian.net to httpredir.debian.org
     + Preliminary support for Debian 9 Stretch.
+    + Installs bash completion into /usr/share/bash-completion/ (fixes
+      lintian warning package-install-into-obsolete-dir)
   * Update Vcs-* headers as Gitorious will close its doors in June.
 
  -- Axel Beckert <abe@debian.org>  Fri, 09 Jan 2015 13:10:37 +0100