diff --git a/.cvsignore b/.cvsignore
index a93eb0a..e69de29 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +0,0 @@
-Twisted-1.3.0.tar.bz2
diff --git a/README.fedora b/README.fedora
index 0047fad..23c96a9 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,13 +1,2 @@
 This package is an umbrella package to pull in all separate Twisted
 projects.
-
-It depends on:
-
-python-twisted-conch
-python-twisted-names
-python-twisted-runner
-python-twisted-web
-python-twisted-words
-python-twisted-lore
-python-twisted-mail
-python-twisted-news
diff --git a/python-twisted.spec b/python-twisted.spec
index 9a93c07..c504e02 100644
--- a/python-twisted.spec
+++ b/python-twisted.spec
@@ -1,38 +1,32 @@
-%{?!python:%define python python}
-%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}}
-
-%define origname Twisted
+%{!?python:%define python python}
 
 Name:           %{python}-twisted
-Version:        2.5.0
-Release:        1%{?dist}
-Summary:        Twisted is an event-based framework for internet applications
-
+Version:        8.1.0
+Release:        2%{?dist}
+Summary:        Event-based framework for internet applications
 Group:          Development/Libraries
 License:        MIT
-URL:            http://www.twistedmatrix.com
+URL:            http://twistedmatrix.com/
 Source:         README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-
-Requires:       %{python}-twisted-core >= 2.5.0
-Requires:       %{python}-twisted-conch >= 0.8.0
-Requires:       %{python}-twisted-lore >= 0.3.0
-Requires:       %{python}-twisted-mail >= 0.4.0
-Requires:       %{python}-twisted-names >= 0.4.0
-Requires:       %{python}-twisted-news >= 0.3.0
-Requires:       %{python}-twisted-runner >= 0.2.0
-Requires:       %{python}-twisted-web >= 0.7.0
-Requires:       %{python}-twisted-words >= 0.5.0
-
-Obsoletes:      %{origname} < 2.4.0-1
-Provides:       %{origname} = %{version}-%{release}
+Requires:       %{python}-twisted-core   >= %{version}
+Requires:       %{python}-twisted-conch  >= 8.1.0
+Requires:       %{python}-twisted-lore   >= 8.1.0
+Requires:       %{python}-twisted-mail   >= 8.1.0
+Requires:       %{python}-twisted-names  >= 8.1.0
+Requires:       %{python}-twisted-news   >= 8.1.0
+Requires:       %{python}-twisted-runner >= 8.0.0
+Requires:       %{python}-twisted-web    >= 8.1.0
+Requires:       %{python}-twisted-words  >= 8.1.0
+Obsoletes:      Twisted < 2.4.0-1
+Provides:       Twisted = %{version}-%{release}
 Obsoletes:      twisted < 2.4.0-1
 Provides:       twisted = %{version}-%{release}
 
 %description
 Twisted is an event-based framework for internet applications.  It includes a
-web server, a telnet server, a chat server, a news server, a generic client 
+web server, a telnet server, a chat server, a news server, a generic client
 and server for remote object access, and APIs for creating new protocols and
 services. Twisted supports integration of the Tk, GTK+, Qt or wxPython event
 loop with its main event loop. The Win32 event loop is also supported, as is
@@ -41,22 +35,19 @@ basic support for running servers on top of Jython.
 Installing this package brings all Twisted sub-packages into your system.
 
 %prep
-cp %{SOURCE0} .
-
-%build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%setup -c -T
+%{__install} -p -m 0644 %{SOURCE0} README
 
 %files
 %defattr(-,root,root,-)
-%doc README.fedora
-# empty rpm
+%doc README
 
 %changelog
+* Wed Jul 16 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-2
+- Update to 8.1.0.
+- Minor spec file cleanups.
+- Merge back changes from Paul Howarth.
+
 * Wed May 21 2008 Thomas Vander Stichele <thomas at apestaart dot org>
 - 2.5.0-1
 - update to 2.5.0 release (only the umbrella package was missing)
diff --git a/sources b/sources
index 1dfea6f..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-aaed1c9d006f9b72ea82ad978989fcdf  Twisted-1.3.0.tar.bz2