diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 7936b17..b251869 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 15 14:59:32 UTC 2011 - wr@rosenauer.org
+
+- update to 5.0b6
+- include proper revision information into the build
+- speedier find-external-requires.sh
+
 -------------------------------------------------------------------
 Tue May 31 06:53:55 UTC 2011 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 91708af..069b795 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -22,7 +22,7 @@
 %define mainver %major.99
 
 Name:           MozillaFirefox
-BuildRequires:  Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip
+BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm
 %if %suse_version > 1110
 BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
@@ -35,7 +35,7 @@ BuildRequires:  nss-shared-helper-devel
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Version:        %{mainver}
 Release:        1
-%define         releasedate 2011053000
+%define         releasedate 2011061300
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
@@ -51,6 +51,7 @@ Source1:        MozillaFirefox.desktop
 Source2:        MozillaFirefox-rpmlintrc
 Source3:        mozilla.sh.in
 Source4:        find-external-requires.sh
+Source5:        source-stamp.txt
 Source6:        kde.js
 Source7:        l10n-%{version}.tar.bz2
 Source8:        firefox-mimeinfo.xml
@@ -71,6 +72,7 @@ Patch8:         mozilla-gio.patch
 Patch9:         mozilla-cairo-return.patch
 Patch10:        mozilla-ntlm-full-path.patch
 Patch11:        mozilla-ppc-ipc.patch
+Patch12:        mozilla-repo.patch
 # Firefox/browser
 Patch30:        firefox-linkorder.patch
 Patch31:        firefox-browser-css.patch
@@ -129,7 +131,6 @@ Requires:       perl(Archive::Zip)
 Development files for Firefox to make packaging of addons easier.
 
 %if %localize
-
 %package translations-common
 Summary:        Common translations for MozillaFirefox
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -177,7 +178,6 @@ This package provides upstream look and feel for MozillaFirefox.
 
 
 %if %crashreporter
-
 %package buildsymbols
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Breakpad buildsymbols for %{name}
@@ -188,6 +188,7 @@ This subpackage contains the Breakpad created and compatible debugging
 symbols meant for upload to Mozilla's crash collector database.
 %endif
 
+
 %prep
 %setup -q -n mozilla -b 7 -b 10
 cd $RPM_BUILD_DIR/mozilla
@@ -202,6 +203,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 #
 %patch30 -p1
 %patch31 -p1
@@ -232,6 +234,10 @@ if test "$kdehelperversion" != %{kde_helper_version}; then
   echo fix kde helper version in the .spec file
   exit 1
 fi
+source %{SOURCE5}
+export MOZ_SOURCE_STAMP=$REV
+export SOURCE_REPO=$REPO
+export MOZ_SOURCE_REPO=$REPO
 export MOZ_BUILD_DATE=%{releasedate}
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
@@ -291,6 +297,9 @@ make -f client.mk build
 %install
 cd $RPM_BUILD_DIR/obj
 rm dist/bin/defaults/pref/firefox-l10n.js
+source %{SOURCE5}
+export MOZ_SOURCE_STAMP=$REV
+export MOZ_SOURCE_REPO=$REPO
 make -C browser/installer STRIP=/bin/true
 # copy tree into RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{progdir}
@@ -525,7 +534,6 @@ exit 0
 %config /etc/rpm/macros.%{progname}
 
 %if %localize
-
 %files translations-common -f %{_tmppath}/translations.common
 %defattr(-,root,root)
 %dir %{progdir}
@@ -544,7 +552,6 @@ exit 0
 #%{progdir}/defaults/profile/bookmarks.html
 
 %if %crashreporter
