diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 72781a49b7..464384b22b 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -4720,6 +4720,8 @@ static int read_config_file(
                         if (candidate_item && candidate_item->age_set) {
                                 i->age = candidate_item->age;
                                 i->age_set = true;
+                                i->age_by_file = candidate_item->age_by_file;
+                                i->age_by_dir = candidate_item->age_by_dir;
                         }
                 }
 
diff --git a/test/units/TEST-22-TMPFILES.12.sh b/test/units/TEST-22-TMPFILES.12.sh
index 1aa4faa0d3..b2288bcf01 100755
--- a/test/units/TEST-22-TMPFILES.12.sh
+++ b/test/units/TEST-22-TMPFILES.12.sh
@@ -219,3 +219,19 @@ after="$(stat -c %Y /tmp/ageby-mtime)"
 test "$before" = "$after"
 test ! -e /tmp/ageby-mtime/old-child
 rmdir /tmp/ageby-mtime
+
+# X entries inherit the parent cleanup age and its age-by fields.
+rm -rf /tmp/ageby-x-inherit
+mkdir -p /tmp/ageby-x-inherit/parent/child /tmp/ageby-x-inherit/parent/other
+printf old >/tmp/ageby-x-inherit/parent/child/file
+printf old >/tmp/ageby-x-inherit/parent/other/file
+touch --date "3 days ago" /tmp/ageby-x-inherit/parent/child/file /tmp/ageby-x-inherit/parent/other/file
+
+systemd-tmpfiles --clean - <<-EOF
+d /tmp/ageby-x-inherit/parent - - - m:1d
+X /tmp/ageby-x-inherit/parent/child - - - -
+EOF
+
+test ! -e /tmp/ageby-x-inherit/parent/child/file
+test ! -e /tmp/ageby-x-inherit/parent/other/file
+rm -rf /tmp/ageby-x-inherit