diff --git a/packaging/common/xrdhttp.socket b/packaging/common/xrdhttp@.socket
similarity index 77%
rename from packaging/common/xrdhttp.socket
rename to packaging/common/xrdhttp@.socket
index 942636309da..0657df949e2 100644
--- a/packaging/common/xrdhttp.socket
+++ b/packaging/common/xrdhttp@.socket
@@ -3,7 +3,7 @@ Description=XrdHttp socket
 
 [Socket]
 ListenStream=80
-Service=xrootd@http.service
+Service=xrootd@%i.service
 
 [Install]
 WantedBy=sockets.target
diff --git a/packaging/common/xrootd@.socket b/packaging/common/xrootd@.socket
new file mode 100644
index 00000000000..0ede097e292
--- /dev/null
+++ b/packaging/common/xrootd@.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=XRootD socket
+
+[Socket]
+ListenStream=1094
+Service=xrootd@%i.service
+
+[Install]
+WantedBy=sockets.target
diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in
index 88eb12f164c..fb0ffbf57a3 100644
--- a/packaging/rhel/xrootd.spec.in
+++ b/packaging/rhel/xrootd.spec.in
@@ -455,7 +455,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xrootd
 
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/xrootd@.service $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 packaging/common/xrdhttp.socket   $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 packaging/common/xrdhttp@.socket   $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 packaging/common/xrootd@.socket    $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/cmsd@.service $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/frm_xfrd@.service $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/frm_purged@.service $RPM_BUILD_ROOT%{_unitdir}