diff --git a/www-client/waterfox/additional-files/mozconfig b/www-client/waterfox/additional-files/mozconfig
index bbccd7d68..ee8e51223 100644
--- a/www-client/waterfox/additional-files/mozconfig
+++ b/www-client/waterfox/additional-files/mozconfig
@@ -44,9 +44,6 @@ ac_add_options --enable-webrtc
 
 # Linker
 ac_add_options --disable-lto
-ac_add_options --enable-linker=lld
-export LD="lld"
-export LDFLAGS="-fuse-ld=lld -Wl,--no-keep-memory -Wl,--undefined-version"
 
 # Optimize
 ac_add_options --enable-jit
diff --git a/www-client/waterfox/patches/waterfox-6.5.7.patchset b/www-client/waterfox/patches/waterfox-6.5.11.patchset
similarity index 100%
rename from www-client/waterfox/patches/waterfox-6.5.7.patchset
rename to www-client/waterfox/patches/waterfox-6.5.11.patchset
diff --git a/www-client/waterfox/patches/waterfox_launcher-6.5.7.patchset b/www-client/waterfox/patches/waterfox_launcher-6.5.11.patchset
similarity index 100%
rename from www-client/waterfox/patches/waterfox_launcher-6.5.7.patchset
rename to www-client/waterfox/patches/waterfox_launcher-6.5.11.patchset
diff --git a/www-client/waterfox/waterfox-6.5.7.recipe b/www-client/waterfox/waterfox-6.5.11.recipe
similarity index 94%
rename from www-client/waterfox/waterfox-6.5.7.recipe
rename to www-client/waterfox/waterfox-6.5.11.recipe
index 832195e31..8a29bb85c 100644
--- a/www-client/waterfox/waterfox-6.5.7.recipe
+++ b/www-client/waterfox/waterfox-6.5.11.recipe
@@ -15,8 +15,8 @@ COPYRIGHT="1995-2025 Mozilla Developers, BrowserWorks"
 LICENSE="MPL v2.0"
 REVISION="1"
 SOURCE_URI="https://github.com/BrowserWorks/Waterfox/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="bf0246e9fd42ba4fbacfeaa737078f554281d1a3dbe13f9c625c4b6b2910106e"
-SOURCE_DIR="Waterfox-$portVersion"
+CHECKSUM_SHA256="b743b6358d1d7fe4c13b0c4e91f3bbc8c5142164682da1f5d440d22912524a25"
+SOURCE_DIR="waterfox-$portVersion"
 srcGitRev="3046738340d44e4ac76d29f96abc06a4ae71c1ad"
 SOURCE_URI_2="https://github.com/BrowserWorks/l10n/archive/$srcGitRev.zip"
 CHECKSUM_SHA256_2="3483246095cbab547f35eb4d8526646193f5492174c480205bad4a4cac847ea5"
@@ -38,6 +38,9 @@ PROVIDES="
 	waterfox= $portVersion
 	app:Waterfox= $portVersion
 	"
+CONFLICTS="
+	waterfox_bin
+	"
 REQUIRES="
 	haiku
 	lib:libatk_1.0
@@ -52,6 +55,7 @@ REQUIRES="
 	lib:libharfbuzz
 	lib:libintl
 	lib:libmediahelpers
+	lib:libnotify
 	lib:libnspr4
 	lib:libnss3
 	lib:libpango_1.0
@@ -68,6 +72,7 @@ BUILD_REQUIRES="
 	devel:libglib_2.0
 	devel:libgtk_3
 	devel:libmediahelpers
+	devel:libnotify
 	devel:libnspr4
 	devel:libnss3
 	devel:libpng16
@@ -76,7 +81,7 @@ BUILD_REQUIRES="
 	devel:libzstd
 	"
 BUILD_PREREQUIRES="
-	llvm18
+	llvm20
 	nodejs20
 	rust_bin
 	cmd:autoconf_2.13
@@ -86,7 +91,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:git
 	cmd:gn
-	cmd:lld >= 18
+	cmd:lld >= 20
 	cmd:m4
 	cmd:make
 	cmd:nasm
@@ -116,6 +121,7 @@ BUILD()
 	rm -rf waterfox/browser/locales
 	ln -s $sourceDir2 waterfox/browser/locales
 
+	export DISABLE_ASLR=1
 	export MOZBUILD_STATE_PATH="$sourceDir/.buildstate"
 
 	./mach -vv \
@@ -133,6 +139,7 @@ BUILD()
 
 INSTALL()
 {
+	export DISABLE_ASLR=1
 	export MOZBUILD_STATE_PATH="$sourceDir/.buildstate"
 
 	./mach install