diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages
index a8e5b8bd3f..b04194c9ed 100644
--- a/build/jam/OptionalLibPackages
+++ b/build/jam/OptionalLibPackages
@@ -36,7 +36,7 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
 	# libsdl and related libs
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			allegro-4.4.1.1-x86-gcc4-2010-10-30.zip
 			: $(baselibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ;
@@ -64,7 +64,7 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
 if [ IsOptionalHaikuImagePackageAdded fribidi ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package fribidi available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			fribidi-0.19.2-x86-gcc4-2010-10-30.zip
 			: $(baselibURL)/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
@@ -143,6 +143,7 @@ if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
 
 
 # libmng
+# TODO: Libmng exists in OptionalPackages!
 if [ IsOptionalHaikuImagePackageAdded libmng ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package libmng available for $(TARGET_ARCH)" ;
@@ -191,7 +192,7 @@ if [ IsOptionalHaikuImagePackageAdded libpaper ] {
 if [ IsOptionalHaikuImagePackageAdded physfs ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package physfs available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			physfs-2.0.1-x86-gcc4-2010-10-30.zip
 			: $(baselibURL)/physfs-2.0.1-x86-gcc4-2010-10-30.zip
@@ -213,7 +214,7 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
 if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			libsdl-1.2-hg-x86-gcc4-2010-10-30.zip
 			: $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ;
@@ -249,7 +250,7 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
 			: $(baselibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ;
 		InstallOptionalHaikuImagePackage
 			smpeg-0.4.5-x86-gcc4-2010-10-29.zip
-			: $(baselibURL)/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ;	
+			: $(baselibURL)/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
 			libsdl-1.2-hg-x86-gcc2-2010-10-29.zip
@@ -295,7 +296,7 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
 if [ IsOptionalHaikuImagePackageAdded XiphLibs ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			flac-1.2.1-x86-gcc4-2010-10-30.zip
 			: $(baselibURL)/flac-1.2.1-x86-gcc4-2010-10-30.zip ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 5d50b97829..c37947c824 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -142,14 +142,8 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
 if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package ArmyKnife available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package ArmyKnife for gcc4" ;
-#		InstallOptionalHaikuImagePackage armyknife-61-x86-gcc4-2010-10-30.zip
-#			: $(baseURL)/armyknife-61-x86-gcc4-2010-10-30.zip
-#			:
-#		;
-#		AddSymlinkToHaikuImage home config be Applications
-#			: /boot/apps/ArmyKnife/ArmyKnife ;
 	} else {
 		InstallOptionalHaikuImagePackage armyknife-61-x86-gcc2-2010-10-30.zip
 			: $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip
@@ -1474,7 +1468,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package TagLib available for $(TARGET_ARCH)" ;
 	} else {
-		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 			Echo "No optional package TagLib available for $(TARGET_ARCH)-gcc4" ;
 		} else {
 			InstallOptionalHaikuImagePackage
@@ -1623,14 +1617,8 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
 if [ IsOptionalHaikuImagePackageAdded Vision ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Vision available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package Vision for gcc4" ;
-#		InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-10-30.zip
-#			: $(baseURL)/vision-908-x86-gcc4-2010-10-30.zip
-#			:
-#		;
-#		AddSymlinkToHaikuImage home config be Applications
-#			: /boot/apps/Vision/Vision ;
 	} else {
 		InstallOptionalHaikuImagePackage vision-908-x86-gcc2-2010-10-30.zip
 			: $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip