diff --git a/Makefile.am b/Makefile.am
index 07dc73f73..665736d60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,7 +62,19 @@ cmakedir = $(libdir)/cmake/PulseAudio
 cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
 
 bashcompletiondir=$(sysconfdir)/bash_completion.d
-dist_bashcompletion_DATA = shell-completion/pulseaudio-bash-completion.sh
+dist_bashcompletion_DATA = shell-completion/bash/pulseaudio
+
+install-bashcompletion-aliases:
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pactl
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacmd
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pasuspender
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/padsp
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacat
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/paplay
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parec
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parecord
+
+install-data-hook: install-bashcompletion-aliases
 
 zshcompletiondir=@zshcompletiondir@
 dist_zshcompletion_DATA = shell-completion/zsh/_pulseaudio
diff --git a/configure.ac b/configure.ac
index f426e0335..f807699de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,10 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_MKDIR_P
 
+# ln -s
+
+AC_PROG_LN_S
+
 # CC
 
 AC_PROG_CC
diff --git a/shell-completion/pulseaudio-bash-completion.sh b/shell-completion/bash/pulseaudio
similarity index 100%
rename from shell-completion/pulseaudio-bash-completion.sh
rename to shell-completion/bash/pulseaudio