diff --git a/man/loader.conf.xml b/man/loader.conf.xml
index c6cc4ffe37f..b0022270325 100644
--- a/man/loader.conf.xml
+++ b/man/loader.conf.xml
@@ -294,7 +294,7 @@ cat MicCorUEFCA2011_2011-06-27.esl >>db.esl
 
 # Optionally add Microsoft Corporation KEK CA 2011. Recommended if either of the
 # Microsoft keys is used as the official UEFI revocation database is signed with this
-# key. The revocation database can be updated with <citerefentry><refentrytitle>fwupdmgr</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+# key. The revocation database can be updated with <citerefentry project='man-pages'><refentrytitle>fwupdmgr</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
 cat MicCorKEKCA2011_2011-06-24.esl >>KEK.esl
 
 attr=NON_VOLATILE,RUNTIME_ACCESS,BOOTSERVICE_ACCESS,TIME_BASED_AUTHENTICATED_WRITE_ACCESS
diff --git a/man/sd_bus_message_new_signal.xml b/man/sd_bus_message_new_signal.xml
index 0c4f6e3a35b..3f138899bd1 100644
--- a/man/sd_bus_message_new_signal.xml
+++ b/man/sd_bus_message_new_signal.xml
@@ -62,8 +62,10 @@
     </para>
 
     <para><function>sd_bus_message_new_signal_to()</function> is a shorthand for creating a new bus message
-    to a specific destination. It's behavior is similar to calling <function>sd_bus_message_new_signal()</function>
-    followed by calling <citerefentry><refentrytitle>sd_bus_message_set_destination()</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
+    to a specific destination. It's behavior is similar to calling
+    <function>sd_bus_message_new_signal()</function> followed by calling
+    <citerefentry><refentrytitle>sd_bus_message_set_destination</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+    </para>
   </refsect1>
 
   <refsect1>
diff --git a/man/systemd-pcrphase.service.xml b/man/systemd-pcrphase.service.xml
index f9dd5615aa0..643dbe60ceb 100644
--- a/man/systemd-pcrphase.service.xml
+++ b/man/systemd-pcrphase.service.xml
@@ -121,7 +121,7 @@
 
     <para><filename>systemd-pcrfs-root.service</filename> and <filename>systemd-pcrfs@.service</filename> are
     automatically pulled into the initial transaction by
-    <citerefentry><refentrytitle>systemd-gpt-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     for the root and <filename>/var/</filename> file
     systems. <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     will do this for all mounts with the <option>x-systemd.pcrfs</option> mount option in
@@ -188,7 +188,7 @@
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-measure</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-gpt-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     </para>
   </refsect1>
diff --git a/man/systemd.system-credentials.xml b/man/systemd.system-credentials.xml
index a73aef9ed00..b473a580a67 100644
--- a/man/systemd.system-credentials.xml
+++ b/man/systemd.system-credentials.xml
@@ -75,11 +75,11 @@
         <term><varname>login.issue</varname></term>
         <listitem>
           <para>The data of this credential is written to
-          <filename>/etc/issue.d/50-provision.conf</filename>, if the file doesn't exist
-          yet. <citerefentry><refentrytitle>agetty</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-          reads this file and shows its contents at the login prompt of terminal logins. See <citerefentry
-          project='man-pages'><refentrytitle>issue</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
-          details.</para>
+          <filename>/etc/issue.d/50-provision.conf</filename>, if the file doesn't exist yet.
+          <citerefentry project='man-pages'><refentrytitle>agetty</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+          reads this file and shows its contents at the login prompt of terminal logins. See
+          <citerefentry project='man-pages'><refentrytitle>issue</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+          for details.</para>
 
           <para>Consumed by <filename>/usr/lib/tmpfiles.d/provision.conf</filename>, see
           <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
@@ -90,12 +90,11 @@
         <term><varname>login.motd</varname></term>
         <listitem>
           <para>The data of this credential is written to <filename>/etc/motd.d/50-provision.conf</filename>,
-          if the file doesn't exist
-          yet. <citerefentry><refentrytitle>pam_motd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+          if the file doesn't exist yet.
+          <citerefentry project='man-pages'><refentrytitle>pam_motd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
           reads this file and shows its contents as "message of the day" during terminal logins. See
-          <citerefentry
-          project='man-pages'><refentrytitle>motd</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
-          details.</para>
+          <citerefentry project='man-pages'><refentrytitle>motd</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+          for details.</para>
 
           <para>Consumed by <filename>/usr/lib/tmpfiles.d/provision.conf</filename>, see
           <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
@@ -106,9 +105,9 @@
         <term><varname>network.hosts</varname></term>
         <listitem>
           <para>The data of this credential is written to <filename>/etc/hosts</filename>, if the file
-          doesn't exist yet. See <citerefentry
-          project='man-pages'><refentrytitle>hosts</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
-          details.</para>
+          doesn't exist yet. See
+          <citerefentry project='man-pages'><refentrytitle>hosts</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+          for details.</para>
 
           <para>Consumed by <filename>/usr/lib/tmpfiles.d/provision.conf</filename>, see
           <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
diff --git a/man/ukify.xml b/man/ukify.xml
index a6818cca0f5..d79fff55357 100644
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -205,7 +205,7 @@
 
         <listitem><para>An "engine" to for signing of the resulting binary. This option is currently passed
         verbatim to the <option>--engine=</option> option of
-        <citerefentry><refentrytitle>sbsign</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+        <citerefentry project='archlinux'><refentrytitle>sbsign</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
         </para></listitem>
       </varlistentry>