diff --git a/spamassassin.spec b/spamassassin.spec
index 0bc4f32..0d9c976 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -1,19 +1,18 @@
 %define _use_internal_dependency_generator 0
 
-%define name spamassassin
 %define real_name Mail-SpamAssassin
 %define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0)
 
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
-Name: %{name}
+Name: spamassassin
 Version: 3.0.0
-Release: 1
+Release: 2
 License: Apache License
 Group: Applications/Internet
-URL: http://spamassassin.org/
-Source0: Mail-SpamAssassin-3.0.0.tar.bz2
+URL: http://spamassassin.apache.org/
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -141,6 +140,9 @@ fi
 exit 0
 
 %changelog
+* Sat Sep 25 2004 Warren Togami <wtogami@redhat.com> - 3.0.0-2
+- Update URL, cleanup name (Robert Scheck #133622)
+
 * Thu Sep 23 2004 Warren Togami <wtogami@redhat.com> - 3.0.0-1
 - match upstream version
 - #133422 Future proof krb5 back compat (Milan Kerslager)