diff --git a/sys/powerpc/conf/GENERIC-NODEBUG b/sys/powerpc/conf/GENERIC-NODEBUG
index b21984636e1d..f1ef692f907a 100644
--- a/sys/powerpc/conf/GENERIC-NODEBUG
+++ b/sys/powerpc/conf/GENERIC-NODEBUG
@@ -1,5 +1,5 @@
 #
-# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file 
+# GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file
 #		     for FreeBSD/powerpc
 #
 # This configuration file removes several debugging options, including
diff --git a/sys/powerpc/conf/GENERIC64-NODEBUG b/sys/powerpc/conf/GENERIC64-NODEBUG
index cc82f38fb22c..0320837c01b1 100644
--- a/sys/powerpc/conf/GENERIC64-NODEBUG
+++ b/sys/powerpc/conf/GENERIC64-NODEBUG
@@ -1,5 +1,5 @@
 #
-# GENERIC64-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file 
+# GENERIC64-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file
 #		     for FreeBSD/powerpc
 #
 # This configuration file removes several debugging options, including
@@ -27,12 +27,6 @@
 # $FreeBSD$
 
 include GENERIC64
+include "../../conf/std.nodebug"
 
 ident   GENERIC64-NODEBUG
-
-nooptions       INVARIANTS
-nooptions       INVARIANT_SUPPORT
-nooptions       WITNESS
-nooptions       WITNESS_SKIPSPIN
-nooptions       DEADLKRES
-nooptions       MALLOC_DEBUG_MAXZONES
diff --git a/sys/powerpc/conf/GENERIC64LE-NODEBUG b/sys/powerpc/conf/GENERIC64LE-NODEBUG
new file mode 100644
index 000000000000..c612ce2757aa
--- /dev/null
+++ b/sys/powerpc/conf/GENERIC64LE-NODEBUG
@@ -0,0 +1,32 @@
+#
+# GENERIC64LE-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file
+#		     for FreeBSD/powerpc
+#
+# This configuration file removes several debugging options, including
+# WITNESS and INVARIANTS checking, which are known to have significant
+# performance impact on running systems.  When benchmarking new features
+# this kernel should be used instead of the standard GENERIC64LE.
+# This kernel configuration should never appear outside of the HEAD
+# of the FreeBSD tree.
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
+#
+#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+include GENERIC64LE
+include "../../conf/std.nodebug"
+
+ident   GENERIC64LE-NODEBUG