diff --git a/Makefile.am b/Makefile.am
index 823dfeb..d99fed6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,5 +3,5 @@ SUBDIRS = src man
 
 if ENABLE_BASH_COMPLETION
 bashcompletiondir = $(BASH_COMPLETION_DIR)
-dist_bashcompletion_DATA = config/bash-autocomplete/hstr
+dist_bashcompletion_DATA = etc/bash-completion.d/hstr
 endif
diff --git a/etc/bash-completion.d/hstr b/etc/bash-completion.d/hstr
new file mode 100755
index 0000000..d1a73db
--- /dev/null
+++ b/etc/bash-completion.d/hstr
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# Copyright (C) 2014-2018  Martin Dvorak <martin.dvorak@mindforger.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Bash completion support for HSTR
+
+# Source this file or install it to /usr/share/bash-completion/completions or /etc/bash_completion.d/
+# See https://iridakos.com/tutorials/2018/03/01/bash-programmable-completion-tutorial.html
+# help complete
+# complete -W "--favorites --kill-last-command --non-interactive --show-configuration --show-zsd-configuration --show-blacklist --version --help" hstr
+
+_hstr()
+{
+        local cur prev OPTS
+        COMPREPLY=()
+        cur="${COMP_WORDS[COMP_CWORD]}"
+        prev="${COMP_WORDS[COMP_CWORD-1]}"
+        case $prev in
+                '-h'|'--help'|'-v'|'--version')
+                        return 0
+                        ;;
+        esac
+        case $cur in
+                -*)
+                        OPTS="--favorites --kill-last-command --non-interactive --show-configuration --show-zsd-configuration --show-blacklist --version --help"
+                        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+                        return 0
+                        ;;
+        esac
+        compopt -o bashdefault
+        COMPREPLY=( $(compgen -c -- $cur) )
+        return 0
+}
+complete -F _hstr hstr
+complete -F _hstr hh
+
+# eof