diff --git a/paludis/bashrc b/paludis/bashrc
index d6eaedc..51c7c0d 100644
--- a/paludis/bashrc
+++ b/paludis/bashrc
@@ -116,7 +116,6 @@ if [[
 	"${CATEGORY}/${PN}" != "sys-power/iasl" &&
 	"${CATEGORY}/${PN}" != "net-libs/libmnl" &&
 	"${CATEGORY}/${PN}" != "net-libs/opal" &&
-	"${CATEGORY}/${PN}" != "media-sound/paprefs" &&
 	"${CATEGORY}/${PN}" != "x11-libs/pixman"
 	]]
 then
diff --git a/paludis/use.conf.d/pulseaudio.conf b/paludis/use.conf.d/pulseaudio.conf
index 420259d..14ed066 100644
--- a/paludis/use.conf.d/pulseaudio.conf
+++ b/paludis/use.conf.d/pulseaudio.conf
@@ -1,3 +1,4 @@
-media-sound/pulseaudio gnome
+media-sound/pulseaudio gnome oss zeroconf gtk libsamplerate
+media-sound/pulseaudio ABI_X86: 32 64
 media-plugins/alsa-plugins pulseaudio
 */* pulseaudio
diff --git a/pulse/default.pa b/pulse/default.pa
index 4f095fb..730686c 100644
--- a/pulse/default.pa
+++ b/pulse/default.pa
@@ -66,14 +66,10 @@ load-module module-jackdbus-detect channels=2
 
 
 ### Load several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
 load-module module-native-protocol-unix
 
 ### Network access (may be configured with paprefs, so leave this commented
 ### here if you plan to use paprefs)
-load-module module-esound-protocol-tcp
 load-module module-native-protocol-tcp
 
 ### Load the RTP receiver module (also configured via paprefs, see above)