diff --git a/python-cherrypy-2.3.0-EINTR.patch b/python-cherrypy-2.3.0-EINTR.patch
deleted file mode 100644
index 774bd4c..0000000
--- a/python-cherrypy-2.3.0-EINTR.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak CherryPy-2.3.0/cherrypy/_cpwsgiserver.py
---- CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak	2008-01-17 15:57:48.000000000 -0800
-+++ CherryPy-2.3.0/cherrypy/_cpwsgiserver.py	2008-01-17 15:59:32.000000000 -0800
-@@ -404,6 +404,13 @@ class CherryPyWSGIServer(object):
-             # accept() by default
-             return
-         except socket.error, x:
-+            if hasattr(errno, "EINTR") and x.args[0] == errno.EINTR:
-+                # I *think* this is right. EINTR should occur when a signal
-+                # is received during the accept() call; all docs say retry
-+                # the call, and I *think* I'm reading it right that Python
-+                # will then go ahead and poll for and handle the signal
-+                # elsewhere. See http://www.cherrypy.org/ticket/707.
-+                return
-             msg = x.args[1]
-             if msg == "Bad file descriptor":
-                 # Our socket was closed
diff --git a/python-cherrypy-regression-test.patch b/python-cherrypy-regression-test.patch
index 781e28b..bbc758f 100644
--- a/python-cherrypy-regression-test.patch
+++ b/python-cherrypy-regression-test.patch
@@ -1,8 +1,8 @@
-Index: CherryPy-2.3.0/cherrypy/test/test.py
+Index: CherryPy-3.0.3/cherrypy/test/test.py
 ===================================================================
---- CherryPy-2.3.0.orig/cherrypy/test/test.py
-+++ CherryPy-2.3.0/cherrypy/test/test.py
-@@ -328,7 +328,6 @@ def run():
+--- CherryPy-3.0.3.orig/cherrypy/test/test.py
++++ CherryPy-3.0.3/cherrypy/test/test.py
+@@ -397,7 +397,6 @@ def run():
      success = clp.run()
      if clp.interactive:
          print
diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch
index 3f0b1c4..0406312 100644
--- a/python-cherrypy-tutorial-doc.patch
+++ b/python-cherrypy-tutorial-doc.patch
@@ -1,14 +1,15 @@
-diff -up CherryPy-2.3.0/setup.py.bak CherryPy-2.3.0/setup.py
---- CherryPy-2.3.0/setup.py.bak	2008-01-17 14:37:31.000000000 -0800
-+++ CherryPy-2.3.0/setup.py	2008-01-17 14:38:06.000000000 -0800
-@@ -36,23 +36,11 @@ url="http://www.cherrypy.org"
+Index: CherryPy-3.0.3/setup.py
+===================================================================
+--- CherryPy-3.0.3.orig/setup.py
++++ CherryPy-3.0.3/setup.py
+@@ -38,23 +38,11 @@ url="http://www.cherrypy.org"
  cp_license="BSD"
  packages=[
-     "cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
--    "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters",
-+    "cherrypy.filters",
+     "cherrypy", "cherrypy.lib",
+-    "cherrypy.tutorial", "cherrypy.test",
+     "cherrypy.wsgiserver",
  ]
- download_url="http://download.cherrypy.org/cherrypy/2.3.0/"
+ download_url="http://download.cherrypy.org/cherrypy/3.0.3/"
  data_files=[
 -    ('cherrypy/tutorial',
 -        [
@@ -21,7 +22,6 @@ diff -up CherryPy-2.3.0/setup.py.bak CherryPy-2.3.0/setup.py
      ('cherrypy', ['cherrypy/favicon.ico',]),
 -    ('cherrypy/test', ['cherrypy/test/style.css',]),
 -    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
--                              'cherrypy/test/static/has space.html',
 -                              'cherrypy/test/static/dirback.jpg',]),
  ]
  ###############################################################################
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index 7afda9f..51791f8 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -1,21 +1,26 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-cherrypy
-Version:        2.3.0
-Release:        2%{?dist}
+Version:        3.0.3
+Release:        1%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cherrypy.org/
 Source0:        http://download.cherrypy.org/cherrypy/%{version}/CherryPy-%{version}.tar.gz
+Patch0:         python-cherrypy-tutorial-doc.patch
+Patch1:         python-cherrypy-regression-test.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:         %{name}-tutorial-doc.patch
-Patch1:         %{name}-regression-test.patch
-Patch2:         %{name}-2.3.0-EINTR.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 CherryPy allows developers to build web applications in much the same way 
@@ -26,16 +31,15 @@ results in smaller source code developed in less time.
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
-%{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
+%{__sed} -i 's/\r//' README.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 %check
 cd cherrypy/test
@@ -46,11 +50,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt CHERRYPYTEAM.txt README.txt
+%doc README.txt
 %doc cherrypy/tutorial
 %{python_sitelib}/*
 
 %changelog
+* Mon Jan 21 2008 Toshio Kuratomi <toshio@fedoraproject.org> 3.0.3-1
+- Upgrade to 3.0.3.
+
 * Thu Jan 17 2008 Toshio Kuratomi <toshio@fedoraproject.org> 2.3.0-2
 - EINTR Patch needed to be forwarded ported as well as it is only applied to
   CP trunk (3.x).