diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -41,6 +41,7 @@
     ISCSI \
     KERNEL_SYMBOLS \
     NETGRAPH \
+    OFED \
     PF \
     SCTP_SUPPORT \
     SOURCELESS_HOST \
@@ -55,7 +56,6 @@
     INIT_ALL_PATTERN \
     INIT_ALL_ZERO \
     KERNEL_RETPOLINE \
-    OFED \
     RATELIMIT \
     REPRODUCIBLE_BUILD
 
diff --git a/tools/build/options/WITHOUT_OFED b/tools/build/options/WITHOUT_OFED
new file mode 100644
--- /dev/null
+++ b/tools/build/options/WITHOUT_OFED
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to disable the build of the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack, including kernel modules and userspace libraries.
diff --git a/tools/build/options/WITH_OFED b/tools/build/options/WITH_OFED
deleted file mode 100644
--- a/tools/build/options/WITH_OFED
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to build the
-.Dq "OpenFabrics Enterprise Distribution"
-Infiniband software stack.