diff --git a/python-urlgrabber-3.1.0.patch b/python-urlgrabber-3.1.0.patch
new file mode 100644
index 0000000..39872b3
--- /dev/null
+++ b/python-urlgrabber-3.1.0.patch
@@ -0,0 +1,12 @@
+--- 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 6fb1a40..c30129e 100644
--- a/python-urlgrabber.changes
+++ b/python-urlgrabber.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 19 16:01:09 CET 2008 - cthiel@suse.de
+
+- fix url parsing error in grabber.py (bnc #362937)
+
 -------------------------------------------------------------------
 Mon Oct  2 13:53:16 CEST 2006 - cthiel@suse.de
 
diff --git a/python-urlgrabber.spec b/python-urlgrabber.spec
index d48bf45..200a7be 100644
--- a/python-urlgrabber.spec
+++ b/python-urlgrabber.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-urlgrabber (Version 3.1.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,18 +10,19 @@
 
 # norootforbuild
 
+
 Name:           python-urlgrabber
 BuildRequires:  python-devel
 Version:        3.1.0
-Release:        2
+Release:        121
 Summary:        A high-level cross-protocol url-grabber
 Group:          Development/Libraries/Python
-License:        LGPL
-URL:            http://linux.duke.edu/projects/urlgrabber/
+License:        LGPL v2.1 or later
+Url:            http://linux.duke.edu/projects/urlgrabber/
 Source:         urlgrabber-%{version}.tar.bz2
 Patch:          %{name}-2.9.9.patch
+Patch1:         %{name}-3.1.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %py_requires
 
 %description
@@ -39,6 +40,7 @@ Authors:
 %prep
 %setup -q -n urlgrabber-%{version}
 %patch
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -59,21 +61,23 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/*.egg-info
 %endif
 
-%changelog -n python-urlgrabber
-* Mon Oct 02 2006 - cthiel@suse.de
+%changelog
+* Tue Feb 19 2008 cthiel@suse.de
+- fix url parsing error in grabber.py (bnc #362937)
+* Mon Oct 02 2006 cthiel@suse.de
 - fix build on older distributions
-* Sun Oct 01 2006 - cthiel@suse.de
+* Sun Oct 01 2006 cthiel@suse.de
 - update to version 3.1.0
   * various fixes
-* Thu Sep 21 2006 - cthiel@suse.de
+* Thu Sep 21 2006 cthiel@suse.de
 - fix build with python 2.5
-* Fri Aug 04 2006 - cthiel@suse.de
+* Fri Aug 04 2006 cthiel@suse.de
 - update to version 2.9.10
   * Make keepalive, byteranges, etc. work with https.
   * Fixed a minor error reporting bug due to changes in python 2.4.
   * Catch read errors after the file has been opened.
 - removed obsolete urlgrabber-read-error.patch
-* Thu May 25 2006 - cthiel@suse.de
+* Thu May 25 2006 cthiel@suse.de
 - update to version 2.9.9
   * Added tests to make sure that the "quote" option works as advertised
   * Significant improvement to URL parsing.  Parsing is now broken out into
@@ -84,15 +88,15 @@ rm -rf $RPM_BUILD_ROOT
   _IndexError bug.
 - added urlgrabber-read-error.patch (from Fedora)
 - removed python-urlgrabber-2.9.7-reget.patch (included upstream)
-* Tue Feb 28 2006 - jmatejek@suse.cz
+* Tue Feb 28 2006 jmatejek@suse.cz
 - updated to reflect python changes due to #149809
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Mon Oct 31 2005 - dmueller@suse.de
+* Mon Oct 31 2005 dmueller@suse.de
 - don't build as root
-* Wed Oct 26 2005 - cthiel@suse.de
+* Wed Oct 26 2005 cthiel@suse.de
 - update to version 2.9.7
-* Tue Sep 13 2005 - cthiel@suse.de
+* Tue Sep 13 2005 cthiel@suse.de
 - specfile cleanup
-* Sun Aug 14 2005 - cthiel@suse.de
+* Sun Aug 14 2005 cthiel@suse.de
 - initial package (version 2.9.6)