diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 0349d509083..b036f554dbb 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20250808: nvmfd removed from base install
+OLD_FILES+=usr/sbin/nvmfd
+OLD_FILES+=usr/share/man/man8/nvmfd.8.gz
+
 # 20250807: Replace lib/libgssapi with krb5/lib/gssapi
 OLD_FILES+=usr/include/gssapi_krb5/gssapi.h
 OLD_DIRS+=usr/include/gssapi_krb5/gssapi
diff --git a/usr.sbin/nvmfd/Makefile b/tools/tools/nvmf/nvmfd/Makefile
similarity index 100%
rename from usr.sbin/nvmfd/Makefile
rename to tools/tools/nvmf/nvmfd/Makefile
diff --git a/usr.sbin/nvmfd/Makefile.depend b/tools/tools/nvmf/nvmfd/Makefile.depend
similarity index 100%
rename from usr.sbin/nvmfd/Makefile.depend
rename to tools/tools/nvmf/nvmfd/Makefile.depend
diff --git a/usr.sbin/nvmfd/controller.c b/tools/tools/nvmf/nvmfd/controller.c
similarity index 100%
rename from usr.sbin/nvmfd/controller.c
rename to tools/tools/nvmf/nvmfd/controller.c
diff --git a/usr.sbin/nvmfd/ctl.c b/tools/tools/nvmf/nvmfd/ctl.c
similarity index 100%
rename from usr.sbin/nvmfd/ctl.c
rename to tools/tools/nvmf/nvmfd/ctl.c
diff --git a/usr.sbin/nvmfd/devices.c b/tools/tools/nvmf/nvmfd/devices.c
similarity index 100%
rename from usr.sbin/nvmfd/devices.c
rename to tools/tools/nvmf/nvmfd/devices.c
diff --git a/usr.sbin/nvmfd/discovery.c b/tools/tools/nvmf/nvmfd/discovery.c
similarity index 100%
rename from usr.sbin/nvmfd/discovery.c
rename to tools/tools/nvmf/nvmfd/discovery.c
diff --git a/usr.sbin/nvmfd/internal.h b/tools/tools/nvmf/nvmfd/internal.h
similarity index 100%
rename from usr.sbin/nvmfd/internal.h
rename to tools/tools/nvmf/nvmfd/internal.h
diff --git a/usr.sbin/nvmfd/io.c b/tools/tools/nvmf/nvmfd/io.c
similarity index 100%
rename from usr.sbin/nvmfd/io.c
rename to tools/tools/nvmf/nvmfd/io.c
diff --git a/usr.sbin/nvmfd/nvmfd.8 b/tools/tools/nvmf/nvmfd/nvmfd.8
similarity index 100%
rename from usr.sbin/nvmfd/nvmfd.8
rename to tools/tools/nvmf/nvmfd/nvmfd.8
diff --git a/usr.sbin/nvmfd/nvmfd.c b/tools/tools/nvmf/nvmfd/nvmfd.c
similarity index 100%
rename from usr.sbin/nvmfd/nvmfd.c
rename to tools/tools/nvmf/nvmfd/nvmfd.c
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 51908818e55..dcfe2037f8c 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -56,7 +56,6 @@ SUBDIR=	adduser \
 	nfsuserd \
 	nmtree \
 	nologin \
-	nvmfd \
 	pciconf \
 	periodic \
 	pnfsdscopymr \