diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index b8079cc811..a7a079aed9 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -645,14 +645,14 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
 if [ IsOptionalHaikuImagePackageAdded friss ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package friss available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) = 2 {
-		Echo "No optional package friss available for gcc2" ;
-	} else {
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
 		InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip
 			: http://pulkomandy.ath.cx/projects/friss/export/8/bin/friss-0.5pre7-x86-gcc4.zip
 			:
 			: true
 		;
+	} else {
+		Echo "No optional package friss available for gcc2" ;
 	}
 }
 
@@ -1358,14 +1358,14 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage Vision-0.9.7-H-x86-gcc4-2010-05-22.zip
 			: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2010-05-22.zip
-			: 
+			:
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/Vision-0.9.7-H-090423/Vision ;
 	} else {
 		InstallOptionalHaikuImagePackage Vision-0.9.7-H-x86-gcc2-2010-05-22.zip
 			: $(baseURL)/Vision-0.9.7-H-x86-gcc2-2010-05-22.zip
-			: 
+			:
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/Vision-0.9.7-H-090423/Vision ;