diff --git a/conf/Makefile.am b/conf/Makefile.am
index cb45ecd..70c5915 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -1,9 +1,10 @@
 nobase_dist_sysconf_DATA =
+nobase_dist_data_DATA =
 
 if INSTALL_UFW
   nobase_dist_sysconf_DATA += ufw/applications.d/mosh
 endif
 
 if INSTALL_COMPLETION
-  nobase_dist_sysconf_DATA += bash_completion.d/mosh
+  nobase_dist_data_DATA += bash-completion/completions/mosh
 endif
diff --git a/conf/bash-completion/completions/mosh b/conf/bash-completion/completions/mosh
new file mode 100644
index 0000000..e928112
--- /dev/null
+++ b/conf/bash-completion/completions/mosh
@@ -0,0 +1,9 @@
+_mosh () {
+    local cur prev
+
+    _init_completion || return
+
+    _known_hosts_real -a "$cur"
+}
+
+complete -F _mosh mosh
diff --git a/conf/bash_completion.d/mosh b/conf/bash_completion.d/mosh
deleted file mode 100644
index 93768d3..0000000
--- a/conf/bash_completion.d/mosh
+++ /dev/null
@@ -1 +0,0 @@
-complete -F _known_hosts mosh
diff --git a/debian/package.bash-completion b/debian/package.bash-completion
new file mode 100644
index 0000000..19d2e06
--- /dev/null
+++ b/debian/package.bash-completion
@@ -0,0 +1 @@
+conf/bash_completion.d/mosh