-
 %files buildsymbols
 %defattr(-,root,root)
 %{_datadir}/mozilla/*.zip
diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2
index 9c82233..d9a2a2b 100644
--- a/compare-locales.tar.bz2
+++ b/compare-locales.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f451b9247ea93e75a1d2d0baf8643ec2f09c7aaef030ff56e98e15256a233a4d
-size 25657
+oid sha256:5f2e1fe0f5ce14a07cc6a0595ec24d67e68a5271c9ad18da9c1a7d7e60ab7644
+size 25677
diff --git a/create-tar.sh b/create-tar.sh
index 4f1f9d3..86b90e8 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
 
 BRANCH="mozilla-beta"
-RELEASE_TAG="FIREFOX_5_0b3_RELEASE"
+RELEASE_TAG="FIREFOX_5_0b6_RELEASE"
 VERSION="4.99"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
 pushd mozilla
 [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG
+# get repo and source stamp
+echo -n "REV=" > ../source-stamp.txt
+hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt
+echo -n "REPO=" >> ../source-stamp.txt
+hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt
 popd
 tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla
 
diff --git a/find-external-requires.sh b/find-external-requires.sh
index 1168ff2..f1ea065 100644
--- a/find-external-requires.sh
+++ b/find-external-requires.sh
@@ -1,23 +1,9 @@
 #!/bin/sh
-
 # Finds requirements provided outside of the current file set
 
-filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
-
-provides=`echo "$filelist" | /usr/lib/rpm/find-provides`
-
-{
-for f in $filelist ; do
-	echo $f | /usr/lib/rpm/find-requires | while read req ; do
-		found=0
-		for p in $provides ; do
-			if [ "$req" = "$p" ]; then
-				found=1
-			fi
-		done
-		if [ "$found" = "0" ]; then
-			echo $req
-		fi
-	done
-done
-} | sort -u
+filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" )
+provides=$( echo "$filelist" | /usr/lib/rpm/find-provides )
+echo "$filelist" \
+    | /usr/lib/rpm/find-requires \
+    | grep -F -v "$provides" \
+    | sort -u
diff --git a/firefox-4.99-source.tar.bz2 b/firefox-4.99-source.tar.bz2
index da0fc25..d60cb6c 100644
--- a/firefox-4.99-source.tar.bz2
+++ b/firefox-4.99-source.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43042fdc36e9c0449bbf7db56d320b789f806780e85e6fcaa82c1a24b5be4931
-size 68684588
+oid sha256:97703ac719827e5e1c670950cf15a696103f45c59175ddd9efc80b65fa9c07e9
+size 68753391
diff --git a/l10n-4.99.tar.bz2 b/l10n-4.99.tar.bz2
index 3a9b017..9bb401e 100644
--- a/l10n-4.99.tar.bz2
+++ b/l10n-4.99.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:879a144c7edd0481109fb3b4dd9ff268caceca8777c2ef256200f1e9f84ebe40
-size 37818146
+oid sha256:4cc25d59f5b7aac22af85eed87bda619ee7075333a5d1344c880934a10aa26a7
+size 43092043
diff --git a/mozilla-repo.patch b/mozilla-repo.patch
new file mode 100644
index 0000000..a88975d
--- /dev/null
+++ b/mozilla-repo.patch
@@ -0,0 +1,70 @@
+# HG changeset patch
+# Parent 84ecc6172ec5f01c80346bdb819520d08f982bac
+
+diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
+--- a/toolkit/content/Makefile.in
++++ b/toolkit/content/Makefile.in
+@@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops
+ ifdef MOZ_SOURCE_STAMP
+ DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)"
+ endif
+ 
+ # strip a trailing slash from the repo URL because it's not always present,
+ # and we want to construct a working URL in buildconfig.html
+ # make+shell+sed = awful
+ _dollar=$$
+-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
++SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
+ # extra sanity check for old versions of hg
+ # that don't support showconfig
+ ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
+ DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"
+ endif
+ 
+ ifdef MOZ_TOOLKIT_SEARCH
+ DEFINES += -DMOZ_TOOLKIT_SEARCH
+diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
+--- a/toolkit/mozapps/installer/package-name.mk
++++ b/toolkit/mozapps/installer/package-name.mk
+@@ -154,17 +154,17 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+ TEST_PACKAGE = $(PKG_BASENAME).tests.zip
+ 
+ ifneq (,$(wildcard $(DIST)/bin/application.ini))
+ BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
+ else
+ BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
+ endif
+ 
+-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
++#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
+ 
+ # strip a trailing slash from the repo URL because it's not always present,
+ # and we want to construct a working URL in the sourcestamp file.
+ # make+shell+sed = awful
+ _dollar=$$
+-MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
++#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
+ 
+ MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt
+diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
+--- a/toolkit/xre/Makefile.in
++++ b/toolkit/xre/Makefile.in
+@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+ endif
+ endif
+ 
+ MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
+ # strip a trailing slash from the repo URL because it's not always present,
+ # and we want to construct a working URL in buildconfig.html
+ # make+shell+sed = awful
+ _dollar=$$
+-SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
++SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
+ 
+ ifdef MOZ_SOURCE_STAMP
+ INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)
+ # extra sanity check for old versions of hg
+ # that don't support showconfig
+ ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
+ INIARGS += --sourcerepo=$(SOURCE_REPO)
+ endif
diff --git a/source-stamp.txt b/source-stamp.txt
new file mode 100644
index 0000000..5b2e741
--- /dev/null
+++ b/source-stamp.txt
@@ -0,0 +1,2 @@
+REV=937762949167
+REPO=http://hg.mozilla.org/mozilla-beta