diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e678f58..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bugzilla-3.0.2.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a34202
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+bugzilla-3.0.4.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c2b3080..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: bugzilla
-# $Id$
-NAME := bugzilla
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla
index ea9b201..2611a75 100644
--- a/README.fedora.bugzilla
+++ b/README.fedora.bugzilla
@@ -14,3 +14,12 @@ database setting modifications.
 
 Lastly, simply re-run checksetup.pl to populate the database tables, set up
 the templates, and add the administrator ID.  You should be done at this point.
+
+There are two useful cron jobs which are included with Bugzilla which should be
+put in place after configuration is done.  The first is a daily cron job for 
+statistics collection.  This is in the file "cron.daily" and can be enabled by
+simply copying this file to /etc/cron.daily/bugzilla (or any other file name
+in the /etc/cron.daily/ directory).  The second is the "whine" cron job,
+designed to run every 15 minutes.  To enable this job, simply coopy the
+cron.whine file to /etc/cron.d/bugzilla (or any othe filename within the
+/etc/cron.d/ directory).
diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf
index c251546..e8fbb38 100644
--- a/bugzilla-httpd-conf
+++ b/bugzilla-httpd-conf
@@ -4,5 +4,5 @@ Alias /bugzilla /usr/share/bugzilla
   AddHandler cgi-script .cgi
   Options +Indexes +ExecCGI +FollowSymLinks
   DirectoryIndex index.cgi
-  AllowOverride Limit
+  AllowOverride Limit Options FileInfo
 </Directory>
diff --git a/bugzilla.spec b/bugzilla.spec
index c669bdd..41aa472 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.0.2
+Version: 3.0.4
 Group: Applications/Publishing
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -14,7 +14,7 @@ Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: smtpdaemon, webserver, graphviz, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address
+Requires: smtpdaemon, webserver, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address, which
 
 %package doc
 Summary: Bugzilla documentation
@@ -75,15 +75,13 @@ done
 %install
 mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
 cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily
-cat << EOM > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily/bugzilla
+cat << EOM > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.daily
 #!/bin/bash
 # Daily Bugzilla collectstats cron job run
 cd %{bzinstallprefix}/bugzilla
 ./collectstats.pl
 EOM
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d
-echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla
+echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine
 rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
 cp %{SOURCE2} ./README.fedora
@@ -115,12 +113,10 @@ popd > /dev/null
 %{bzinstallprefix}/bugzilla/skins
 %{bzinstallprefix}/bugzilla/t
 %{bzinstallprefix}/bugzilla/template
+%{bzinstallprefix}/bugzilla/cron.daily
+%{bzinstallprefix}/bugzilla/cron.whine
 %ghost %{bzinstallprefix}/bugzilla/bugzilla-req
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
-%defattr(0755,root,root,-)
-%{_sysconfdir}/cron.daily/*
-%defattr(0600,root,root,-)
-%{_sysconfdir}/cron.d/*
 %defattr(-,root,root,-)
 %doc README
 %doc QUICKSTART
@@ -128,6 +124,7 @@ popd > /dev/null
 %doc UPGRADING-pre-2.8
 %doc README.fedora
 %dir %{bzdatadir}
+%defattr(0750,root,apache,-)
 %dir %{_sysconfdir}/bugzilla
 
 %files doc
@@ -137,6 +134,26 @@ popd > /dev/null
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Fri May  9 2008 John Berninger <john at ncphotography dot com> - 3.0.4-1
+- Update to upstream 3.0.4 to fix multiple security vulns
+- Change perms on /etc/bugzilla for bz 427981 
+
+* Fri Dec 28 2007 John Berninger <john at ncphotography dot com> - 3.0.2-6
+- Add cron.daily, cron.whine to payload list
+
+* Fri Dec 28 2007 John Berninger <john at ncphotography dot com> - 3.0.2-5
+- Typo in spec file, rebuild
+
+* Fri Dec 28 2007 John Berninger <john at ncphotography dot com> - 3.0.2-3
+- bz 426465 - don't enable cron jobs so cron doesn't complain about
+  an unconfigured installation
+
+* Fri Oct 26 2007 John Berninger <john at ncphotography dot com> - 3.0.2-2
+- fix issue with AlowOverride Options
+
+* Mon Oct 22 2007 John Berninger <john at ncphotography dot com> - 3.0.2-1
+- updates to requires and httpd conf for BZ's 279961, 295861, 339531
+
 * Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
 - update to 3.0.2 - bz 299981
 
diff --git a/sources b/sources
index d4f2fda..e0ea8df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53afb2c5d4c105ed2f4b2ba4ccfcedc7  bugzilla-3.0.2.tar.gz
+f55a3f3cde9cf1bf56492d18c8f7afe4  bugzilla-3.0.4.tar.gz