diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
index 431b27bbb0..95fa518bff 100644
--- a/man/systemd-backlight@.service.xml
+++ b/man/systemd-backlight@.service.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-backlight@.service" conditional='ENABLE_BACKLIGHT'
+<refentry id="systemd-backlight_.service" conditional='ENABLE_BACKLIGHT'
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index 5f351ded35..a138bd0107 100644
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-fsck@.service" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="systemd-fsck_.service" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>systemd-fsck@.service</title>
diff --git a/man/systemd-integritysetup@.service.xml b/man/systemd-integritysetup@.service.xml
index a090b1c763..831c3690e1 100644
--- a/man/systemd-integritysetup@.service.xml
+++ b/man/systemd-integritysetup@.service.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-integritysetup@.service" conditional='HAVE_LIBCRYPTSETUP'
+<refentry id="systemd-integritysetup_.service" conditional='HAVE_LIBCRYPTSETUP'
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml
index 0b54ba3584..5447de0405 100644
--- a/man/systemd-makefs@.service.xml
+++ b/man/systemd-makefs@.service.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-makefs@.service">
+<refentry id="systemd-makefs_.service">
 
   <refentryinfo>
     <title>systemd-makefs@.service</title>
diff --git a/man/systemd-veritysetup@.service.xml b/man/systemd-veritysetup@.service.xml
index 4a4d8d9814..a549b41b70 100644
--- a/man/systemd-veritysetup@.service.xml
+++ b/man/systemd-veritysetup@.service.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-veritysetup@.service" conditional='HAVE_LIBCRYPTSETUP'
+<refentry id="systemd-veritysetup_.service" conditional='HAVE_LIBCRYPTSETUP'
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
diff --git a/man/user@.service.xml b/man/user@.service.xml
index bdc2aa22f1..6d0eaa4e04 100644
--- a/man/user@.service.xml
+++ b/man/user@.service.xml
@@ -3,7 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<refentry id="user@.service">
+<refentry id="user_.service">
   <refentryinfo>
     <title>user@.service</title>
     <productname>systemd</productname>
diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index 579dd405c2..b4b262b508 100755
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -46,7 +46,7 @@ This index contains {count} entries, referring to {pages} individual manual page
 
 def check_id(page, t):
     page_id = t.getroot().get('id')
-    if not re.search('/' + page_id + '[.]', page):
+    if not re.search('/' + page_id + '[.]', page.translate(str.maketrans('@', '_'))):
         raise ValueError(f"id='{page_id}' is not the same as page name '{page}'")
 
 def make_index(pages):