diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index 8b21e15fda..e5551fc798 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -54,18 +54,6 @@
   </a>
 </xsl:template>
 
-<xsl:template match="citerefentry[@project='wireguard']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>https://git.zx2c4.com/WireGuard/about/src/tools/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>.</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
 <xsl:template match="citerefentry[@project='mankier']">
   <a>
     <xsl:attribute name="href">
@@ -81,13 +69,11 @@
 <xsl:template match="citerefentry[@project='archlinux']">
   <a>
     <xsl:attribute name="href">
-      <xsl:text>https://www.archlinux.org/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>/</xsl:text>
+      <xsl:text>https://man.archlinux.org/man/</xsl:text>
       <xsl:value-of select="refentrytitle"/>
       <xsl:text>.</xsl:text>
       <xsl:value-of select="manvolnum"/>
-      <xsl:text>.html</xsl:text>
+      <xsl:text>.en.html</xsl:text>
     </xsl:attribute>
     <xsl:call-template name="inline.charseq"/>
   </a>
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 5908f98e68..6fc18e71e3 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -92,7 +92,7 @@
     <para>Depending on which build-time options are enabled, functions that operate on
     <structname>sd_journal</structname> objects might cause optional shared libraries to be dynamically
     loaded via
-    <citerefentry project='man7'><refentrytitle>dlopen</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+    <citerefentry project='man-pages'><refentrytitle>dlopen</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     such as decompression libraries (xz, lz4, zstd) or cryptographic libraries (gcrypt).
     </para>
   </refsect1>
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 4e9afc3674..4fba788950 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1906,7 +1906,7 @@
         <listitem>
           <para>The Base64 encoded private key for the interface. It can be generated using
           the <command>wg genkey</command> command
-          (see <citerefentry project="wireguard"><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>).
+          (see <citerefentry project='man-pages'><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>).
           Specially, if the specified key is prefixed with <literal>@</literal>, it is interpreted as
           the name of the credential from which the actual key shall be read. <command>systemd-networkd.service</command>
           automatically imports credentials matching <literal>network.wireguard.*</literal>. For more details
@@ -1997,7 +1997,7 @@
         <term><varname>PublicKey=</varname></term>
         <listitem>
           <para>Sets a Base64 encoded public key calculated by <command>wg pubkey</command>
-          (see <citerefentry project="wireguard"><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>)
+          (see <citerefentry project='man-pages'><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>)
           from a private key, and usually transmitted out of band to the author of the configuration file.
           This option honors the <literal>@</literal> prefix in the same way as the <option>PrivateKey=</option>
           setting of the <option>[WireGuard]</option> section. This option is mandatory for this section.</para>