diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 524ebcd8c61..3785f5ac30e 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -52,6 +52,7 @@
 # done
 
 # 20260503: Kill off MANSUBDIRs
+OLD_DIRS+=usr/share/man/man4/amd64
 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
 OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
 OLD_FILES+=usr/share/man/man8/i386/apmd.8.gz
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index d580cbceb06..00abc75d5bb 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -503,8 +503,6 @@
             man4
                 aarch64
                 ..
-                amd64
-                ..
                 arm
                 ..
                 i386
@@ -519,12 +517,6 @@
             man7
             ..
             man8
-                amd64
-                ..
-                i386
-                ..
-                powerpc
-                ..
             ..
             man9
             ..