diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index 30b5e3b527..5e021c3b77 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -63,26 +63,38 @@ SYSTEM_DEMOS = [ FFilterByBuildFeatures
 	$(HAIKU_INCLUDE_TRADEMARKS)Haiku3d@x86 Mandelbrot OverlayImage Pairs
 	Playground Pulse Sudoku
 ] ;
-SYSTEM_LIBS = [ FFilterByBuildFeatures
-	libbe.so libbsd.so libbnetapi.so
-	libdebug.so libdevice.so
-	libgame.so libGL.so@x86 libglut.so@x86
-	libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
-	libnetwork.so
-	libpackage.so
-	<revisioned>libroot.so
-	libscreensaver.so
-	libtextencoding.so libtiff.so libtracker.so libtranslation.so
-	$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
-	$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
-] ;
-PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
-	libalm.so
-	libfluidsynth.so
-	libilmimf.so
-	libpackage-add-on-libsolv.so
-	libroot-addon-icu.so
-] ;
+
+
+rule HaikuImageGetSystemLibs
+{
+	return [ FFilterByBuildFeatures
+		libbe.so libbsd.so libbnetapi.so
+		libdebug.so libdevice.so
+		libgame.so libGL.so@x86 libglut.so@x86
+		libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
+		libnetwork.so
+		libpackage.so
+		<revisioned>libroot.so
+		libscreensaver.so
+		libtextencoding.so libtiff.so libtracker.so libtranslation.so
+		$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
+		$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
+	] ;
+}
+
+
+rule HaikuImageGetPrivateSystemLibs
+{
+	return [ FFilterByBuildFeatures
+		libalm.so
+		libfluidsynth.so
+		libilmimf.so
+		libpackage-add-on-libsolv.so
+		libroot-addon-icu.so
+	] ;
+}
+
+
 SYSTEM_SERVERS = [ FFilterByBuildFeatures
 	app_server cddb_daemon debug_server dns_resolver_server input_server
 	keystore_server mail_daemon media_addon_server media_server midi_server
diff --git a/build/jam/images/HaikuImageBootstrap b/build/jam/images/HaikuImageBootstrap
index df22436b11..2cbe790d8b 100644
--- a/build/jam/images/HaikuImageBootstrap
+++ b/build/jam/images/HaikuImageBootstrap
@@ -59,26 +59,38 @@ SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
 	Shortcuts Time Touchpad <preference>Tracker VirtualMemory
 ] ;
 SYSTEM_DEMOS = ;
-SYSTEM_LIBS = [ FFilterByBuildFeatures
-	libbe.so libbsd.so libbnetapi.so
-	libdebug.so libdevice.so
-	libgame.so
-	libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
-	libnetwork.so
-	libpackage.so
-	<revisioned>libroot.so
-	libscreensaver.so
-	libtextencoding.so libtracker.so libtranslation.so
-	$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
-	$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
-] ;
-PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
-	libalm.so
-#	libfluidsynth.so
-#	libilmimf.so
-	libpackage-add-on-libsolv.so
-	libroot-addon-icu.so
-] ;
+
+
+rule HaikuImageGetSystemLibs
+{
+	return [ FFilterByBuildFeatures
+		libbe.so libbsd.so libbnetapi.so
+		libdebug.so libdevice.so
+		libgame.so
+		libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
+		libnetwork.so
+		libpackage.so
+		<revisioned>libroot.so
+		libscreensaver.so
+		libtextencoding.so libtracker.so libtranslation.so
+		$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
+		$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
+	] ;
+}
+
+
+rule HaikuImageGetPrivateSystemLibs
+{
+	return [ FFilterByBuildFeatures
+		libalm.so
+#		libfluidsynth.so
+#		libilmimf.so
+		libpackage-add-on-libsolv.so
+		libroot-addon-icu.so
+	] ;
+}
+
+
 SYSTEM_SERVERS = [ FFilterByBuildFeatures
 	app_server debug_server dns_resolver_server input_server
 	keystore_server media_addon_server
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 5128ffcee4..2ba2ad1ee7 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -87,7 +87,8 @@ AddDriversToPackage power			: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
 AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # libs
-AddLibrariesToPackage lib : $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
+AddLibrariesToPackage lib
+	: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
 
 # libnetwork.so replaces quite a few libraries
 SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ;
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index 38cf1d39ed..92802243d1 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -86,7 +86,8 @@ AddDriversToPackage power			: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
 AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # libs
-AddLibrariesToPackage lib : $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
+AddLibrariesToPackage lib
+	: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
 
 # libnetwork.so replaces quite a few libraries
 SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ;
diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel
index 52e2bfe14f..7c70c8017a 100644
--- a/build/jam/packages/HaikuDevel
+++ b/build/jam/packages/HaikuDevel
@@ -25,7 +25,7 @@ AddFilesToPackage lib : $(developmentLibs) ;
 
 # library symlinks
 local lib ;
-for lib in $(SYSTEM_LIBS) $(developmentLibs) {
+for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
 	AddSymlinkToPackage $(developDirTokens) lib : /system/lib $(lib:BS) ;
 	local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
 	if $(abiVersion) {