diff --git a/debian/bash-completion b/debian/bash-completion
new file mode 100644
index 0000000..46d40e4
--- /dev/null
+++ b/debian/bash-completion
@@ -0,0 +1,2 @@
+bash_completion/debian-goodies.pkgnames
+debmany/bash_completion/debmany
diff --git a/debian/changelog b/debian/changelog
index e569785..7da42fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@
     it wasn't found. (Closes: #888276)
   * State in long package description that hard dependencies of single
     tools are listed in Recommends.
+  * Install bash completions with dh_bash-completion.
+    + Move according files from debian/install to debian/bash-completion.
+    + Call dh_bash-completion after dh_auto_install.
+    + Add bash-completion as build-dependency.
 
   [ Paul Wise ]
   * find-dbgsym-packages:
diff --git a/debian/control b/debian/control
index 7c1ccdd..73f6760 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
 Uploaders: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper (>= 11~),
+Build-Depends: bash-completion,
+               debhelper (>= 11~),
                help2man
 Vcs-Git: https://salsa.debian.org/debian/debian-goodies.git
 Vcs-Browser: https://salsa.debian.org/debian/debian-goodies
diff --git a/debian/install b/debian/install
index f8061ff..7ce0677 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
-bash_completion/debian-goodies.pkgnames debmany/bash_completion/debmany usr/share/bash-completion/completions
 checkrestart usr/sbin
 dgrep dglob debget dpigs debman dman popbugs which-pkg-broke which-pkg-broke-build dhomepage debmany/debmany check-enhancements find-dbgsym-packages usr/bin
diff --git a/debian/links b/debian/links
index 34cd31a..9b692f8 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,4 @@
+# dgrep variants
 usr/bin/dgrep usr/bin/degrep
 usr/bin/dgrep usr/bin/dfgrep
 usr/bin/dgrep usr/bin/dzegrep
diff --git a/debian/rules b/debian/rules
index 7dfbb54..919f036 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,5 +15,9 @@
 	         -N ./check-enhancements | \
 	    sed -e 's/DESCRIPTION/SYNOPSIS/' > check-enhancements.1
 
+override_dh_auto_install:
+	dh_auto_install
+	dh_bash-completion
+
 override_dh_auto_clean:
 	for prog in $(PODDOC); do rm -f $$prog.1; done