diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 4db51c8e06..dec8303c6e 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -59,14 +59,14 @@ SYSTEM_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 	ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
 SYSTEM_DEMOS = BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
-	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot Pairs
+	GLDirectMode GLTeapot Mandelbrot Pairs
 	Playground Pulse Sudoku Gradients
 ;
 SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
 	libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so
 	libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
 	libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
-	$(X86_ONLY)libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
+	libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
 	libilmimf.so libiconv.so
 ;
 SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
@@ -119,7 +119,7 @@ SYSTEM_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
 SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow $(X86_ONLY)Flurry Haiku IFS Spider Message ;
+SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
@@ -417,7 +417,7 @@ AddBootModuleSymlinksToHaikuImage
 AddFilesToHaikuImage system add-ons accelerants
 	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
 AddFilesToHaikuImage system add-ons opengl
-	: $(X86_ONLY)Mesa\ Software\ Renderer ;
+	: Mesa\ Software\ Renderer ;
 AddFilesToHaikuImage system add-ons Translators
 	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
 AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;