diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 03a1ec57415..db81c577af6 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -14,7 +14,7 @@ KERNEL_SITE="http://www.kernel.org/pub/linux"
 #KERNEL_SITE="http://mirror.be.gbxs.net/pub/linux"
 CPAN_SITE="http://cpan.perl.org/modules/by-module"
 PYPI_SITE="http://pypi.python.org/packages/source"
-MOZILLA_SITE="http://ftp.mozilla.org/pub/mozilla.org"
+MOZILLA_SITE="http://ftp.mozilla.org/pub"
 GNU_SITE="http://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="http://freedesktop.org/software"
 
diff --git a/srcpkgs/firefox/update b/srcpkgs/firefox/update
index 9b57a78bf72..946c8a7aaa4 100644
--- a/srcpkgs/firefox/update
+++ b/srcpkgs/firefox/update
@@ -1,2 +1,2 @@
-pattern="href=\"\K[\d.]+(?=/\")"
-site="${MOZILLA_SITE}/firefox/releases/"
+site="${MOZILLA_SITE}/${pkgname}/releases/"
+pattern="\">\K[0-9.]+(?=/</a>)"
diff --git a/srcpkgs/thunderbird/update b/srcpkgs/thunderbird/update
index 3a7767f493f..946c8a7aaa4 100644
--- a/srcpkgs/thunderbird/update
+++ b/srcpkgs/thunderbird/update
@@ -1,2 +1,2 @@
-site="${MOZILLA_SITE}/${pkgname}/releases"
+site="${MOZILLA_SITE}/${pkgname}/releases/"
 pattern="\">\K[0-9.]+(?=/</a>)"