diff --git a/.cvsignore b/.cvsignore
index f309cdd..ce4902f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Mail-SpamAssassin-3.0.3.tar.bz2
+Mail-SpamAssassin-3.0.4.tar.bz2
diff --git a/sources b/sources
index fb2ca05..24ecdb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9028e72958909285e43feb806d948dc  Mail-SpamAssassin-3.0.3.tar.bz2
+ba6e1bd95f6f9f3882f73212a11dbe46  Mail-SpamAssassin-3.0.4.tar.bz2
diff --git a/spamassassin.spec b/spamassassin.spec
index 26ac0bd..3e40d58 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -5,8 +5,8 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.0.3
-Release: 4.fc4
+Version: 3.0.4
+Release: 1.fc5
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -19,8 +19,7 @@ Source10: spamassassin-helper.sh
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-Patch106: spamassassin-3.0.3-rc-retval.patch
-Patch107: spamassassin-3.0.3-allow-disabling-subject-rewriting.patch
+#Patch107: spamassassin-3.0.3-allow-disabling-subject-rewriting.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -62,8 +61,7 @@ To filter spam for all users, add that line to /etc/procmailrc
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-%patch106 -p1
-%patch107 -p1
+#%patch107 -p1
 # end of patches
 
 %build
@@ -150,6 +148,9 @@ fi
 exit 0
 
 %changelog
+* Sun Jun 05 2005 Warren Togami <wtogami@redhat.com> - 3.0.4-1
+- 3.0.4
+
 * Tue May 17 2005 Warren Togami <wtogami@redhat.com> - 3.0.3-4
 - allow user-level disabling of subject rewriting pref (#147464)