diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 0cba228..3edaaca 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer})
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=12.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
 license=(GPL)
@@ -59,7 +59,6 @@ package_pulseaudio() {
            webrtc-audio-processing)
   optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
-  install=pulseaudio.install
   replaces=('pulseaudio-xen<=9.0' 'pulseaudio-gconf<=11.1')
 
   cd pulseaudio
@@ -87,6 +86,10 @@ package_pulseaudio() {
   sed -e '/autospawn/iautospawn = no' \
       -i etc/pulse/client.conf
 
+  # Enable socket by default
+  install -d "${pkgdir}/usr/lib/systemd/user/sockets.target.wants"
+  ln -s ../pulseaudio.socket "${pkgdir}/usr/lib/systemd/user/sockets.target.wants/pulseaudio.socket"
+
   # 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|#&|' \
diff --git a/trunk/pulseaudio.install b/trunk/pulseaudio.install
deleted file mode 100644
index f6f8478..0000000
--- a/trunk/pulseaudio.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  # Enable socket by default
-  systemctl --global enable pulseaudio.socket
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 8.0-3) < 0)); then
-    systemctl --global enable pulseaudio.socket
-  fi
-}
-
-pre_remove() {
-  systemctl --global disable pulseaudio.socket
-}