diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index b3071130f2..10957bc9c0 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -51,9 +51,9 @@ BEOS_APPS = AboutSystem CodyCam DeskCalc DiskProbe CDPlayer Expander
 	NetworkStatus PackageInstaller People PowerStatus ProcessController
 	ShowImage SoundRecorder StyledEdit Terminal TV Workspaces
 ;
-BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes
-	Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen ScreenSaver
-	Sounds Time VirtualMemory
+BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
+	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
+	ScreenSaver Sounds Time VirtualMemory
 ;
 BEOS_DEMOS = BitmapDrawing Chart Clock $(X86_ONLY)Cortex FontDemo
 	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot PictureTest
@@ -108,7 +108,7 @@ BEOS_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
 BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS ;
+BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS Message Spider ;
 BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki hda ;
 BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
 	$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme