diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 611b2420dc..cb6cc3fd75 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -9,7 +9,6 @@ OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL Pe ;  # FIXME: Pe
 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 f6d7bb47e0..429659b349 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -447,16 +447,17 @@ if [ IsOptionalHaikuImagePackageAdded Firefox ] {
 		Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
 	} 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
+			BeZillaBrowser-2.0.0.22pre-x86-gcc4-2009-09-28
+			: $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2009-09-28.zip
+ 			: 
  		;
  		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
 	} else {
-		InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
-			: http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
- 			: apps
+		InstallOptionalHaikuImagePackage 
+			BeZillaBrowser-2.0.0.22pre-x86-gcc2-2009-09-27
+			: $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2009-09-27.zip
+ 			: 
  		;
  		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;