diff --git a/python-urlgrabber-2.9.9.patch b/python-urlgrabber-2.9.9.patch
deleted file mode 100644
index 03cd43a..0000000
--- a/python-urlgrabber-2.9.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -15,8 +15,6 @@
- packages = ['urlgrabber']
- package_dir = {'urlgrabber':'urlgrabber'}
- scripts = ['scripts/urlgrabber']
--data_files = [('share/doc/' + name + '-' + version,
--               ['README','LICENSE', 'TODO', 'ChangeLog'])]
- options = { 'clean' : { 'all' : 1 } }
- classifiers = [
-         'Development Status :: 4 - Beta',
diff --git a/python-urlgrabber-3.1.0.patch b/python-urlgrabber-3.1.0.patch
deleted file mode 100644
index 39872b3..0000000
--- a/python-urlgrabber-3.1.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- urlgrabber/grabber.py
-+++ urlgrabber/grabber.py
-@@ -686,6 +686,9 @@
-                 user_pass, host = host.split('@', 1)
-                 if ':' in user_pass:
-                     user, password = user_pass.split(':', 1)
-+                else:
-+                    user = user_pass
-+                    password = ''
-             except ValueError, e:
-                 raise URLGrabError(1, _('Bad URL: %s') % url)
-             if DEBUG: DEBUG.info('adding HTTP auth: %s, %s', user, password)
diff --git a/python-urlgrabber.changes b/python-urlgrabber.changes
index e19046f..3c52c4e 100644
--- a/python-urlgrabber.changes
+++ b/python-urlgrabber.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Sep 20 11:40:05 UTC 2011 - saschpe@suse.de
+
+- Update to version 3.9.1:
+  * cleanup all the old urlgrabber urllib code that's not being used
+  * delete sslfactory and keepalive fix up the unittests to match existing code
+  * make sure the value we get back from the parse150 and other calls is
+    converted to an int before we make it 'size' rhbug: #524705
+- Spec file updates:
+  * Removed authors from description
+  * Dropped useless python-urlgrabber-2.9.9.patch
+  * Dropped obsolete python-urlgrabber-3.1.0.patch (upstream changed)
+  * Require python-pycurl 
+
 -------------------------------------------------------------------
 Wed Aug 12 20:10:37 CEST 2009 - matejcik@suse.cz
 
diff --git a/python-urlgrabber.spec b/python-urlgrabber.spec
index 7b34c06..c284526 100644
--- a/python-urlgrabber.spec
+++ b/python-urlgrabber.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package python-urlgrabber (Version 3.1.0)
+# spec file for package python-urlgrabber
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,57 +15,47 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           python-urlgrabber
-# python must be in the BuildRequires as well, otherwise urllib2 with SSL support isn't installed
-# error message: AttributeError: 'module' object has no attribute 'HTTPSHandler'
-BuildRequires:  python python-devel
-Version:        3.1.0
-Release:        180
-Summary:        A high-level cross-protocol url-grabber
-Group:          Development/Libraries/Python
-License:        LGPL
+Version:        3.9.1
+Release:        0
 Url:            http://linux.duke.edu/projects/urlgrabber/
-Source:         urlgrabber-%{version}.tar.bz2
-Patch:          %{name}-2.9.9.patch
-Patch1:         %{name}-3.1.0.patch
+Summary:        A high-level cross-protocol url-grabber
+License:        LGPL
+Group:          Development/Languages/Python
+Source:         http://pypi.python.org/packages/source/u/urlgrabber/urlgrabber-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  python-devel
+BuildRequires:  python-pycurl
+Requires:       python-pycurl
+%if 0%{?suse_version}
 %py_requires
-%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
+%if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
+%endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 A high-level cross-protocol url-grabber for python supporting HTTP, FTP
 and file locations.  Features include keepalive, byte ranges,
 throttling, authentication, proxies and more.
 
-
-
-Authors:
---------
-    Michael D. Stenner <mstenner@linux.duke.edu>
-    Ryan Tomayko <rtomayko@naeblis.cx>
-
 %prep
 %setup -q -n urlgrabber-%{version}
-%patch
-%patch1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
 python setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --root $RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+rm -rf %{buildroot}/usr/share/doc/urlgrabber-%{version} # Remove wrongly installed docs
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f INSTALLED_FILES
+%files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE README TODO
+%{_bindir}/urlgrabber
+%{python_sitelib}/*
 
 %changelog
diff --git a/urlgrabber-3.1.0.tar.bz2 b/urlgrabber-3.1.0.tar.bz2
deleted file mode 100644
index 72cf88d..0000000
--- a/urlgrabber-3.1.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6b754e6b769e894ad7764d354d4654c2a4e29068ec0da5b034cea5096264146
-size 66251
diff --git a/urlgrabber-3.9.1.tar.gz b/urlgrabber-3.9.1.tar.gz
new file mode 100644
index 0000000..b74a40e
--- /dev/null
+++ b/urlgrabber-3.9.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4e276fa968c66671309a6d754c4b3b0cb2003dec8bca87a681378a22e0d3da7
+size 72071