diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index b945fff6967..7957d4facb8 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,19 +1,20 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=5.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
  --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d
  --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez4"
 hostmakedepends="automake libtool pkg-config intltool which orc-devel"
-makedepends="zlib-devel libltdl-devel glib-devel libudev-devel speex-devel libXi-devel
+makedepends="
+ zlib-devel libltdl-devel glib-devel libudev-devel speex-devel libXi-devel
  libXtst-devel xcb-util-devel libsndfile-devel libasyncns-devel
  dbus-devel tdb-devel libcap-devel avahi-libs-devel openssl-devel
  libsamplerate-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel
- systemd-devel webrtc-audio-processing-devel sbc-devel
- libcap-progs libxcb-devel libXtst-devel libSM-devel rtkit"
+ webrtc-audio-processing-devel sbc-devel libxcb-devel libXtst-devel libSM-devel
+ libcap-progs rtkit"
 depends="rtkit"
 conf_files="
 	/etc/pulse/system.pa
@@ -27,6 +28,18 @@ license="LGPL-2"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
 checksum=99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939
 
+# Package build options
+build_options="systemd"
+build_options_default="systemd"
+desc_option_systemd="Enable support for systemd"
+
+if [ "$build_option_systemd" ]; then
+	configure_args+=" --enable-systemd --enable-systemd-journal"
+	makedepends+=" systemd-devel"
+else
+	configure_args+=" --disable-systemd --disable-systemd-journal"
+fi
+
 pre_configure() {
 	libtoolize -f
 }
@@ -38,18 +51,6 @@ post_install() {
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/pulseaudio-bash-completion.sh \
 		${DESTDIR}/usr/share/bash-completion/completions/pulseaudio
-
-	# Disable autospawn by default
-	sed -e '/autospawn/iautospawn=no' -i ${DESTDIR}/etc/pulse/client.conf
-
-	# Speed up pulseaudio shutdown so that it exits immediately with
-	# the last user session (module-systemd-login keeps it alive)
-	sed -e '/exit-idle-time/iexit-idle-time=0' -i ${DESTDIR}/etc/pulse/daemon.conf
-
-	# Disable cork-request module, can result in e.g. media players unpausing
-	# when there's a Skype call incoming
-	sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
-		-i ${DESTDIR}/usr/bin/start-pulseaudio-x11
 }
 
 libpulseaudio_package() {