diff --git a/configure.ac b/configure.ac
index df7368805703dd2b53fe3cc2fa2363977686ffb4..b41bd83232e35949f4319c90ec4b76fc63530e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,10 +40,6 @@ AC_SUBST([libzscanner_VERSION_INFO],["-version-info 0:1:0"])
 release_date=$(sed -n 's/^Knot DNS .* (\(.*\))/\1/p;q;' ${srcdir}/NEWS)
 AC_SUBST([RELEASE_DATE], $release_date)
 
-# Get Bash completion scripts directory
-bash_completion_dir=$(pkg-config --variable=completionsdir bash-completion)
-AC_SUBST([BASH_COMPLETION_DIR], $bash_completion_dir)
-
 # Set compiler compatibility flags
 AC_PROG_CC_C99
 AM_PROG_CC_C_O
@@ -114,6 +110,14 @@ PKG_CHECK_MODULES([gnutls], [gnutls >= 3.0 nettle])
 # JSON for DNSSEC status storage
 PKG_CHECK_MODULES([jansson], [jansson >= 2.3])
 
+# Get Bash completion scripts directory
+bash_completion_dir=""
+PKG_CHECK_MODULES([bash_completion],[bash-completion],[
+    bash_completion_dir=$(pkg-config --variable=completionsdir bash-completion)
+    AC_SUBST([BASH_COMPLETION_DIR], $bash_completion_dir)
+  ])
+AM_CONDITIONAL([HAVE_BASH_COMPLETION], test -n "$bash_completion_dir")
+
 # Debug modules
 AC_ARG_ENABLE([debug],
     AS_HELP_STRING([--enable-debug=server,zones,ns,loader,dnssec],
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 105be41f5360c664044cb2427218a5d603ef6917..d5174ae7d892140ffe95ae133051ab1c502626d5 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -24,10 +24,12 @@ install-data-local: knot.sample.conf
 	  $(INSTALL) -d $(DESTDIR)/$(config_dir); \
 	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \
 	fi
+if HAVE_BASH_COMPLETION
 	if [ \! -f $(BASH_COMPLETION_DIR)/keymgr ]; then \
 	  $(INSTALL) -d $(BASH_COMPLETION_DIR); \
 	  $(INSTALL_DATA) $(srcdir)/keymgr-completion.sh $(BASH_COMPLETION_DIR)/keymgr; \
 	fi
+endif # HAVE_BASH_COMPLETION
 
 uninstall-local:
 	-rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \