diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index 097f25f0dc..45c0a4d220 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -47,10 +47,11 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
 SYSTEM_APPS = [ FFilterByBuildFeatures
 	AboutSystem ActivityMonitor BootManager@x86,x86_64 CDPlayer CharacterMap
 	CodyCam Debugger DeskCalc Devices DiskProbe DiskUsage DriveSetup
-	Expander GLInfo@x86 HaikuDepot Icon-O-Matic Installer LaunchBox Magnify Mail
-	MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
-	PoorMan PowerStatus ProcessController Screenshot SerialConnect ShowImage
-	SoundRecorder StyledEdit Terminal TextSearch TV WebWatch Workspaces
+	Expander GLInfo@mesa HaikuDepot Icon-O-Matic Installer LaunchBox 
+	Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus
+	PackageInstaller People	PoorMan PowerStatus ProcessController 
+	Screenshot SerialConnect ShowImage SoundRecorder StyledEdit 
+	Terminal TextSearch TV WebWatch Workspaces
 ] ;
 SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
 	Appearance Backgrounds DataTranslations
@@ -59,8 +60,8 @@ SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
 	Shortcuts Sounds Time Touchpad <preference>Tracker VirtualMemory
 ] ;
 SYSTEM_DEMOS = [ FFilterByBuildFeatures
-	BSnow Chart Clock Cortex FontDemo GLTeapot@x86
-	$(HAIKU_INCLUDE_TRADEMARKS)Haiku3d@x86 Mandelbrot OverlayImage Pairs
+	BSnow Chart Clock Cortex FontDemo GLTeapot@mesa
+	$(HAIKU_INCLUDE_TRADEMARKS)Haiku3d@mesa Mandelbrot OverlayImage Pairs
 	PatchBay Playground Pulse Sudoku
 ] ;
 
@@ -76,7 +77,7 @@ rule HaikuImageGetSystemLibs
 		[ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
 			libbe.so libbsd.so libbnetapi.so
 			libdebug.so libdevice.so
-			libgame.so libglut.so@x86
+			libgame.so libglut.so@mesa
 			libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
 			libnetwork.so
 			libpackage.so
@@ -165,9 +166,9 @@ SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR
 	Print\ To\ File Serial\ Port USB\ Port
 ;
 SYSTEM_ADD_ONS_SCREENSAVERS = [ FFilterByBuildFeatures
-	Butterfly DebugNow Flurry@x86
-	GLife@x86 $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves
-	Message Spider Gravity@x86
+	Butterfly DebugNow Flurry@mesa
+	GLife@mesa $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves
+	Message Spider Gravity@mesa
 ] ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ice1712 sis7018 ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ;