diff --git a/bugzilla-config-path.patch b/bugzilla-config-path.patch
deleted file mode 100644
index 1ee006e..0000000
--- a/bugzilla-config-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN bugzilla-neworig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm
---- bugzilla-neworig/Bugzilla/Config.pm	2006-06-19 16:29:00.000000000 -0400
-+++ bugzilla-2.22/Bugzilla/Config.pm	2006-06-25 10:20:02.000000000 -0400
-@@ -61,10 +61,10 @@
- our $datadir;
- if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
-     $project = $1;
--    $localconfig = "$libpath/localconfig.$project";
-+    $localconfig = "/etc/bugzilla/localconfig.$project";
-     $datadir = "/var/lib/bugzilla/data/$project";
- } else {
--    $localconfig = "$libpath/localconfig";
-+    $localconfig = "/etc/bugzilla/localconfig";
-     $datadir = "/var/lib/bugzilla/data";
- }
- our $attachdir = "$datadir/attachments";
diff --git a/bugzilla-data-dir.patch b/bugzilla-data-dir.patch
deleted file mode 100644
index b8e2943..0000000
--- a/bugzilla-data-dir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN bugzilla-orig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm
---- bugzilla-orig/Bugzilla/Config.pm	2006-04-22 22:45:09.000000000 -0400
-+++ bugzilla-2.22/Bugzilla/Config.pm	2006-06-19 16:29:00.000000000 -0400
-@@ -62,10 +62,10 @@
- if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
-     $project = $1;
-     $localconfig = "$libpath/localconfig.$project";
--    $datadir = "$libpath/data/$project";
-+    $datadir = "/var/lib/bugzilla/data/$project";
- } else {
-     $localconfig = "$libpath/localconfig";
--    $datadir = "$libpath/data";
-+    $datadir = "/var/lib/bugzilla/data";
- }
- our $attachdir = "$datadir/attachments";
- our $webdotdir = "$datadir/webdot";
diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch
new file mode 100644
index 0000000..cb80387
--- /dev/null
+++ b/bugzilla-rw-paths.patch
@@ -0,0 +1,28 @@
+diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0/Bugzilla/Constants.pm
+--- bugzilla-orig/Bugzilla/Constants.pm	2007-05-09 18:47:17.000000000 -0400
++++ bugzilla-3.0/Bugzilla/Constants.pm	2007-05-19 15:56:02.000000000 -0400
+@@ -423,18 +423,18 @@
+         'cgi_path'    => $libpath,
+         'templatedir' => "$libpath/template",
+         'project'     => $project,
+-        'localconfig' => "$libpath/$localconfig",
+-        'datadir'     => "$libpath/$datadir",
+-        'attachdir'   => "$libpath/$datadir/attachments",
+-        'skinsdir'    => "$libpath/skins/contrib",
++        'localconfig' => "/etc/bugzilla/$localconfig",
++        'datadir'     => "/var/lib/bugzilla/$datadir",
++        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
++        'skinsdir'    => "$libpath/skins",
+         # $webdotdir must be in the webtree somewhere. Even if you use a 
+         # local dot, we output images to there. Also, if $webdotdir is 
+         # not relative to the bugzilla root directory, you'll need to 
+         # change showdependencygraph.cgi to set image_url to the correct 
+         # location.
+         # The script should really generate these graphs directly...
+-        'webdotdir'   => "$libpath/$datadir/webdot",
+-        'extensionsdir' => "$libpath/extensions",
++        'webdotdir'   => "/var/lib/bugzilla/$datadir/webdot",
++        'extensionsdir' => "/var/lib/bugzilla/extensions",
+     };
+ }
+ 
diff --git a/bugzilla.spec b/bugzilla.spec
index 0a5017d..55b7fb7 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,18 +4,17 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 2.22.2
+Version: 3.0
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
-Patch0: bugzilla-data-dir.patch
-Patch1: bugzilla-config-path.patch
+Patch0: bugzilla-rw-paths.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: smtpdaemon, webserver, graphviz, patchutils
+Requires: smtpdaemon, webserver, graphviz, patchutils, mod_perl, perl-SOAP-Lite
 
 %package doc
 Summary: Bugzilla documentation
@@ -39,7 +38,6 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
@@ -139,6 +137,11 @@ popd > /dev/null
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Fri May 18 2007 John Berninger <jwb at redhat dot com> - 3.0-1
+- update to upstream version 3.0
+- add new dependencies on mod_perl, perl-SOAP-Lite
+- refactor patch(es) to change paths for read-only /usr
+
 * Tue Feb 20 2007 John Berninger <jwb at redhat dot com> - 2.22.2-1
 - update to 2.22.2 - bz 229163