diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index a5fdc4730cd..7230f729b3e 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -133,6 +133,7 @@ __DEFAULT_YES_OPTIONS = \
     LOADER_OFW \
     LOADER_PXEBOOT \
     LOADER_UBOOT \
+    LOADER_ZFS \
     LOCALES \
     LOCATE \
     LPR \
@@ -192,7 +193,6 @@ __DEFAULT_YES_OPTIONS = \
     WPA_SUPPLICANT_EAPOL \
     ZFS \
     ZFS_TESTS \
-    LOADER_ZFS \
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
@@ -201,18 +201,18 @@ __DEFAULT_NO_OPTIONS = \
     CLANG_EXTRAS \
     CLANG_FORMAT \
     CLEAN \
-    DIALOG \
     DETECT_TZ_CHANGES \
+    DIALOG \
     DISK_IMAGE_TOOLS_BOOTSTRAP \
     DTRACE_ASAN \
     DTRACE_TESTS \
     HESIOD \
     IPFILTER_IPFS \
+    LLVM_FULL_DEBUGINFO \
+    LLVM_LINK_STATIC_LIBRARIES \
     LOADER_USB \
     LOADER_VERBOSE \
     LOADER_VERIEXEC_PASS_MANIFEST \
-    LLVM_FULL_DEBUGINFO \
-    LLVM_LINK_STATIC_LIBRARIES \
     MALLOC_PRODUCTION \
     OFED_EXTRA \
     OPENLDAP \