diff --git a/sbin/Makefile b/sbin/Makefile
index dc4e94dd2578..533db1c1bbec 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -29,7 +29,7 @@ SUBDIR=	adjkerntz \
 	fsdb \
 	fsirand \
 	gbde \
-	gconcat \
+	geom \
 	ggate \
 	${_gpt} \
 	growfs \
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f35b0586fb76..df2eef6804b6 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -126,7 +126,9 @@ options 	GEOM_FOX		# Redundant path mitigation
 options 	GEOM_GATE		# Userland services.
 options 	GEOM_GPT		# GPT partitioning
 options 	GEOM_MBR		# DOS/MBR partitioning
+options 	GEOM_NOP		# Test class.
 options 	GEOM_PC98		# NEC PC9800 partitioning
+options 	GEOM_STRIPE		# Disk striping.
 options 	GEOM_SUNLABEL		# Sun/Solaris partitioning
 options 	GEOM_VOL		# Volume names from UFS superblock
 
diff --git a/sys/conf/files b/sys/conf/files
index ae5953140898..74e4ef429945 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -919,6 +919,8 @@ crypto/rijndael/rijndael-api-fst.c	optional geom_bde
 crypto/sha2/sha2.c		optional geom_bde
 geom/concat/g_concat.c	optional geom_concat
 geom/gate/g_gate.c	optional geom_gate
+geom/nop/g_nop.c	optional geom_nop
+geom/stripe/g_stripe.c	optional geom_stripe
 geom/geom_aes.c		optional geom_aes
 geom/geom_apple.c	optional geom_apple
 geom/geom_bsd.c		optional geom_bsd
diff --git a/sys/conf/options b/sys/conf/options
index dbe441ee7d8c..f5270293dd1d 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -74,7 +74,9 @@ GEOM_GATE	opt_geom.h
 GEOM_GPT	opt_geom.h
 GEOM_MBR	opt_geom.h
 GEOM_MIRROR	opt_geom.h
+GEOM_NOP	opt_geom.h
 GEOM_PC98	opt_geom.h
+GEOM_STRIPE	opt_geom.h
 GEOM_SUNLABEL	opt_geom.h
 GEOM_VOL	opt_geom.h
 HW_WDOG
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index 06521b861551..039ae29145f1 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -9,7 +9,9 @@ SUBDIR=	geom_apple \
 	geom_gate \
 	geom_gpt \
 	geom_mbr \
+	geom_nop \
 	geom_pc98 \
+	geom_stripe \
 	geom_sunlabel \
 	geom_vol_ffs