diff --git a/Makefile.am b/Makefile.am
index fc08daa53d..3732258e66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -502,11 +502,14 @@ MANPAGES_ALIAS = \
 	man/init.1 \
 	man/systemd-modules-load.8 \
 	man/systemd-sysctl.8 \
+	man/systemd-journald.socket.8 \
 	man/systemd-journald.8 \
 	man/systemd-remount-fs.8 \
 	man/systemd-update-utmp-shutdown.service.8 \
 	man/systemd-update-utmp.8 \
+	man/systemd-initctl.socket.8 \
 	man/systemd-initctl.8 \
+	man/systemd-shutdownd.socket.8 \
 	man/systemd-shutdownd.8 \
 	man/systemd-hibernate.service.8 \
 	man/systemd-sleep.8 \
@@ -521,11 +524,14 @@ man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 man/systemd-modules-load.8: man/systemd-modules-load.service.8
 man/systemd-sysctl.8: man/systemd-sysctl.service.8
+man/systemd-journald.socket.8: man/systemd-journald.service.8
 man/systemd-journald.8: man/systemd-journald.service.8
 man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
 man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
 man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-initctl.socket.8: man/systemd-initctl.service.8
 man/systemd-initctl.8: man/systemd-initctl.service.8
+man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
 man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
 man/systemd-hibernate.service.8: man/systemd-suspend.service.8
 man/systemd-sleep.8: man/systemd-suspend.service.8
diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
index 92d91fcb48..d3b537d91a 100644
--- a/man/systemd-initctl.service.xml
+++ b/man/systemd-initctl.service.xml
@@ -44,12 +44,14 @@
 
         <refnamediv>
                 <refname>systemd-initctl.service</refname>
+                <refname>systemd-initctl.socket</refname>
                 <refname>systemd-initctl</refname>
                 <refpurpose>systemd <filename>/dev/initctl</filename> Compatibility</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
                 <para><filename>systemd-initctl.service</filename></para>
+                <para><filename>systemd-initctl.socket</filename></para>
                 <para><filename>/usr/lib/systemd/systemd-initctl</filename></para>
         </refsynopsisdiv>
 
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 65f6e52602..83c59d463b 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -44,12 +44,14 @@
 
         <refnamediv>
                 <refname>systemd-journald.service</refname>
+                <refname>systemd-journald.socket</refname>
                 <refname>systemd-journald</refname>
                 <refpurpose>systemd Journal Service</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
                 <para><filename>systemd-journald.service</filename></para>
+                <para><filename>systemd-journald.socket</filename></para>
                 <para><filename>/usr/lib/systemd/systemd-journald</filename></para>
         </refsynopsisdiv>
 
diff --git a/man/systemd-shutdownd.service.xml b/man/systemd-shutdownd.service.xml
index 146495a0b9..c4ace482a6 100644
--- a/man/systemd-shutdownd.service.xml
+++ b/man/systemd-shutdownd.service.xml
@@ -44,12 +44,14 @@
 
         <refnamediv>
                 <refname>systemd-shutdownd.service</refname>
+                <refname>systemd-shutdownd.socket</refname>
                 <refname>systemd-shutdownd</refname>
                 <refpurpose>systemd scheduled shutdown daemon</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
                 <para><filename>systemd-shutdownd.service</filename></para>
+                <para><filename>systemd-shutdownd.socket</filename></para>
                 <para><filename>/usr/lib/systemd/systemd-shutdownd</filename></para>
         </refsynopsisdiv>
 
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 0c76d059fc..c290b2fdac 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -24,13 +24,17 @@
   </refmeta>
 
   <refnamediv>
-    <refname>systemd-udevd.service</refname>
+    <refname>systemd-udev.service</refname>
+    <refname>systemd-udev-control.socket</refname>
+    <refname>systemd-udev-kernel.socket</refname>
     <refname>systemd-udevd</refname>
     <refpurpose>Device event managing daemon</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-udevd.service</filename></para>
+    <para><filename>systemd-udev.service</filename></para>
+    <para><filename>systemd-udev-control.socket</filename></para>
+    <para><filename>systemd-udev-kernel.socket</filename></para>
 
     <cmdsynopsis>
       <command>/usr/lib/systemd/systemd-udevd</command>
diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index abafc525d7..b98d5ca6e9 100644
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=/dev/initctl Compatibility Named Pipe
+Documentation=man:systemd-initctl.service(8)
 DefaultDependencies=no
 Before=sockets.target
 
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index 0454e3e340..dbe8882c0e 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Journal Socket
-Documentation=man:journald.conf(5)
+Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Before=sockets.target syslog.target
 
diff --git a/units/systemd-shutdownd.service.in b/units/systemd-shutdownd.service.in
index f51417f58e..d951742500 100644
--- a/units/systemd-shutdownd.service.in
+++ b/units/systemd-shutdownd.service.in
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Delayed Shutdown Service
-Documentation=man:systemd-shutdown.service(8)
+Documentation=man:systemd-shutdownd.service(8)
 DefaultDependencies=no
 
 [Service]
diff --git a/units/systemd-shutdownd.socket b/units/systemd-shutdownd.socket
index ed6225a098..9421ce8ada 100644
--- a/units/systemd-shutdownd.socket
+++ b/units/systemd-shutdownd.socket
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Delayed Shutdown Socket
+Documentation=man:systemd-shutdownd.service(8)
 DefaultDependencies=no
 Before=sockets.target
 
diff --git a/units/systemd-udev-control.socket b/units/systemd-udev-control.socket
index e835ab6f4c..e7678a049e 100644
--- a/units/systemd-udev-control.socket
+++ b/units/systemd-udev-control.socket
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=udev Control Socket
-Documentation=man:udev(7) man:systemd-udevd.service(8)
+Documentation=man:systemd-udevd.service(8) man:udev(7)
 DefaultDependencies=no
 ConditionCapability=CAP_MKNOD
 
diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udev-kernel.socket
index 321dd467fa..588f9f5e44 100644
--- a/units/systemd-udev-kernel.socket
+++ b/units/systemd-udev-kernel.socket
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=udev Kernel Socket
-Documentation=man:udev(7) man:systemd-udevd.service(8)
+Documentation=man:systemd-udevd.service(8) man:udev(7)
 DefaultDependencies=no
 ConditionCapability=CAP_MKNOD
 
diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in
index f02c602b78..b444870533 100644
--- a/units/systemd-udev.service.in
+++ b/units/systemd-udev.service.in
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=udev Kernel Device Manager
-Documentation=man:udev(7) man:systemd-udevd.service(8)
+Documentation=man:systemd-udevd.service(8) man:udev(7)
 Wants=systemd-udev-control.socket systemd-udev-kernel.socket
 After=systemd-udev-control.socket systemd-udev-kernel.socket
 Before=basic.target