Index: sys/powerpc/conf/GENERIC
===================================================================
--- sys/powerpc/conf/GENERIC
+++ sys/powerpc/conf/GENERIC
@@ -61,8 +61,6 @@
 options 	GEOM_PART_APM		# Apple Partition Maps.
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
-options 	COMPAT_FREEBSD4		# Keep this for a while
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
Index: sys/powerpc/conf/GENERIC64
===================================================================
--- sys/powerpc/conf/GENERIC64
+++ sys/powerpc/conf/GENERIC64
@@ -69,7 +69,6 @@
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_FREEBSD32	# Compatible with FreeBSD/powerpc binaries
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
Index: sys/powerpc/conf/GENERIC64LE
===================================================================
--- sys/powerpc/conf/GENERIC64LE
+++ sys/powerpc/conf/GENERIC64LE
@@ -66,8 +66,8 @@
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
 #options 	COMPAT_FREEBSD32	# Compatible with FreeBSD/powerpcle binaries
-options		COMPAT_FREEBSD11	# Compatible with FreeBSD11
-options		COMPAT_FREEBSD12	# Compatible with FreeBSD12
+options         COMPAT_FREEBSD11        # Compatible with FreeBSD11 (XXX: required by lang/rust)
+options         COMPAT_FREEBSD12        # Compatible with FreeBSD12 (XXX: required by lang/rust)
 options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI 
 options 	KTRACE			# ktrace(1) syscall trace support
Index: sys/powerpc/conf/MPC85XXSPE
===================================================================
--- sys/powerpc/conf/MPC85XXSPE
+++ sys/powerpc/conf/MPC85XXSPE
@@ -59,10 +59,13 @@
 options 	SYSVSHM
 options 	WITNESS
 options 	WITNESS_SKIPSPIN
-options 	COMPAT_FREEBSD10
-options 	COMPAT_FREEBSD11
-options 	COMPAT_FREEBSD12
-options 	COMPAT_FREEBSD13
+options		COMPAT_FREEBSD6		# Compatible with FreeBSD6/powerpc binaries
+options		COMPAT_FREEBSD7		# Compatible with FreeBSD7/powerpc binaries
+options		COMPAT_FREEBSD9		# Compatible with FreeBSD9/powerpc binaries
+options		COMPAT_FREEBSD10	# Compatible with FreeBSD10/powerpc binaries
+options		COMPAT_FREEBSD11	# Compatible with FreeBSD11/powerpc binaries
+options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
+options 	COMPAT_FREEBSD13	# Compatible with FreeBSD13
 options 	HWPMC_HOOKS
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data