diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 1f2808d6d46..2e4aaaa9f14 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -199,6 +199,7 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_LUA \
     NAND \
     OFED \
+    OFED_EXTRA \
     OPENLDAP \
     REPRODUCIBLE_BUILD \
     RPCBIND_WARMSTART_SUPPORT \
@@ -466,6 +467,10 @@ MK_KERBEROS:=	no
 MK_AUTHPF:=	no
 .endif
 
+.if ${MK_OFED} == "no"
+MK_OFED_EXTRA:=	no
+.endif
+
 .if ${MK_PORTSNAP} == "no"
 # freebsd-update depends on phttpget from portsnap
 MK_FREEBSD_UPDATE:=	no
diff --git a/tools/build/options/WITH_OFED_EXTRA b/tools/build/options/WITH_OFED_EXTRA
new file mode 100644
index 00000000000..f86dca29982
--- /dev/null
+++ b/tools/build/options/WITH_OFED_EXTRA
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build the non-essential components of the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack, mostly examples.
diff --git a/usr.bin/ofed/Makefile b/usr.bin/ofed/Makefile
index 3069676c9e6..3c43e201825 100644
--- a/usr.bin/ofed/Makefile
+++ b/usr.bin/ofed/Makefile
@@ -1,11 +1,14 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 SUBDIR= \
 	libibverbs \
 	librdmacm \
-	opensm \
 	infiniband-diags
 
+SUBDIR.${MK_OFED_EXTRA}+= opensm
+
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/ofed/infiniband-diags/Makefile b/usr.bin/ofed/infiniband-diags/Makefile
index 8ad5f3bea7c..be6f2bc831b 100644
--- a/usr.bin/ofed/infiniband-diags/Makefile
+++ b/usr.bin/ofed/infiniband-diags/Makefile
@@ -1,27 +1,33 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 SUBDIR= \
-dump_fts \
-ibaddr \
-ibcacheedit \
-ibccconfig \
-ibccquery \
-iblinkinfo \
-ibmirror \
-ibnetdiscover \
-ibping \
-ibportstate \
-ibqueryerrors \
-ibroute \
-ibstat \
-ibsysstat \
-ibtracert \
-perfquery \
-saquery \
-sminfo \
-smpdump \
-smpquery \
-vendstat
+	ibstat
+
+.if ${MK_OFED_EXTRA} != "no"
+SUBDIR+= \
+	dump_fts \
+	ibaddr \
+	ibcacheedit \
+	ibccconfig \
+	ibccquery \
+	iblinkinfo \
+	ibmirror \
+	ibnetdiscover \
+	ibping \
+	ibportstate \
+	ibqueryerrors \
+	ibroute \
+	ibsysstat \
+	ibtracert \
+	perfquery \
+	saquery \
+	sminfo \
+	smpdump \
+	smpquery \
+	vendstat
+.endif
 
 SUBDIR_PARALLEL=