diff --git a/Makefile.am b/Makefile.am
index e69542e79..12371406c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc test systemd
+SUBDIRS =  src doc test systemd bash_completion.d
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/bash_completion.d/Makefile.am b/bash_completion.d/Makefile.am
new file mode 100644
index 000000000..9665dfe84
--- /dev/null
+++ b/bash_completion.d/Makefile.am
@@ -0,0 +1,2 @@
+bash_completiondir = @datarootdir@/bash-completion/completions/
+dist_bash_completion_DATA = tinc
diff --git a/configure.ac b/configure.ac
index 241f17286..1b8b887ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,6 +266,6 @@ if test "x$runstatedir" = "x"; then
   AC_SUBST([runstatedir], ['${localstatedir}/run'])
 fi
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile test/Makefile systemd/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile test/Makefile systemd/Makefile bash_completion.d/Makefile])
 
 AC_OUTPUT