diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 54213d31c6..0806b800b4 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -275,7 +275,7 @@
         <listitem>
           <para>Parameter understood by the file quota checker
           service. For details, see
-          <citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+          <citerefentry><refentrytitle>systemd-quotacheck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
           <xi:include href="version-info.xml" xpointer="v186"/>
         </listitem>
@@ -820,7 +820,7 @@
         <member><citerefentry><refentrytitle>smbios-type-11</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-debug-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-fsck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>systemd-quotacheck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
diff --git a/man/rules/meson.build b/man/rules/meson.build
index 1fcf30e692..fdec807cb2 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -1086,9 +1086,9 @@ manpages = [
   ''],
  ['systemd-pstore.service', '8', ['systemd-pstore'], 'ENABLE_PSTORE'],
  ['systemd-pty-forward', '1', [], ''],
- ['systemd-quotacheck.service',
+ ['systemd-quotacheck@.service',
   '8',
-  ['systemd-quotacheck'],
+  ['systemd-quotacheck', 'systemd-quotacheck-root.service'],
   'ENABLE_QUOTACHECK'],
  ['systemd-random-seed.service',
   '8',
diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index 3df215ba1f..e6d34538fe 100644
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -143,7 +143,7 @@
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>fsck</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-quotacheck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry project='url'><refentrytitle url='https://btrfs.readthedocs.io/en/latest/fsck.btrfs.html'>fsck.btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>fsck.cramfs</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry project='man-pages'><refentrytitle>fsck.ext4</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck@.service.xml
similarity index 73%
rename from man/systemd-quotacheck.service.xml
rename to man/systemd-quotacheck@.service.xml
index 034d13a148..503df381e0 100644
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck@.service.xml
@@ -3,37 +3,39 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-quotacheck.service" conditional='ENABLE_QUOTACHECK'
+<refentry id="systemd-quotacheck_.service" conditional='ENABLE_QUOTACHECK'
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
-    <title>systemd-quotacheck.service</title>
+    <title>systemd-quotacheck@.service</title>
     <productname>systemd</productname>
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-quotacheck.service</refentrytitle>
+    <refentrytitle>systemd-quotacheck@.service</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>systemd-quotacheck.service</refname>
+    <refname>systemd-quotacheck@.service</refname>
+    <refname>systemd-quotacheck-root.service</refname>
     <refname>systemd-quotacheck</refname>
     <refpurpose>File system quota checker logic</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-quotacheck.service</filename></para>
+    <para><filename>systemd-quotacheck@.service</filename></para>
+    <para><filename>systemd-quotacheck-root.service</filename></para>
     <para><filename>/usr/lib/systemd/systemd-quotacheck</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
-    <para><filename>systemd-quotacheck.service</filename> is a service
-    responsible for file system quota checks. It is run once at boot
-    after all necessary file systems are mounted. It is pulled in only
-    if at least one file system has quotas enabled.</para>
+    <para><filename>systemd-quotacheck@.service</filename> and
+    <filename>systemd-quotacheck-root.service</filename> are services responsible for file system quota
+    checks. They run once at boot after all necessary file systems are mounted. They are pulled in only if at
+    least one file system has quotas enabled.</para>
   </refsect1>
 
   <refsect1>
diff --git a/units/systemd-quotacheck-root.service.in b/units/systemd-quotacheck-root.service.in
index a182059376..4792e5bdd5 100644
--- a/units/systemd-quotacheck-root.service.in
+++ b/units/systemd-quotacheck-root.service.in
@@ -9,7 +9,7 @@
 
 [Unit]
 Description=Root File System Quota Check
-Documentation=man:systemd-quotacheck.service(8)
+Documentation=man:systemd-quotacheck@.service(8)
 
 ConditionPathExists=!/etc/initrd-release
 
diff --git a/units/systemd-quotacheck@.service.in b/units/systemd-quotacheck@.service.in
index f2b8db7abb..b38450ed09 100644
--- a/units/systemd-quotacheck@.service.in
+++ b/units/systemd-quotacheck@.service.in
@@ -9,7 +9,7 @@
 
 [Unit]
 Description=File System Quota Check
-Documentation=man:systemd-quotacheck.service(8)
+Documentation=man:systemd-quotacheck@.service(8)
 
 ConditionPathExists={{QUOTACHECK}}
 ConditionPathExists=!/etc/initrd-release