diff --git a/.cvsignore b/.cvsignore
index b99a68b..3ca7ec4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
 thunderbird-3.0-6a6386c16e98-source.tar.bz2
+thunderbird-3.0b3-source.tar.bz2
+thunderbird-langpacks-3.0-20090721.tar.bz2
diff --git a/sources b/sources
index eb244cc..d0326ef 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-ec5efa909535d4a764d8a0c0fa5d4a38  thunderbird-3.0-6a6386c16e98-source.tar.bz2
+84a004d76e82325dd2cc5ff271fd3952  thunderbird-3.0b3-source.tar.bz2
+f38cc1a9e69bff77e4eba2385272c671  thunderbird-langpacks-3.0-20090721.tar.bz2
diff --git a/thunderbird-shared-error.patch b/thunderbird-shared-error.patch
index 106ae3b..798e6d4 100644
--- a/thunderbird-shared-error.patch
+++ b/thunderbird-shared-error.patch
@@ -1,39 +1,15 @@
-diff -upU8 thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
---- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-02-24 03:16:03.000000000 +0100
-+++ thunderbird-3.0/mail/installer/Makefile.in	2009-02-27 16:02:31.000000000 +0100
-@@ -56,16 +56,17 @@ NO_PKG_FILES = \
- 	PalmSyncInstall.exe \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
- 
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
- 
- ifdef BUILD_STATIC_LIBS
+diff -up thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
+--- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-07-13 14:56:36.000000000 +0200
++++ thunderbird-3.0/mail/installer/Makefile.in	2009-07-14 12:41:16.000000000 +0200
+@@ -94,9 +94,11 @@ endif
+ # mozconfig instead.
+ ifndef MAIL_PKG_SHARED
+ ifndef BUILD_STATIC_LIBS
 +ifeq (BUILD_STATIC_LIBS, 1)
- ifeq (WINNT,$(OS_ARCH))
- MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
+ $(error you need an "--enable-static" build to package a build)
  endif
- else
- $(error you need a "--enable-static --disable-shared" build to create an installer)
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
-@@ -80,16 +81,17 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
- DEFINES += -DAB_CD=$(AB_CD)
- 
- ifdef MOZ_PKG_MANIFEST_P
- MOZ_PKG_MANIFEST = packages-static
- 
- $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
- 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
  endif
 +endif
  
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
- MOZ_PKG_MAC_DSSTORE=branding/dsstore
- MOZ_PKG_MAC_BACKGROUND=branding/background.png
- MOZ_PKG_MAC_ICON=branding/disk.icns
- MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
- endif
+ include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
  
diff --git a/thunderbird.spec b/thunderbird.spec
index 4082afc..c9468b1 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -1,28 +1,28 @@
 %define desktop_file_utils_version 0.9
 %define nspr_version 4.6
-%define nss_version 3.10
+%define nss_version 3.12.3
 %define cairo_version 1.0
 %define dbus_glib_version 0.6
-%define version_internal 3.0b3pre
-%define build_langpacks 0
+%define version_internal 3.0b3
+%define build_langpacks 1
 
 %define official_branding 1
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.3.b3pre.hg.6a6386c16e98%{?dist}
+Release:        2.4.b3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version}-6a6386c16e98-source.tar.bz2
+%define tarball thunderbird-%{version}b3-source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20090302.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20090721.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -173,18 +173,6 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 
 %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config
 
-cd $RPM_BUILD_ROOT%{mozappdir}/chrome
-find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
-cd -
-
-%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
-%{__cp} other-licenses/branding/%{name}/default.xpm \
-        $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
-
-%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/icons/
-%{__cp} other-licenses/branding/%{name}/default.xpm \
-        $RPM_BUILD_ROOT%{mozappdir}/icons/
-
 # own mozilla plugin dir (#135050)
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
 
@@ -299,10 +287,14 @@ fi
 %exclude %{mozappdir}/license.html
 %exclude %{mozappdir}/dependentlibs.list
 %exclude %{mozappdir}/removed-files
+%{mozappdir}/update.locale
 
 #===============================================================================
 
 %changelog
+* Tue Jul 21 2009 Jan Horak <jhorak@redhat.com> - 3.0-2.4.beta3
+- Update to 3.0 beta3
+
 * Mon Mar 30 2009 Jan Horak <jhorak@redhat.com> - 3.0-2.2.beta2
 - Fixed open-browser.sh to use xdg-open instead of gnome-open