diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
index 92ac5b90449a..ac30415dfd7f 100644
--- a/stand/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
@@ -5,9 +5,9 @@ HAVE_GELI=		yes
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	yes
-LOADER_CD9660_SUPPORT?=	no
-LOADER_EXT2FS_SUPPORT?=	no
-LOADER_MSDOS_SUPPORT?=	no
+LOADER_CD9660_SUPPORT?=	yes
+LOADER_EXT2FS_SUPPORT?=	yes
+LOADER_MSDOS_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
 LOADER_GZIP_SUPPORT?=	yes
 LOADER_BZIP2_SUPPORT?=	yes
diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c
index 29ce1e332605..821b239cdb2f 100644
--- a/stand/i386/loader/conf.c
+++ b/stand/i386/loader/conf.c
@@ -69,10 +69,18 @@ struct fs_ops *file_system[] = {
 #if defined(LOADER_ZFS_SUPPORT)
     &zfs_fsops,
 #endif
+#if defined(LOADER_UFS_SUPPORT)
     &ufs_fsops,
+#endif
+#if defined(LOADER_EXT2FS_SUPPORT)
     &ext2fs_fsops,
+#endif
+#if defined(LOADER_MSDOS_SUPPORT)
     &dosfs_fsops,
+#endif
+#if defined(LOADER_CD9660_SUPPORT)
     &cd9660_fsops,
+#endif
 #if defined(LOADER_NANDFS_SUPPORT)
     &nandfs_fsops,
 #endif