diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index ce391d17101..1a4c4026fde 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -45,7 +45,7 @@
the partition table does not contain relevant entries).
For a longer discussion of kernel API file systems see
- API
+ API
File Systems.
Note: systemd-remount-fs.service is usually pulled in by
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 1b70392813b..d061736b733 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -82,7 +82,7 @@
for kernel-to-userspace and userspace-to-userspace interfaces. Some
of them may not be changed via mount units, and cannot be
disabled. For a longer discussion see API
+ url="https://systemd.io/API_FILE_SYSTEMS">API
File Systems.
The
diff --git a/test/fuzz/fuzz-unit-file/binfmt_misc.automount b/test/fuzz/fuzz-unit-file/binfmt_misc.automount
index 8d761b01b62..d9fd0f0f6a9 100644
--- a/test/fuzz/fuzz-unit-file/binfmt_misc.automount
+++ b/test/fuzz/fuzz-unit-file/binfmt_misc.automount
@@ -11,7 +11,7 @@ automount
[Unit]
Description=Arbitrary Executable File Formats File System Automount Point
Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
Before=sysinit.target
ConditionPathExists=/proc/sys/fs/binfmt_misc/
diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount
index 88cd89d5634..f836282986d 100644
--- a/units/dev-hugepages.mount
+++ b/units/dev-hugepages.mount
@@ -10,7 +10,7 @@
[Unit]
Description=Huge Pages File System
Documentation=https://docs.kernel.org/admin-guide/mm/hugetlbpage.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
Before=sysinit.target
ConditionPathExists=/sys/kernel/mm/hugepages
diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount
index 02683a9e1ef..1fd9cc263cb 100644
--- a/units/dev-mqueue.mount
+++ b/units/dev-mqueue.mount
@@ -10,7 +10,7 @@
[Unit]
Description=POSIX Message Queue File System
Documentation=man:mq_overview(7)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
Before=sysinit.target
ConditionPathExists=/proc/sys/fs/mqueue
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 5d212015a5a..7ec21e76c9a 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -10,7 +10,7 @@
[Unit]
Description=Arbitrary Executable File Formats File System Automount Point
Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
ConditionPathExists=/proc/sys/fs/binfmt_misc/
ConditionPathIsReadWrite=/proc/sys/
diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount
index 88a7748cb23..9518708e73c 100644
--- a/units/proc-sys-fs-binfmt_misc.mount
+++ b/units/proc-sys-fs-binfmt_misc.mount
@@ -10,7 +10,7 @@
[Unit]
Description=Arbitrary Executable File Formats File System
Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
[Mount]
diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount
index 929d8e3bf04..bd3f22acaea 100644
--- a/units/sys-fs-fuse-connections.mount
+++ b/units/sys-fs-fuse-connections.mount
@@ -10,7 +10,7 @@
[Unit]
Description=FUSE Control File System
Documentation=https://docs.kernel.org/filesystems/fuse.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
ConditionPathExists=/sys/fs/fuse/connections
ConditionCapability=CAP_SYS_ADMIN
diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
index dca94a89862..26ee16049e5 100644
--- a/units/sys-kernel-config.mount
+++ b/units/sys-kernel-config.mount
@@ -10,7 +10,7 @@
[Unit]
Description=Kernel Configuration File System
Documentation=https://docs.kernel.org/filesystems/configfs.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
ConditionPathExists=/sys/kernel/config
ConditionCapability=CAP_SYS_RAWIO
diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount
index 6c77ef53c90..5f0a75b02ae 100644
--- a/units/sys-kernel-debug.mount
+++ b/units/sys-kernel-debug.mount
@@ -10,7 +10,7 @@
[Unit]
Description=Kernel Debug File System
Documentation=https://docs.kernel.org/filesystems/debugfs.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
ConditionPathExists=/sys/kernel/debug
ConditionCapability=CAP_SYS_RAWIO
diff --git a/units/sys-kernel-tracing.mount b/units/sys-kernel-tracing.mount
index f3cd47fb35d..ed8f948af9c 100644
--- a/units/sys-kernel-tracing.mount
+++ b/units/sys-kernel-tracing.mount
@@ -10,7 +10,7 @@
[Unit]
Description=Kernel Trace File System
Documentation=https://docs.kernel.org/trace/ftrace.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
ConditionVirtualization=!lxc
ConditionPathExists=/sys/kernel/tracing
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index 6861c766744..318bf8efc29 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -11,7 +11,7 @@
Description=Set Up Additional Binary Formats
Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
Conflicts=shutdown.target
After=proc-sys-fs-binfmt_misc.automount
diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in
index fe3c31b30c1..4ac8978ff22 100644
--- a/units/systemd-remount-fs.service.in
+++ b/units/systemd-remount-fs.service.in
@@ -10,7 +10,7 @@
[Unit]
Description=Remount Root and Kernel File Systems
Documentation=man:systemd-remount-fs.service(8)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
After=systemd-fsck-root.service
diff --git a/units/tmp.mount b/units/tmp.mount
index 734acea2371..896040524ad 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -11,7 +11,7 @@
Description=Temporary Directory /tmp
Documentation=https://systemd.io/TEMPORARY_DIRECTORIES
Documentation=man:file-hierarchy(7)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
ConditionPathIsSymbolicLink=!/tmp
DefaultDependencies=no
Conflicts=umount.target