diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 1b203fc5703..b5301213f41 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -33,6 +33,13 @@ LIBFICL=	${.CURDIR}/../../ficl/libficl.a
 .endif
 .endif
 
+.if defined(LOADER_BZIP2_SUPPORT)
+CFLAGS+=	-DLOADER_BZIP2_SUPPORT
+.endif
+.if !defined(LOADER_NO_GZIP_SUPPORT)
+CFLAGS+=	-DLOADER_GZIP_SUPPORT
+.endif
+
 # Always add MI sources 
 .PATH:		${.CURDIR}/../../common
 .include	<${.CURDIR}/../../common/Makefile.inc>
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index bef1ed99680..ba8ebf680c3 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -58,7 +58,12 @@ struct fs_ops *file_system[] = {
     &ufs_fsops,
     &ext2fs_fsops,
     &dosfs_fsops,
+#ifdef LOADER_GZIP_SUPPORT
     &zipfs_fsops,
+#endif
+#ifdef LOADER_BZIP2_SUPPORT
+    &bzipfs_fsops,
+#endif
 #ifdef LOADER_NFS_SUPPORT 
     &nfs_fsops,
 #endif