diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 230a9678e1..237446cbc8 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -10,7 +10,6 @@ OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
 OptionalPackageDependencies ICU-devel : Development ;
-OptionalPackageDependencies Firefox : BeZillaBrowser ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 7a9129b89a..c186875411 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -33,7 +33,6 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	DevelopmentBase			- basic development environment (gcc, headers, libs,...)
 #	DevelopmentMin			- development headers, libs, tools, from sources only
 #	Expat					- XML parsing libraries
-#	Firefox					- the webbrowser NOTE: will be removed soon.
 #	Git						- the distributed version control system
 #	ICU-devel				- the headers for ICU (for development)
 #	KeymapSwitcher			- Desktop utility
@@ -549,13 +548,6 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
 }
 
 
-# Firefox web browser
-if [ IsOptionalHaikuImagePackageAdded Firefox ] {
-	Echo "Warning: The optional package Firefox is being replaced with"
-	"BeZillaBrowser" ;
-}
-
-
 # Git
 if [ IsOptionalHaikuImagePackageAdded Git ] {
 	if $(TARGET_ARCH) != x86 {