diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index c59b8add875c..e584feec0a86 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	12.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
@@ -70,11 +70,9 @@ GSETTINGS_VARS=	GLIB_SCHEMAS=org.freedesktop.pulseaudio.gschema.xml
 SIMD_CONFIGURE_ENABLE=	orc
 SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc
 
-OPTIONS_GROUP=	AUDIO COMPLETIONS
+OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA JACK SOXR SPEEX WEBRTC_AEC
-OPTIONS_GROUP_COMPLETIONS=	BASH ZSH
 AUDIO_DESC=	Audio support
-COMPLETIONS_DESC=	Programmable completions
 ALSA_CONFIGURE_ENABLE=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 JACK_CONFIGURE_ENABLE=	jack
@@ -87,7 +85,6 @@ SPEEX_LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
 WEBRTC_AEC_DESC=	WebRTC-based echo canceller
 WEBRTC_AEC_LIB_DEPENDS=	libwebrtc_audio_processing.so:audio/webrtc-audio-processing
 WEBRTC_AEC_CONFIGURE_ENABLE=	webrtc-aec
-ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir
 
 OPTIONS_SINGLE=	DATABASE
 OPTIONS_SINGLE_DATABASE=	TDB GDBM SIMPLE
@@ -120,7 +117,4 @@ post-install:
 	@(cd ${STAGEDIR}${PREFIX}/libexec && \
 		${FIND} * -maxdepth 0 -type d -empty -name pulse -delete)
 
-post-install-BASH-off:
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion
-
 .include <bsd.port.mk>
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index fcf9c775aee5..6d4882de5cb9 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -12,15 +12,15 @@ bin/pax11publish
 bin/pulseaudio
 bin/qpaeq
 bin/start-pulseaudio-x11
-%%BASH%%share/bash-completion/completions/pacat
-%%BASH%%share/bash-completion/completions/pacmd
-%%BASH%%share/bash-completion/completions/pactl
-%%BASH%%share/bash-completion/completions/padsp
-%%BASH%%share/bash-completion/completions/paplay
-%%BASH%%share/bash-completion/completions/parec
-%%BASH%%share/bash-completion/completions/parecord
-%%BASH%%share/bash-completion/completions/pasuspender
-%%BASH%%share/bash-completion/completions/pulseaudio
+share/bash-completion/completions/pacat
+share/bash-completion/completions/pacmd
+share/bash-completion/completions/pactl
+share/bash-completion/completions/padsp
+share/bash-completion/completions/paplay
+share/bash-completion/completions/parec
+share/bash-completion/completions/parecord
+share/bash-completion/completions/pasuspender
+share/bash-completion/completions/pulseaudio
 etc/dbus-1/system.d/pulseaudio-system.conf
 @sample etc/pulse/client.conf.sample
 @sample etc/pulse/daemon.conf.sample
@@ -241,7 +241,7 @@ man/man5/pulse-daemon.conf.5.gz
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf
 %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-usb-audio.conf
-%%ZSH%%share/zsh/site-functions/_pulseaudio
+share/zsh/site-functions/_pulseaudio
 share/locale/as/LC_MESSAGES/pulseaudio.mo
 share/locale/be/LC_MESSAGES/pulseaudio.mo
 share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo