Index: sbin/bsdlabel/bsdlabel.8
===================================================================
--- sbin/bsdlabel/bsdlabel.8
+++ sbin/bsdlabel/bsdlabel.8
@@ -445,7 +445,10 @@
 recognize the disk:
 .Bd -literal -offset indent
 dd if=/dev/zero of=/dev/da0 bs=512 count=32
-fdisk -BI da0
+gpart create -s MBR da0
+gpart add -t freebsd da0
+gpart set -a active -i 1 da0
+gpart bootcode -b /boot/mbr da0
 dd if=/dev/zero of=/dev/da0s1 bs=512 count=32
 bsdlabel -w -B da0s1
 bsdlabel -e da0s1
@@ -495,6 +498,5 @@
 .Xr md 4 ,
 .Xr disktab 5 ,
 .Xr boot0cfg 8 ,
-.Xr fdisk 8 ,
 .Xr gpart 8 ,
 .Xr newfs 8
Index: sbin/dumpfs/dumpfs.8
===================================================================
--- sbin/dumpfs/dumpfs.8
+++ sbin/dumpfs/dumpfs.8
@@ -100,8 +100,8 @@
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr fs 5 ,
-.Xr disklabel 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8 ,
 .Xr tunefs 8
 .Sh HISTORY
Index: sbin/fdisk/fdisk.8
===================================================================
--- sbin/fdisk/fdisk.8
+++ sbin/fdisk/fdisk.8
@@ -39,6 +39,13 @@
 utility can be used to divide space on the disk into slices and set one
 active.
 .Sh DESCRIPTION
+.Bf -symbolic
+This command is obsolete.
+Users are advised to use
+.Xr gpart 8
+instead.
+.Ef
+.Pp
 The
 .Fx
 utility,
Index: sbin/ffsinfo/ffsinfo.8
===================================================================
--- sbin/ffsinfo/ffsinfo.8
+++ sbin/ffsinfo/ffsinfo.8
@@ -121,9 +121,9 @@
 .Pa /var/tmp/ffsinfo
 with all available information.
 .Sh SEE ALSO
-.Xr disklabel 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr growfs 8 ,
 .Xr gvinum 8 ,
 .Xr newfs 8 ,
Index: sbin/mdconfig/mdconfig.8
===================================================================
--- sbin/mdconfig/mdconfig.8
+++ sbin/mdconfig/mdconfig.8
@@ -300,8 +300,7 @@
 .Sh SEE ALSO
 .Xr md 4 ,
 .Xr ffs 7 ,
-.Xr bsdlabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr mdmfs 8 ,
 .Xr malloc 9
 .Sh HISTORY
Index: sbin/newfs/newfs.8
===================================================================
--- sbin/newfs/newfs.8
+++ sbin/newfs/newfs.8
@@ -303,11 +303,11 @@
 .Xr geom 4 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
-.Xr bsdlabel 8 ,
 .Xr camcontrol 8 ,
 .Xr dump 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr gjournal 8 ,
 .Xr growfs 8 ,
 .Xr gvinum 8 ,
Index: sbin/newfs_msdos/newfs_msdos.8
===================================================================
--- sbin/newfs_msdos/newfs_msdos.8
+++ sbin/newfs_msdos/newfs_msdos.8
@@ -228,9 +228,7 @@
 newfs_msdos -C 30M -@63s ./somefile
 .Ed
 .Sh SEE ALSO
-.Xr disktab 5 ,
-.Xr disklabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8
 .Sh HISTORY
 The
Index: sbin/newfs_nandfs/newfs_nandfs.8
===================================================================
--- sbin/newfs_nandfs/newfs_nandfs.8
+++ sbin/newfs_nandfs/newfs_nandfs.8
@@ -63,9 +63,7 @@
 newfs_nandfs /dev/ada0s1
 .Ed
 .Sh SEE ALSO
-.Xr disktab 5 ,
-.Xr disklabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8
 .Sh HISTORY
 The
Index: sbin/reboot/boot_i386.8
===================================================================
--- sbin/reboot/boot_i386.8
+++ sbin/reboot/boot_i386.8
@@ -352,9 +352,9 @@
 .Xr make.conf 5 ,
 .Xr ttys 5 ,
 .Xr boot0cfg 8 ,
-.Xr bsdlabel 8 ,
 .Xr btxld 8 ,
 .Xr config 8 ,
+.Xr gpart 8 ,
 .Xr gptboot 8 ,
 .Xr halt 8 ,
 .Xr loader 8 ,
Index: share/man/man4/da.4
===================================================================
--- share/man/man4/da.4
+++ share/man/man4/da.4
@@ -205,8 +205,7 @@
 .Xr ada 4 ,
 .Xr cam 4 ,
 .Xr geom 4 ,
-.Xr bsdlabel 8 ,
-.Xr fdisk 8
+.Xr gpart 8
 .Sh HISTORY
 The
 .Nm
Index: share/man/man4/md.4
===================================================================
--- share/man/man4/md.4
+++ share/man/man4/md.4
@@ -81,8 +81,7 @@
 man page.
 Other tools will also create these images, such as NanoBSD.
 .Sh SEE ALSO
-.Xr disklabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr loader 8 ,
 .Xr mdconfig 8 ,
 .Xr mdmfs 8 ,
Index: share/man/man4/vpo.4
===================================================================
--- share/man/man4/vpo.4
+++ share/man/man4/vpo.4
@@ -64,7 +64,7 @@
 formatting a
 .Fx
 file system, check the slice of the disk with the
-.Xr fdisk 8
+.Xr gpart 8
 utility.
 .Pp
 In order to unixify a ZIP disk, put the following in /etc/disktab:
Index: share/man/man7/tuning.7
===================================================================
--- share/man/man7/tuning.7
+++ share/man/man7/tuning.7
@@ -753,10 +753,10 @@
 .Xr ports 7 ,
 .Xr boot 8 ,
 .Xr bsdinstall 8 ,
-.Xr bsdlabel 8 ,
 .Xr ccdconfig 8 ,
 .Xr config 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr gjournal 8 ,
 .Xr gstripe 8 ,
 .Xr gvinum 8 ,
Index: share/man/man8/picobsd.8
===================================================================
--- share/man/man8/picobsd.8
+++ share/man/man8/picobsd.8
@@ -425,7 +425,7 @@
 .Ar NN
 with the actual start of the partition
 (which you can determine using
-.Xr fdisk 8 ) .
+.Xr gpart 8 ) .
 Note that after saving the image to the slice, it will not yet be
 recognised.
 You have to use the
Index: usr.sbin/boot0cfg/boot0cfg.8
===================================================================
--- usr.sbin/boot0cfg/boot0cfg.8
+++ usr.sbin/boot0cfg/boot0cfg.8
@@ -180,14 +180,13 @@
 .Dl "boot0cfg -m 0x5 ada0"
 .Pp
 To go back to non-interactive booting, use
-.Xr fdisk 8
+.Xr gpart 8
 to install the default MBR:
 .Pp
-.Dl "fdisk -B ada0"
+.Dl "gpart bootcode -b /boot/mbr ada0"
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr boot 8 ,
-.Xr fdisk 8 ,
 .Xr gpart 8
 .Sh AUTHORS
 .An Robert Nordier Aq Mt rnordier@FreeBSD.org