diff --git a/.cvsignore b/.cvsignore
index 8c79fd3..2818470 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,5 @@ thunderbird-langpacks-3.0-20090721.tar.bz2
 thunderbird-3.0b4-source.tar.bz2
 thunderbird-langpacks-3.0b4-20090917.tar.bz2
 thunderbird-langpacks-3.0b4-20091109.tar.bz2
+thunderbird-3.0rc1.source.tar.bz2
+thunderbird-langpacks-3.0rc1-20091118.tar.bz2
diff --git a/sources b/sources
index b4324bf..3d3c461 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0f7c7cdfebd8948b7e3fe835773b072d  thunderbird-3.0b4-source.tar.bz2
-a376821cfa1452bbe3f81eba5a163428  thunderbird-langpacks-3.0b4-20091109.tar.bz2
+f9da82698c8171a4cf68bdd234065844  thunderbird-3.0rc1.source.tar.bz2
+70d5100c83a6b188bc6bbc5284682aed  thunderbird-langpacks-3.0rc1-20091118.tar.bz2
diff --git a/thunderbird.desktop b/thunderbird.desktop
index d11bf5e..8c01e6f 100644
--- a/thunderbird.desktop
+++ b/thunderbird.desktop
@@ -9,3 +9,4 @@ Icon=thunderbird
 Terminal=false
 Type=Application
 StartupWMClass=Thunderbird-bin
+MimeType=message/rfc822;
diff --git a/thunderbird.spec b/thunderbird.spec
index d56eb1e..df68fd0 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -3,9 +3,9 @@
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
-
-%define version_internal 3.0b4
+%define version_internal 3.0rc1
 %define build_langpacks 1
+%define moz_objdir objdir-tb
 
 # The tarball is pretty inconsistent with directory structure.
 # Sometimes there is a top level directory.  That goes here.
@@ -13,26 +13,26 @@
 # IMPORTANT: If there is no top level directory, this should be 
 # set to the cwd, ie: '.'
 #%define tarballdir .
-%define tarballdir comm-central
+%define tarballdir comm-1.9.1
 
-%define mozappdir %{_libdir}/thunderbird-%{version_internal}
+%define mozappdir %{_libdir}/thunderbird-%{version}
 %define official_branding 1
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.10.b4%{?dist}
+Release:        3.11.rc1%{?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}b4-source.tar.bz2
+%define tarball thunderbird-%{version_internal}.source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}b4-20091109.tar.bz2
+Source1:        thunderbird-langpacks-%{version_internal}-20091118.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -135,11 +135,11 @@ export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 
 %define moz_make_flags -j1
-#%ifarch ppc ppc64 s390 s390x
-#%define moz_make_flags -j1
-#%else
-#%define moz_make_flags %{?_smp_mflags}
-#%endif
+%ifarch ppc ppc64 s390 s390x
+%define moz_make_flags -j1
+%else
+%define moz_make_flags %{?_smp_mflags}
+%endif
 
 export LDFLAGS="-Wl,-rpath,%{mozappdir}"
 export MAKE="gmake %{moz_make_flags}"
@@ -151,7 +151,7 @@ make -f client.mk build
 %{__rm} -rf $RPM_BUILD_ROOT
 cd %{tarballdir}
 
-cd objdir-tb
+cd %{moz_objdir}
 DESTDIR=$RPM_BUILD_ROOT make install
 
 cd -
@@ -168,7 +168,7 @@ desktop-file-install --vendor mozilla \
 
 # set up the thunderbird start script
 rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
-%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version_internal},g' > \
+%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version},g' > \
   $RPM_BUILD_ROOT%{_bindir}/thunderbird
 %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 
@@ -189,9 +189,9 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
 
 # Install langpacks
-cd %{_builddir}/%{?buildsubdir}
 %{__rm} -f %{name}.lang # Delete for --short-circuit option
 touch %{name}.lang
+
 %if %{build_langpacks}
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
 %{__tar} xjf %{SOURCE1}
@@ -222,7 +222,6 @@ for langpack in `ls thunderbird-langpacks/*.xpi`; do
 done
 %{__rm} -rf thunderbird-langpacks
 %endif # build_langpacks
-cd %{_builddir}/%{?buildsubdir}/%{tarballdir}
 
 # Copy over the LICENSE
 cd mozilla
@@ -256,7 +255,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files -f %{name}.lang
+%files -f %{tarballdir}/%{name}.lang
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
@@ -296,8 +295,8 @@ fi
 %{mozappdir}/platform.ini
 %{mozappdir}/updater.ini
 %{mozappdir}/application.ini
-%exclude %{mozappdir}/LICENSE.txt
-%exclude %{mozappdir}/license.html
+#%exclude %{mozappdir}/LICENSE.txt
+#%exclude %{mozappdir}/license.html
 %exclude %{mozappdir}/dependentlibs.list
 %exclude %{mozappdir}/removed-files
 %{mozappdir}/update.locale
@@ -305,6 +304,9 @@ fi
 #===============================================================================
 
 %changelog
+* Thu Nov 19 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.11.rc1
+- Update to 3.0 RC1
+
 * Mon Nov  9 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.10.b4
 - Fixed cs localisation