diff --git a/thunderbird-2.0-default-applications.patch b/thunderbird-2.0-default-applications.patch
index 33440cb..8a52b69 100644
--- a/thunderbird-2.0-default-applications.patch
+++ b/thunderbird-2.0-default-applications.patch
@@ -14,3 +14,19 @@ diff -d -u -p -r1.8.2.1 nsMailGNOMEIntegration.cpp
  {}
  
  nsresult
+Index: mozilla/mail/components/preferences/general.xul
+===================================================================
+RCS file: /cvsroot/mozilla/mail/components/preferences/general.xul,v
+retrieving revision 1.4.2.9
+diff -d -u -p -r1.4.2.9 general.xul
+--- mozilla/mail/components/preferences/general.xul	18 Feb 2007 20:26:46 -0000	1.4.2.9
++++ mozilla/mail/components/preferences/general.xul	13 Apr 2007 19:34:19 -0000
+@@ -70,7 +70,7 @@
+ 
+     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
+ 
+-#ifdef HAVE_SHELL_SERVICE
++#ifdef 0
+     <stringbundle id="bundleShell" src="chrome://messenger/locale/shellservice.properties"/>
+     <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
+     
diff --git a/thunderbird.spec b/thunderbird.spec
index 8cee50d..da050a1 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.0
-Release:	0.4.rc1%{?dist}
+Release:	0.5.rc1%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
 Group:		Applications/Internet
@@ -192,8 +192,8 @@ DESTDIR=$RPM_BUILD_ROOT make install
 
 desktop-file-install --vendor mozilla \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category Application \
   --add-category Network \
+  --add-category Email \
   %{SOURCE20}
 
 # set up the thunderbird start script
@@ -277,15 +277,44 @@ update-desktop-database %{_datadir}/applications
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
 %attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png
+%{mozappdir}/LICENSE
+%{mozappdir}/chrome
+%{mozappdir}/components
+%{mozappdir}/defaults
+%{mozappdir}/dictionaries
+%{mozappdir}/extensions
+%{mozappdir}/greprefs
+%{mozappdir}/icons
+%{mozappdir}/init.d
+%{mozappdir}/isp
+%{mozappdir}/mozilla-xremote-client
+%{mozappdir}/open-browser.sh
+%{mozappdir}/regxpcom
+%{mozappdir}/res
+%{mozappdir}/run-mozilla.sh
+%{mozappdir}/thunderbird-bin
+%{mozappdir}/updater
+%{mozappdir}/*.so
+
 %exclude %{_includedir}/%{name}-%{version}
 %exclude %{_datadir}/idl/%{name}-%{version}
 %exclude %{_libdir}/pkgconfig/*.pc
-%{mozappdir}
+%exclude %{mozappdir}/TestGtkEmbed
+%exclude %{mozappdir}/xpidl
+%exclude %{mozappdir}/xpcshell
+%exclude %{mozappdir}/xpt_dump
+%exclude %{mozappdir}/xpt_link
+%exclude %{mozappdir}/xpicleanup
 
 #===============================================================================
 
 %changelog
-* Thu Apr 12 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.3.rc1
+* Fri Apr 13 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.5.rc1
+- Fix the desktop file
+- Clean up the files list
+- Remove the default client stuff from the pref window
+
+* Thu Apr 12 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.4.rc1
 - Rebuild into Fedora
 
 * Wed Apr 11 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.3.rc1