diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index cdfe61a99f..993729ab01 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -80,7 +80,7 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
 SYSTEM_LIBS = libalm.so libbe.so libbsd.so libbnetapi.so libdebug.so
 	libdevice.so libfluidsynth.so libfreetype.so libgame.so libGL.so libgnu.so
 	libilmimf.so libjpeg.so liblinprog.so liblpsolve55.so libmail.so libmedia.so
-	libmidi.so libmidi2.so libnetwork.so libpng.so <revisioned>libroot.so 
+	libmidi.so libmidi2.so libnetwork.so libpng.so <revisioned>libroot.so
 	libscreensaver.so libtextencoding.so libtracker.so libtranslation.so
 	libz.so
 	$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
@@ -159,8 +159,7 @@ SYSTEM_ADD_ONS_BUS_MANAGERS =  $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
 	$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
 ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
-	write_overlay $(GPL_ONLY)ntfs $(GPL_ONLY)reiserfs ;
-#googlefs ;
+	write_overlay ntfs reiserfs ; #googlefs
 
 
 # modules
diff --git a/src/add-ons/kernel/file_systems/Jamfile b/src/add-ons/kernel/file_systems/Jamfile
index bacc20807d..f4db09c94b 100644
--- a/src/add-ons/kernel/file_systems/Jamfile
+++ b/src/add-ons/kernel/file_systems/Jamfile
@@ -7,11 +7,10 @@ SubInclude HAIKU_TOP src add-ons kernel file_systems fat ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems googlefs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems iso9660 ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems nfs ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems ntfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems ramfs ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems reiserfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems udf ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ;
 
-SubIncludeGPL HAIKU_TOP src add-ons kernel file_systems ntfs ;
-SubIncludeGPL HAIKU_TOP src add-ons kernel file_systems reiserfs ;
-
 SubInclude HAIKU_TOP src add-ons kernel file_systems layers ;
diff --git a/src/add-ons/kernel/file_systems/ntfs/Jamfile b/src/add-ons/kernel/file_systems/ntfs/Jamfile
index e05dbb6a6b..afffa6e31c 100644
--- a/src/add-ons/kernel/file_systems/ntfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/ntfs/Jamfile
@@ -23,5 +23,5 @@ SEARCH on [ FGristFiles
 		kernel_cpp.cpp
 	] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
 
-SubIncludeGPL HAIKU_TOP src add-ons kernel file_systems ntfs libntfs ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems ntfs libntfs ;