diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 914607e3f8d..6137a6d8365 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -212,9 +212,9 @@
     receives any DNS traffic not matching any of its configured search/route-only domains, set the "DNS
     default route" option for it to false.</para>
 
-    <para>See the <ulink url="https://www.freedesktop.org/wiki/Software/systemd/resolved">resolved D-Bus API
-    Documentation</ulink> for information about the APIs <filename>systemd-resolved</filename> provides.
-    </para>
+    <para>See
+    <citerefentry><refentrytitle>org.freedesktop.resolve1</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    for information about the D-Bus APIs <filename>systemd-resolved</filename> provides.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml
index 81a37f67898..49d98d496ae 100644
--- a/man/systemd.offline-updates.xml
+++ b/man/systemd.offline-updates.xml
@@ -126,8 +126,8 @@
         script exits uncleanly (by non-zero error code, or signal/coredump). If your script succeeds
         you should trigger the reboot in your own code, for example by invoking logind's
         <command>Reboot()</command> call or calling <command>systemctl reboot</command>. See
-        <ulink url="https://www.freedesktop.org/wiki/Software/systemd/logind">logind dbus API</ulink>
-        for details.</para>
+        <citerefentry><refentrytitle>org.freedesktop.login1</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        for details about the logind D-Bus API.</para>
       </listitem>
 
       <listitem>
diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
index 7109e0351ce..a14bb5b409d 100644
--- a/units/systemd-homed.service.in
+++ b/units/systemd-homed.service.in
@@ -10,6 +10,8 @@
 [Unit]
 Description=Home Area Manager
 Documentation=man:systemd-homed.service(8)
+Documentation=man:org.freedesktop.home1(5)
+
 After=home.mount
 
 [Service]
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
index 923f32f6dbb..017441f9dad 100644
--- a/units/systemd-hostnamed.service.in
+++ b/units/systemd-hostnamed.service.in
@@ -9,8 +9,10 @@
 
 [Unit]
 Description=Hostname Service
-Documentation=man:systemd-hostnamed.service(8) man:hostname(5) man:machine-info(5)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/hostnamed
+Documentation=man:systemd-hostnamed.service(8)
+Documentation=man:hostname(5)
+Documentation=man:machine-info(5)
+Documentation=man:org.freedesktop.resolve1(5)
 
 [Service]
 BusName=org.freedesktop.hostname1
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
index 1a6fae4b69d..58a7b472599 100644
--- a/units/systemd-importd.service.in
+++ b/units/systemd-importd.service.in
@@ -10,7 +10,7 @@
 [Unit]
 Description=Virtual Machine and Container Download Service
 Documentation=man:systemd-importd.service(8)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/importd
+Documentation=man:org.freedesktop.import1(5)
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-importd
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
index 69d25f67333..47f147956b6 100644
--- a/units/systemd-localed.service.in
+++ b/units/systemd-localed.service.in
@@ -9,8 +9,10 @@
 
 [Unit]
 Description=Locale Service
-Documentation=man:systemd-localed.service(8) man:locale.conf(5) man:vconsole.conf(5)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/localed
+Documentation=man:systemd-localed.service(8)
+Documentation=man:locale.conf(5)
+Documentation=man:vconsole.conf(5)
+Documentation=man:org.freedesktop.locale1(5)
 
 [Service]
 BusName=org.freedesktop.locale1
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
index ba1b9b791bc..a00c858b6ca 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -9,9 +9,11 @@
 
 [Unit]
 Description=User Login Management
-Documentation=man:systemd-logind.service(8) man:logind.conf(5)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/logind
+Documentation=man:systemd-logind.service(8)
+Documentation=man:logind.conf(5)
+Documentation=man:org.freedesktop.login1(5)
 Documentation=https://www.freedesktop.org/wiki/Software/systemd/multiseat
+
 Wants=user.slice modprobe@drm.service
 After=nss-user-lookup.target user.slice modprobe@drm.service
 
diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
index 3db0281f81d..0e452ddcab1 100644
--- a/units/systemd-machined.service.in
+++ b/units/systemd-machined.service.in
@@ -10,7 +10,8 @@
 [Unit]
 Description=Virtual Machine and Container Registration Service
 Documentation=man:systemd-machined.service(8)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/machined
+Documentation=man:org.freedesktop.machine1(5)
+
 Wants=machine.slice
 After=machine.slice
 RequiresMountsFor=/var/lib/machines
diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in
index 2432485e9ee..513d96b74cf 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.in
@@ -10,9 +10,10 @@
 [Unit]
 Description=Network Name Resolution
 Documentation=man:systemd-resolved.service(8)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/resolved
+Documentation=man:org.freedesktop.resolve1(5)
 Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-network-configuration-managers
 Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients
+
 DefaultDependencies=no
 After=systemd-sysusers.service systemd-networkd.service
 Before=network.target nss-lookup.target shutdown.target
diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
index 2d51c0f8934..f84bd3830b7 100644
--- a/units/systemd-timedated.service.in
+++ b/units/systemd-timedated.service.in
@@ -9,8 +9,9 @@
 
 [Unit]
 Description=Time & Date Service
-Documentation=man:systemd-timedated.service(8) man:localtime(5)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/timedated
+Documentation=man:systemd-timedated.service(8)
+Documentation=man:localtime(5)
+Documentation=man:org.freedesktop.timedate1(5)
 
 [Service]
 BusName=org.freedesktop.timedate1