diff --git a/Makefile-man.am b/Makefile-man.am
index 76c938983..734a92379 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -83,7 +83,7 @@ MANPAGES += \
 	man/systemd-ask-password-console.service.8 \
 	man/systemd-ask-password.1 \
 	man/systemd-bus-proxyd.8 \
-	man/systemd-bus-proxyd@.service.8 \
+	man/systemd-bus-proxyd.service.8 \
 	man/systemd-cat.1 \
 	man/systemd-cgls.1 \
 	man/systemd-cgtop.1 \
@@ -572,7 +572,7 @@ man/system.conf.d.5: man/systemd-system.conf.5
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
-man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd@.service.8
+man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-fsck.8: man/systemd-fsck@.service.8
 man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
@@ -1145,7 +1145,7 @@ man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.servic
 man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
 	$(html-alias)
 
-man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd@.service.html
+man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd.service.html
 	$(html-alias)
 
 man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
@@ -2076,8 +2076,8 @@ EXTRA_DIST += \
 	man/systemd-backlight@.service.xml \
 	man/systemd-binfmt.service.xml \
 	man/systemd-bootchart.xml \
+	man/systemd-bus-proxyd.service.xml \
 	man/systemd-bus-proxyd.xml \
-	man/systemd-bus-proxyd@.service.xml \
 	man/systemd-cat.xml \
 	man/systemd-cgls.xml \
 	man/systemd-cgtop.xml \
diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd.service.xml
similarity index 85%
rename from man/systemd-bus-proxyd@.service.xml
rename to man/systemd-bus-proxyd.service.xml
index e6e0a8e88..5c0f3e1a7 100644
--- a/man/systemd-bus-proxyd@.service.xml
+++ b/man/systemd-bus-proxyd.service.xml
@@ -21,10 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-bus-proxyd@.service">
+<refentry id="systemd-bus-proxyd.service">
 
   <refentryinfo>
-    <title>systemd-bus-proxyd@.service</title>
+    <title>systemd-bus-proxyd.service</title>
     <productname>systemd</productname>
 
     <authorgroup>
@@ -38,18 +38,18 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-bus-proxyd@.service</refentrytitle>
+    <refentrytitle>systemd-bus-proxyd.service</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>systemd-bus-proxyd@.service</refname>
+    <refname>systemd-bus-proxyd.service</refname>
     <refname>systemd-bus-proxyd.socket</refname>
     <refpurpose>Proxy classic D-Bus clients to kdbus</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-bus-proxyd@.service</filename></para>
+    <para><filename>systemd-bus-proxyd.service</filename></para>
     <para><filename>systemd-bus-proxyd.socket</filename></para>
   </refsynopsisdiv>
 
@@ -57,11 +57,11 @@
     <title>Description</title>
 
     <para><filename>systemd-bus-proxyd.socket</filename> will launch
-    <filename>systemd-bus-proxyd@.service</filename> for connections
+    <filename>systemd-bus-proxyd.service</filename> for connections
     to the classic D-Bus socket in
     <filename>/var/run/dbus/system_bus_socket</filename>.</para>
 
-    <para><filename>systemd-bus-proxyd@.service</filename> is launched
+    <para><filename>systemd-bus-proxyd.service</filename> is launched
     for an existing D-Bus connection and will use
     <command>systemd-bus-proxyd</command> to proxy messages from this
     connection to the system bus (either kdbus or classic D-Bus).