diff --git a/srcpkgs/pulseaudio/libpulseaudio.rshlibs b/srcpkgs/pulseaudio/libpulseaudio.rshlibs
index 85df427eac..d7f83ba1e3 100644
--- a/srcpkgs/pulseaudio/libpulseaudio.rshlibs
+++ b/srcpkgs/pulseaudio/libpulseaudio.rshlibs
@@ -1,17 +1,10 @@
 libjson.so.0
-libX11-xcb.so.1
-libX11.so.6
-libxcb.so.1
-libSM.so.6
-libICE.so.6
-libXtst.so.6
-libsndfile.so.1
-libasyncns.so.0
 libdbus-1.so.3
-libglib-2.0.so.0
-libcap.so.2
 libpthread.so.0
-librt.so.1
-libdl.so.2
 libm.so.6
 libc.so.6
+libglib-2.0.so.0
+libxcb.so.1
+libsndfile.so.1
+libasyncns.so.0
+librt.so.1
diff --git a/srcpkgs/pulseaudio/pulseaudio-devel.template b/srcpkgs/pulseaudio/pulseaudio-devel.template
index 1484b765cc..a7c682890e 100644
--- a/srcpkgs/pulseaudio/pulseaudio-devel.template
+++ b/srcpkgs/pulseaudio/pulseaudio-devel.template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio-devel'.
 #
 noarch=yes
-depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=$version"
+depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio-${version}_${revision}"
 short_desc="${short_desc} - development files"
 long_desc="
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
diff --git a/srcpkgs/pulseaudio/pulseaudio.rshlibs b/srcpkgs/pulseaudio/pulseaudio.rshlibs
index c4d133622c..a2cde897e5 100644
--- a/srcpkgs/pulseaudio/pulseaudio.rshlibs
+++ b/srcpkgs/pulseaudio/pulseaudio.rshlibs
@@ -1,39 +1,35 @@
-libpulse.so.0
-libxcb.so.1
-libpthread.so.0
-libc.so.6
-libsndfile.so.1
 libltdl.so.7
-libdbus-1.so.3
-libcap.so.2
-libdl.so.2
-libbluetooth.so.3
 libsamplerate.so.0
 libspeexdsp.so.1
-libjson.so.0
+libpulse.so.0
+libpulsecommon-2.1.so
 libX11-xcb.so.1
 libX11.so.6
-libSM.so.6
-libICE.so.6
-libXtst.so.6
-libasyncns.so.0
+libsndfile.so.1
 liborc-0.4.so.0
+libdbus-1.so.3
 libtdb.so.1
-librt.so.1
+libpthread.so.0
 libm.so.6
-ld-linux.so.2
+libc.so.6
+ld-linux-x86-64.so.2
+libsystemd-daemon.so.0
+libxcb.so.1
+libICE.so.6
+libSM.so.6
+libXtst.so.6
 libasound.so.2
+libudev.so.1
 libavahi-common.so.3
 libavahi-client.so.3
 libjack.so.0
-libssl.so.1
+libsystemd-login.so.0
 libcrypto.so.1
 libfftw3f.so.3
-ld-linux-x86-64.so.2
-libsystemd-login.so.0
-libsystemd-daemon.so.0
+libwebrtc_audio_processing.so.0
+libcap.so.2
+librt.so.1
+libdl.so.2
 libstdc++.so.6
 libgcc_s.so.1
-libwebrtc_audio_processing.so.0
-libudev.so.1
-libpulsecommon-2.1.so
+libbluetooth.so.3
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 9064fcec4b..49601cf21d 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,19 +1,19 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
---enable-jack --disable-lirc --disable-hal --disable-hal-compat
---disable-gconf --with-database=tdb --enable-orc
---with-udev-rules-dir=/usr/lib/udev/rules.d"
+ --enable-jack --disable-lirc --disable-hal --disable-hal-compat
+ --disable-gconf --with-database=tdb --enable-orc
+ --with-udev-rules-dir=/usr/lib/udev/rules.d"
 depends="libpulseaudio>=${version}"
 makedepends="pkg-config intltool zlib-devel gtk+-devel libltdl-devel
-speex-devel libXi-devel libXtst-devel xcb-util-devel libxcb-devel
-libsndfile-devel libasyncns-devel dbus-devel tdb-devel libcap-devel
-libbluetooth-devel avahi-libs-devel alsa-lib-devel libudev-devel>=183
-openssl-devel libsamplerate-devel json-c-devel orc-devel glib-devel
-jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel"
+ speex-devel libXi-devel libXtst-devel xcb-util-devel libxcb-devel
+ libsndfile-devel libasyncns-devel dbus-devel tdb-devel libcap-devel
+ libbluetooth-devel avahi-libs-devel alsa-lib-devel libudev-devel>=183
+ openssl-devel libsamplerate-devel json-c-devel orc-devel glib-devel
+ jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel"
 fulldepends="rtkit"
 subpackages="libpulseaudio $pkgname-devel"
 short_desc="A featureful, general-purpose sound server"