diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 38a3db0ce2..ed1b554e82 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -8,7 +8,6 @@ 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 e2d23257b6..ae25f5e15f 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -454,9 +454,10 @@ if [ IsOptionalHaikuImagePackageAdded Firefox ] {
  		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-r1a1-x86-gcc2-2009-09-08
+			: $(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a1-x86-gcc2-2009-09-08.zip
+ 			:
  		;
  		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/BeZillaBrowser/BeZillaBrowser ;