Index: sbin/geom/Makefile
===================================================================
--- sbin/geom/Makefile
+++ sbin/geom/Makefile
@@ -13,7 +13,8 @@
 
 LIBADD=		geom util
 
-.if defined(RESCUE) || defined(RELEASE_CRUNCH)
+.if defined(RESCUE) || defined(RELEASE_CRUNCH) || ${MK_DYNAMICROOT} == "no"
+
 .PATH:	${SRCTOP}/lib/geom/part \
 	${SRCTOP}/lib/geom/label
 
@@ -22,6 +23,10 @@
 
 WARNS?=	2
 CFLAGS+=-DSTATIC_GEOM_CLASSES
+.if !defined(RESCUE) && !defined(RELEASE_CRUNCH)
+LINKS=		${BINDIR}/geom ${BINDIR}/glabel \
+		${BINDIR}/geom ${BINDIR}/gpart
+.endif
 .else
 .include "${SRCTOP}/lib/geom/Makefile.classes"
 LINKS=		${GEOM_CLASSES:S|^|${BINDIR}/geom ${BINDIR}/g|}
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -1668,6 +1668,11 @@
 OLD_DIRS+=usr/share/bsdconfig/usermgmt
 .endif
 
+.if ${MK_DYNAMICROOT} == no
+.include "${SRCTOP}/lib/geom/Makefile.classes"
+OLD_FILES+=${GEOM_CLASSES:Nlabel:Npart:S|^|sbin/g}
+.endif
+
 .if ${MK_EFI} == no
 OLD_FILES+=usr/sbin/efibootmgr
 OLD_FILES+=usr/sbin/efidp