diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index ed1b554e82..38a3db0ce2 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -8,6 +8,7 @@ OptionalPackageDependencies APR-util : APR Expat ;
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
+OptionalPackageDependencies Firefox : LibIconv ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies NetSurf : OpenSSL ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index ca4b865c35..e2d23257b6 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -445,13 +445,18 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-		Echo "No optional package Firefox available for gcc4" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		InstallOptionalHaikuImagePackage
+			BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
+			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
+ 			: apps
+ 		;
+ 		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
 	} else {
-		InstallOptionalHaikuImagePackage 
-			BeZillaBrowser-2.0.0.22pre-r1a1-x86-gcc2-2009-09-08
-			: $(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a1-x86-gcc2-2009-09-08.zip
- 			:
+		InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
+			: http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
+ 			: apps
  		;
  		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;