diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 0e01c4935a..77cf406fb3 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -62,7 +62,7 @@ BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ;
 
 BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nv.accelerant
 	$(X86_ONLY)mga.accelerant $(X86_ONLY)nm.accelerant $(X86_ONLY)intel_extreme.accelerant
-	vesa.accelerant $(X86_ONLY)vmware.accelerant
+	vesa.accelerant #$(X86_ONLY)vmware.accelerant
 ;
 BEOS_ADD_ONS_TRANSLATORS = BMPTranslator GIFTranslator JPEGTranslator
 	JPEG2000Translator TIFFTranslator PNGTranslator PPMTranslator 
@@ -93,7 +93,7 @@ BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS ;
 BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki ;
 BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon.driver $(X86_ONLY)nv.driver
 	$(X86_ONLY)nm.driver $(X86_ONLY)mga.driver $(X86_ONLY)intel_extreme vesa
-	$(X86_ONLY)vmware
+	#$(X86_ONLY)vmware
 ;
 BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
 BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900