diff --git a/TODO b/TODO
index c9f8bf9b916..b375327fe0d 100644
--- a/TODO
+++ b/TODO
@@ -1809,7 +1809,7 @@ Features:
 
 * fstab-generator: default to tmpfs-as-root if only usr= is specified on the kernel cmdline
 
-* docs: bring https://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime up to date
+* docs: bring https://systemd.io/MY_SERVICE_CANT_GET_REATLIME up to date
 
 * add a job mode that will fail if a transaction would mean stopping
   running units. Use this in timedated to manage the NTP service
diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index e9d721823f6..4ecd700f8b2 100644
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -88,10 +88,10 @@
     <ulink url="https://systemd.io/INHIBITOR_LOCKS">Inhibitor Locks</ulink>.</para>
 
     <para>If you are interested in writing a display manager that makes use of logind, please have look at
-    <ulink url="https://www.freedesktop.org/wiki/Software/systemd/writing-display-managers">Writing Display
+    <ulink url="https://systemd.io/WRITING_DISPLAY_MANAGERS">Writing Display
     Managers</ulink>.
     If you are interested in writing a desktop environment that makes use of logind, please have look at
-    <ulink url="https://www.freedesktop.org/wiki/Software/systemd/writing-desktop-environments">Writing
+    <ulink url="https://systemd.io/WRITING_DESKTOP_ENVIRONMENTS">Writing
     Desktop Environments</ulink>.</para>
   </refsect1>
 
diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index 49ee66d28ac..bb931ac50be 100644
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.xml
@@ -93,7 +93,7 @@
     for some examples on how to run containers with OS tools.</para>
 
     <para>If you are interested in writing a VM or container manager that makes use of machined, please have
-    look at <ulink url="https://www.freedesktop.org/wiki/Software/systemd/writing-vm-managers">Writing
+    look at <ulink url="https://systemd.io/WRITING_VM_AND_CONTAINER_MANAGERS">Writing
     Virtual Machine or Container Managers</ulink>. Also see the <ulink
     url="https://systemd.io/CONTROL_GROUP_INTERFACE">New Control Group
     Interfaces</ulink>.</para>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 415253c3e8d..192d09732a9 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -822,7 +822,7 @@
             on. All userspace log messages will be made available on
             this socket. For more information about syslog integration,
             please consult the <ulink
-            url="https://www.freedesktop.org/wiki/Software/systemd/syslog">Syslog
+            url="https://systemd.io/SYSLOG">Syslog
             Interface</ulink> document.</para>
           </listitem>
         </varlistentry>
diff --git a/test/fuzz/fuzz-unit-file/syslog.socket b/test/fuzz/fuzz-unit-file/syslog.socket
index 969ee428fa8..bb046a5c6f4 100644
--- a/test/fuzz/fuzz-unit-file/syslog.socket
+++ b/test/fuzz/fuzz-unit-file/syslog.socket
@@ -11,7 +11,7 @@ socket
 [Unit]
 Description=Syslog Socket
 Documentation=man:systemd.special(7)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/syslog
+Documentation=https://systemd.io/SYSLOG
 DefaultDependencies=no
 Before=sockets.target
 
@@ -45,7 +45,7 @@ ReceiveBuffer=8M
 # [Install]
 # Alias=syslog.service
 #
-# See https://www.freedesktop.org/wiki/Software/systemd/syslog for details.
+# See https://systemd.io/SYSLOG for details.
 
 [Socket]
 ListenStream=1.2.3.4:1234
diff --git a/test/fuzz/fuzz-unit-file/systemd-resolved.service b/test/fuzz/fuzz-unit-file/systemd-resolved.service
index 49d272b21f9..1b7cc15aeef 100644
--- a/test/fuzz/fuzz-unit-file/systemd-resolved.service
+++ b/test/fuzz/fuzz-unit-file/systemd-resolved.service
@@ -12,8 +12,8 @@ service
 Description=Network Name Resolution
 Documentation=man:systemd-resolved.service(8)
 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
+Documentation=https://systemd.io/WRITING_NETWORK_CONFIGURATION_MANAGERS
+Documentation=https://systemd.io/WRITING_RESOLVER_CLIENTS
 DefaultDependencies=no
 After=systemd-sysusers.service systemd-networkd.service
 Before=network.target nss-lookup.target shutdown.target
diff --git a/units/syslog.socket b/units/syslog.socket
index ff76bc5a6f4..26b691c105b 100644
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -10,7 +10,7 @@
 [Unit]
 Description=Syslog Socket
 Documentation=man:systemd.special(7)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/syslog
+Documentation=https://systemd.io/SYSLOG
 DefaultDependencies=no
 Before=sockets.target
 
@@ -44,4 +44,4 @@ ReceiveBuffer=8M
 # [Install]
 # Alias=syslog.service
 #
-# See https://www.freedesktop.org/wiki/Software/systemd/syslog for details.
+# See https://systemd.io/SYSLOG for details.
diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in
index 717f572bc53..4aa0788ac4e 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.in
@@ -11,8 +11,8 @@
 Description=Network Name Resolution
 Documentation=man:systemd-resolved.service(8)
 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
+Documentation=https://systemd.io/WRITING_NETWORK_CONFIGURATION_MANAGERS
+Documentation=https://systemd.io/WRITING_RESOLVER_CLIENTS
 
 DefaultDependencies=no
 After=systemd-sysctl.service systemd-sysusers.service