diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 967fe2f..1ee3d99 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -65,4 +65,9 @@ package() {
 	for i in *.*; do
 		install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
 	done
+
+	install -d "${pkgdir}/usr/lib/systemd/user/sockets.target.wants"
+	for i in dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket; do
+		ln -s ../"$i" "${pkgdir}/usr/lib/systemd/user/sockets.target.wants/${i}"
+	done
 }
diff --git a/trunk/install b/trunk/install
index 95cb351..e5c8eac 100644
--- a/trunk/install
+++ b/trunk/install
@@ -1,41 +1,10 @@
-_global_units() {
-	_units=(dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket)
-	_dir=/etc/systemd/user/sockets.target.wants
-
-	case $1 in
-		enable)
-			mkdir -p $_dir
-			for _u in "${_units[@]}"; do
-				ln -sf /usr/lib/systemd/user/$_u $_dir/$_u
-			done
-			;;
-		disable)
-			for _u in "${_units[@]}"; do
-				rm -f $_dir/$_u
-			done
-			rmdir -p --ignore-fail-on-non-empty $_dir
-			;;
-	esac
-}
-
 post_install() {
 	# See FS#42798 and FS#47371
 	dirmngr </dev/null &>/dev/null
-
-	# Let systemd supervise daemons by default
-	_global_units enable
 }
 
 post_upgrade() {
 	if (( $(vercmp $2 2.1.13-1) < 0 )); then
 		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
 	fi
-
-	if (( $(vercmp $2 2.1.21-3) < 0 )); then
-		_global_units enable
-	fi
-}
-
-pre_remove() {
-	_global_units disable
 }