diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 9af0a319171..fb22d56d53e 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2016,6 +2016,7 @@ OLD_DIRS+=usr/share/examples/ypldap
 .endif
 
 .if ${MK_FDT} == no
+OLD_FILES+=usr/sbin/ofwdump
 OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
 .endif
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index b836bd41207..ca8b87a134e 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -133,6 +133,7 @@ SUBDIR.${MK_EFI}+=	efivar efidp efibootmgr efitable efiwake
 .if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_EFI}+=	uefisign
 .endif
+SUBDIR.${MK_FDT}+=	ofwdump
 SUBDIR.${MK_FLOPPY}+=	fdcontrol
 SUBDIR.${MK_FLOPPY}+=	fdformat
 SUBDIR.${MK_FLOPPY}+=	fdread
diff --git a/usr.sbin/Makefile.aarch64 b/usr.sbin/Makefile.aarch64
index e819369f434..a72a085ff61 100644
--- a/usr.sbin/Makefile.aarch64
+++ b/usr.sbin/Makefile.aarch64
@@ -2,4 +2,3 @@
 .if ${MK_ACPI} != "no"
 SUBDIR+=	acpi
 .endif
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.arm b/usr.sbin/Makefile.arm
deleted file mode 100644
index 3767c8c9e1c..00000000000
--- a/usr.sbin/Makefile.arm
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc
index a6d5b3b35ad..d6b05857e15 100644
--- a/usr.sbin/Makefile.powerpc
+++ b/usr.sbin/Makefile.powerpc
@@ -2,4 +2,3 @@
 .if ${MACHINE_ARCH} != "powerpcspe"
 SUBDIR+=	nvram
 .endif
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.riscv b/usr.sbin/Makefile.riscv
deleted file mode 100644
index 3767c8c9e1c..00000000000
--- a/usr.sbin/Makefile.riscv
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIR+=	ofwdump