diff --git a/gnupg2.spec b/gnupg2.spec
index 8963694..bb38846 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,6 +1,6 @@
 Name:          gnupg2
 Version:       2.4.0
-Release:       1mamba
+Release:       2mamba
 Summary:       GnuPG is a complete and free replacement for PGP
 Group:         Applications/Security
 Vendor:        openmamba
@@ -66,6 +66,16 @@ install -d -m755 %{buildroot}%{_userunitdir}
 mv %{buildroot}%{_docdir}/gnupg/examples/systemd-user/*.socket %{buildroot}%{_userunitdir}
 mv %{buildroot}%{_docdir}/gnupg/examples/systemd-user/*.service %{buildroot}%{_userunitdir}
 
+
+units=({dirmngr,gpg-agent{,-{browser,extra,ssh}}}.socket)
+socket_target_dir=%{_userunitdir}/sockets.target.wants/
+
+install -d -m755 %{buildroot}%{_userunitdir}/sockets.target.wants
+
+for unit in "${units[@]}"; do
+  ln -sv ../${unit} %{buildroot}%{_userunitdir}/sockets.target.wants/${unit}
+done
+
 %find_lang %{name}
 
 %clean
@@ -110,6 +120,7 @@ mv %{buildroot}%{_docdir}/gnupg/examples/systemd-user/*.service %{buildroot}%{_u
 %{_libexecdir}/tpm2daemon
 %{_userunitdir}/*.service
 %{_userunitdir}/*.socket
+%{_userunitdir}/sockets.target.wants/*.socket
 %{_infodir}/gnupg.*
 %{_mandir}/man1/*
 %{_mandir}/man7/gnupg.7*
@@ -119,6 +130,9 @@ mv %{buildroot}%{_docdir}/gnupg/examples/systemd-user/*.service %{buildroot}%{_u
 %doc AUTHORS COPYING
 
 %changelog
+* Sun Feb 05 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.0-2mamba
+- install socket files under %{_userunitdir}/sockets.target.wants
+
 * Mon Dec 26 2022 Automatic Build System <autodist@mambasoft.it> 2.4.0-1mamba
 - automatic version update by autodist