diff --git a/man/homectl.xml b/man/homectl.xml
index 23eaedd6c57..4b792173a6c 100644
--- a/man/homectl.xml
+++ b/man/homectl.xml
@@ -304,7 +304,7 @@
         setting. Example: <option>--timezone=Europe/Amsterdam</option> will result in the environment
         variable <literal>TZ=:Europe/Amsterdam</literal>. (<literal>:</literal> is used intentionally as part
         of the timezone specification, see
-        <citerefentry><refentrytitle>tzset</refentrytitle><manvolnum>3</manvolnum></citerefentry>.)
+        <citerefentry project='man-pages'><refentrytitle>tzset</refentrytitle><manvolnum>3</manvolnum></citerefentry>.)
         </para></listitem>
       </varlistentry>
 
diff --git a/man/html.in b/man/html.in
index 23b77ebbb06..c142f581de0 100755
--- a/man/html.in
+++ b/man/html.in
@@ -13,7 +13,7 @@ target="man/$1.html"
 ninja -C "@BUILD_ROOT@" "$target"
 
 fullname="@BUILD_ROOT@/$target"
-redirect="$(readlink "$fullname" 2>/dev/null)"
+redirect="$(test -f "$fullname" && readlink "$fullname" || :)"
 if [ -n "$redirect" ]; then
     ninja -C "@BUILD_ROOT@" "man/$redirect"
 
diff --git a/man/rules/meson.build b/man/rules/meson.build
index c702d88f74d..dd236be1a1a 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -1036,12 +1036,14 @@ manpages = [
   ''],
  ['udev_device_has_tag',
   '3',
-  ['udev_device_get_devlinks_list_entry',
+  ['udev_device_get_current_tags_list_entry',
+   'udev_device_get_devlinks_list_entry',
    'udev_device_get_properties_list_entry',
    'udev_device_get_property_value',
    'udev_device_get_sysattr_list_entry',
    'udev_device_get_sysattr_value',
    'udev_device_get_tags_list_entry',
+   'udev_device_has_current_tag',
    'udev_device_set_sysattr_value'],
   ''],
  ['udev_device_new_from_syspath',
diff --git a/man/systemd-dissect.xml b/man/systemd-dissect.xml
index a2e77281c8d..1c761c4996b 100644
--- a/man/systemd-dissect.xml
+++ b/man/systemd-dissect.xml
@@ -70,10 +70,10 @@
 
     <para>OS images may use any kind of Linux-supported file systems. In addition they may make use of LUKS
     disk encryption, and contain Verity integrity information. Note that qualifying OS images may be booted
-    with <citerefentry><refentrytitle>system-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
+    with <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
     <option>--image=</option> switch, and be used as root file system for system service using the
     <varname>RootImage=</varname> unit file setting, see
-    <citerefentry><refentrytitle>system.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+    <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 
     <para>Note that the partition table shown when invoked without command switch (as listed below) does not
     necessarily show all partitions included in the image, but just the partitions that are understood and
@@ -252,8 +252,8 @@
     <title>See Also</title>
     <para>
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>system-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>system.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <ulink url="https://systemd.io/DISCOVERABLE_PARTITIONS">Discoverable Partitions Specification</ulink>,
       <citerefentry project='man-pages'><refentrytitle>umount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>fdisk</refentrytitle><manvolnum>8</manvolnum></citerefentry>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index e5e97bf8fe4..c0ca647b103 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -153,7 +153,9 @@
         case the image has multiple partitions, otherwise partition name <literal>root</literal> is implied.
         Options for multiple partitions can be specified in a single line with space separators. Assigning an empty
         string removes previous assignments. Duplicated options are ignored. For a list of valid mount options, please
-        refer to <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+        refer to
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+        </para>
 
         <para>Valid partition names follow the <ulink url="https://systemd.io/DISCOVERABLE_PARTITIONS">Discoverable
         Partitions Specification</ulink>.</para>
@@ -1009,7 +1011,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
 
         <listitem><para>Sets the CPU scheduling policy for executed processes. Takes one of <option>other</option>,
         <option>batch</option>, <option>idle</option>, <option>fifo</option> or <option>rr</option>. See
-        <citerefentry><refentrytitle>sched_setscheduler</refentrytitle><manvolnum>2</manvolnum></citerefentry> for
+        <citerefentry project='man-pages'><refentrytitle>sched_setscheduler</refentrytitle><manvolnum>2</manvolnum></citerefentry> for
         details.</para></listitem>
       </varlistentry>
 
@@ -1019,7 +1021,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
         <listitem><para>Sets the CPU scheduling priority for executed processes. The available priority range depends
         on the selected CPU scheduling policy (see above). For real-time scheduling policies an integer between 1
         (lowest priority) and 99 (highest priority) can be used. See
-        <citerefentry><refentrytitle>sched_setscheduler</refentrytitle><manvolnum>2</manvolnum></citerefentry> for
+        <citerefentry project='man-pages'><refentrytitle>sched_setscheduler</refentrytitle><manvolnum>2</manvolnum></citerefentry> for
         details. </para></listitem>
       </varlistentry>
 
@@ -1030,7 +1032,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
         will be reset when the executed processes call
         <citerefentry project='man-pages'><refentrytitle>fork</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
         and can hence not leak into child processes. See
-        <citerefentry><refentrytitle>sched_setscheduler</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+        <citerefentry project='man-pages'><refentrytitle>sched_setscheduler</refentrytitle><manvolnum>2</manvolnum></citerefentry>
         for details. Defaults to false.</para></listitem>
       </varlistentry>
 
@@ -1043,7 +1045,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
         are specified by the lower and upper CPU indices separated by a dash. This option may be specified more than
         once, in which case the specified CPU affinity masks are merged. If the empty string is assigned, the mask
         is reset, all assignments prior to this will have no effect. See
-        <citerefentry><refentrytitle>sched_setaffinity</refentrytitle><manvolnum>2</manvolnum></citerefentry> for
+        <citerefentry project='man-pages'><refentrytitle>sched_setaffinity</refentrytitle><manvolnum>2</manvolnum></citerefentry> for
         details.</para></listitem>
       </varlistentry>
 
diff --git a/man/systemd.xml b/man/systemd.xml
index 0d6f8534260..1747203779f 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -270,9 +270,8 @@
     ideas behind systemd, please refer to the
     <ulink url="http://0pointer.de/blog/projects/systemd.html">Original Design Document</ulink>.</para>
 
-    <para>Note that some but not all interfaces provided
-    by systemd are covered by the
-    <ulink url="Portability and">Interface Portability and Stability Promise</ulink>.</para>
+    <para>Note that some but not all interfaces provided by systemd are covered by the
+    <ulink url="https://systemd.io/PORTABILITY_AND_STABILITY/">Interface Portability and Stability Promise</ulink>.</para>
 
     <para>Units may be generated dynamically at boot and system
     manager reload time, for example based on other configuration