Index: share/man/man4/geom.4
===================================================================
--- share/man/man4/geom.4
+++ share/man/man4/geom.4
@@ -43,7 +43,6 @@
 .Sh SYNOPSIS
 .Cd options GEOM_AES
 .Cd options GEOM_BDE
-.Cd options GEOM_BSD
 .Cd options GEOM_CACHE
 .Cd options GEOM_CONCAT
 .Cd options GEOM_ELI
@@ -53,7 +52,6 @@
 .Cd options GEOM_LABEL
 .Cd options GEOM_LINUX_LVM
 .Cd options GEOM_MAP
-.Cd options GEOM_MBR
 .Cd options GEOM_MIRROR
 .Cd options GEOM_MOUNTVER
 .Cd options GEOM_MULTIPATH
@@ -71,7 +69,6 @@
 .Cd options GEOM_RAID3
 .Cd options GEOM_SHSEC
 .Cd options GEOM_STRIPE
-.Cd options GEOM_SUNLABEL
 .Cd options GEOM_UZIP
 .Cd options GEOM_VIRSTOR
 .Cd options GEOM_VOL
@@ -449,6 +446,21 @@
 .It 0x80 Pq Dv G_F_CTLDUMP
 Dump contents of gctl requests.
 .El
+.Sh OBSOLETE OPTIONS
+.Pp
+The following options have been deprecated and will be removed in
+.Fx 13 :
+.Cd GEOM_BSD ,
+.Cd GEOM_MBR ,
+and
+.Cd GEOM_SUNLABEL .
+.Pp
+Use
+.Cd GEOM_PART_BSD ,
+.Cd GEOM_PART_MBR ,
+and
+.Cd GEOM_PART_VTOC8
+options instead.
 .Sh SEE ALSO
 .Xr libgeom 3 ,
 .Xr DECLARE_GEOM_CLASS 9 ,
Index: sys/geom/geom_bsd.c
===================================================================
--- sys/geom/geom_bsd.c
+++ sys/geom/geom_bsd.c
@@ -72,6 +72,8 @@
 
 #define LABELSIZE (148 + 16 * MAXPARTITIONS)
 
+static int g_bsd_once;
+
 static void g_bsd_hotwrite(void *arg, int flag);
 /*
  * Our private data about one instance.  All the rest is handled by the
@@ -504,6 +506,12 @@
 		g_slice_conf_hot(gp, 0, ms->labeloffset, LABELSIZE,
 		    G_SLICE_HOT_ALLOW, G_SLICE_HOT_DENY, G_SLICE_HOT_CALL);
 		gsp->hot = g_bsd_hotwrite;
+		if (!g_bsd_once) {
+			g_base_once = 1;
+			printf(
+			    "WARNING: geom_bsd (geom %s) is deprecated, "
+			    "use gpart instead.\n", gp->name);
+		}
 		return (gp);
 	}
 	/*
Index: sys/geom/geom_mbr.c
===================================================================
--- sys/geom/geom_mbr.c
+++ sys/geom/geom_mbr.c
@@ -57,6 +57,8 @@
 #define MBR_CLASS_NAME "MBR"
 #define MBREXT_CLASS_NAME "MBREXT"
 
+static int g_mbr_once = 0;
+
 static struct dos_partition historical_bogus_partition_table[NDOSPART] = {
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
@@ -316,6 +318,12 @@
 		g_slice_spoiled(cp);
 		return (NULL);
 	}
+	if (!g_mbr_once) {
+		g_mbr_once = 1;
+		printf(
+		    "WARNING: geom_mbr (geom %s) is deprecated, "
+		    "use gpart instead.\n", gp->name);
+	}
 	return (gp);
 }
 
Index: sys/geom/geom_sunlabel.c
===================================================================
--- sys/geom/geom_sunlabel.c
+++ sys/geom/geom_sunlabel.c
@@ -65,6 +65,8 @@
 	u_char labelsum[16];
 };
 
+static int g_sunlabel_once = 0;
+
 static int
 g_sunlabel_modify(struct g_geom *gp, struct g_sunlabel_softc *ms, u_char *sec0)
 {
@@ -312,6 +314,12 @@
 	g_slice_conf_hot(gp, 0, 0, SUN_SIZE,
 	    G_SLICE_HOT_ALLOW, G_SLICE_HOT_DENY, G_SLICE_HOT_CALL);
 	gsp->hot = g_sunlabel_hotwrite;
+	if (!g_sunlabel_once) {
+		g_sunlabel_once = 1;
+		printf(
+		    "WARNING: geom_sunlabel (geom %s) is deprecated, "
+		    "use gpart instead.\n", gp->name);
+	}
 	return (gp);
 }