diff --git a/samples/Makefile.am b/samples/Makefile.am
index 33897be56dffc0fe9dd50ce717e3f3c0a43afcdd..2d062563aad29c34a6ffb7ba86e6bad0626f1331 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -15,7 +15,7 @@ knot.sample.conf: knot.sample.conf.in
 	  $(edit) $${srcdir}$@.in >$@.tmp
 	mv $@.tmp $@
 
-EXTRA_DIST = knot.sample.conf.in example.com.zone
+EXTRA_DIST = knot.sample.conf.in example.com.zone keymgr-completion.sh keymgr-completion.zsh
 
 if HAVE_DAEMON
 
@@ -24,12 +24,28 @@ install-data-local: knot.sample.conf
 	  $(INSTALL) -d $(DESTDIR)/$(config_dir)
 	[ -f $(DESTDIR)/$(config_dir)/knot.sample.conf ] || \
 	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir)
+	[ -d $(DESTDIR)/$(sysconfdir)/bash_completion.d ] ||
+	  $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/bash_completion.d
+	[ -f $(DESTDIR)/$(sysconfdir)/keymgr-completion.sh ] || \
+	  $(INSTALL_DATA) keymgr-completion.sh $(DESTDIR)/$(sysconfdir)/bash_completion.d/keymgr
+	[ -d $(DESTDIR)/$(sysconfdir)/bash_completion.d ] ||
+	  $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/bash_completion.d
+	[ -f $(DESTDIR)/$(sysconfdir)/keymgr-completion.sh ] || \
+	  $(INSTALL_DATA) keymgr-completion.sh $(DESTDIR)/$(sysconfdir)/bash_completion.d/
+	[ -d $(DESTDIR)/$(datadir)/zsh/functions/Completion/Knot ] || \
+	  $(INSTALL) -d $(DESTDIR)/$(datadir)/zsh/functions/Completion/Knot
+	[ -f $(DESTDIR)/$(datadir)/zsh/functions/Completion/Knot/_keymgr ] || \
+	  $(INSTALL_DATA) keymgr-completion.zsh $(DESTDIR)/$(datadir)/zsh/functions/Completion/Knot/_keymgr
 
 uninstall-local:
 	[ -f $(DESTDIR)/$(config_dir)/knot.sample.conf ] && \
 	  rm -f $(DESTDIR)/$(config_dir)/knot.sample.conf
 	[ -f $(DESTDIR)/$(config_dir)/example.com.zone ] && \
 	  rm -f $(DESTDIR)/$(config_dir)/example.com.zone
+	[ -f $(DESTDIR)/$(sysconfdir)/keymgr-completion.sh ] && \
+	  rm -f $(DESTDIR)/$(sysconfdir)/bash_completion.d/keymgr
+	[ -f $(DESTDIR)/$(datadir)/zsh/functions/Completion/Knot/_keymgr ] && \
+	  rm -f $(DESTDIR)/$(datadir)/zsh/functions/Completion/Knot/_keymgr
 
 endif # HAVE_DAEMON
 
diff --git a/contrib/keymgr-completion.sh b/samples/keymgr-completion.sh
similarity index 100%
rename from contrib/keymgr-completion.sh
rename to samples/keymgr-completion.sh
diff --git a/contrib/keymgr-completion.zsh b/samples/keymgr-completion.zsh
similarity index 100%
rename from contrib/keymgr-completion.zsh
rename to samples/keymgr-completion.zsh