diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 9b42f42..e5dbed6 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=xdg-user-dirs
 pkgver=0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Manage user directories like ~/Desktop and ~/Music"
 arch=(x86_64)
 url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
@@ -13,7 +13,6 @@ license=(GPL)
 depends=(sh systemd)
 makedepends=(docbook-xsl git)
 backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
-install=xdg-user-dirs.install
 options=(!emptydirs)
 _commit=ec015cdd345dec8025948533e7a6f18680e7f70c  # tags/0.17^0
 source=("git+https://anongit.freedesktop.org/git/xdg/xdg-user-dirs#commit=$_commit"
@@ -44,4 +43,8 @@ package() {
   # We use a service
   rm "$pkgdir/etc/xdg/autostart/xdg-user-dirs.desktop"
   install -Dt "$pkgdir/usr/lib/systemd/user" -m644 ../xdg-user-dirs-update.service
+
+  # Enable service by default
+  install -d "${pkgdir}/usr/lib/systemd/user/default.target.wants"
+  ln -s ../xdg-user-dirs-update.service "${pkgdir}/usr/lib/systemd/user/default.target.wants/xdg-user-dirs-update.service"
 }
diff --git a/trunk/xdg-user-dirs.install b/trunk/xdg-user-dirs.install
deleted file mode 100644
index 2f2c726..0000000
--- a/trunk/xdg-user-dirs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  # Enable update by default
-  systemctl --global enable xdg-user-dirs-update.service
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 0.15-3) < 0)); then
-    systemctl --global enable xdg-user-dirs-update.service
-  fi
-}
-
-pre_remove() {
-  systemctl --global disable xdg-user-dirs-update.service
-}