diff --git a/debian/changelog b/debian/changelog
index 390ae96..60cda08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+urlgrabber (3.9.1-4.2ubuntu1~ppa1) xenial; urgency=medium
+
+  * Merge from Debian, remaining changes:
+    + Apply 674d545e from upstream development version to fix incorrect
+      documentation for progress_object callback.
+  * Dropped:
+    + d/p/ssl_verify_fix.diff: Apply patch to fix urlgrabber for newer libcurl, replaced by upstream
+      patch (https-verifyhost-fix.diff).
+
+ -- Pierre-André MOREY <pierre-andre.morey@canonical.com>  Wed, 17 Feb 2016 16:58:42 +0100
+
 urlgrabber (3.9.1-4.2) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -14,6 +25,32 @@ urlgrabber (3.9.1-4.1) unstable; urgency=medium
 
  -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Tue, 30 Dec 2014 13:13:08 +0100
 
+urlgrabber (3.9.1-4ubuntu5) vivid; urgency=medium
+
+  * Apply patch to fix urlgrabber for newer libcurl (LP: #1200288)
+
+ -- Clint Byrum <spamaps@debian.org>  Tue, 31 Mar 2015 14:34:19 -0700
+
+urlgrabber (3.9.1-4ubuntu3) trusty; urgency=medium
+
+  * Rebuild to drop files installed into /usr/share/pyshared.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 23 Feb 2014 13:54:39 +0000
+
+urlgrabber (3.9.1-4ubuntu2) precise; urgency=low
+
+  * Rebuild to drop python2.6 dependencies.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 31 Dec 2011 02:15:09 +0000
+
+urlgrabber (3.9.1-4ubuntu1) oneiric; urgency=low
+
+  * Apply 674d545e from upstream development version to fix incorrect
+    documentation for progress_object callback. (LP #776555)
+  * Convert to dh_python2.
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Tue, 09 Aug 2011 17:45:08 -0400
+
 urlgrabber (3.9.1-4) unstable; urgency=low
 
   * Add two patches created from upstream development version. Closes: #587575. 
diff --git a/debian/control b/debian/control
index 1c508e9..fd083e7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: urlgrabber
 Section: python
 Priority: optional
-Maintainer: Kevin Coyner <kcoyner@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Kevin Coyner <kcoyner@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.4~), python-all, dh-python, python-pycurl, quilt (>= 0.46-7~)
 Standards-Version: 3.8.4
diff --git a/debian/patches/progress_object_callback_fix.diff b/debian/patches/progress_object_callback_fix.diff
new file mode 100644
index 0000000..8680641
--- /dev/null
+++ b/debian/patches/progress_object_callback_fix.diff
@@ -0,0 +1,21 @@
+From: James Antill <james@and.org>
+Date: Thu, 19 May 2011 20:17:14 +0000 (-0400)
+Subject: Fix documentation for progress_object callback.
+X-Git-Url: http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff_plain;h=674d545ee303aa99701ffb982536851572d8db77
+
+Fix documentation for progress_object callback.
+---
+
+diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
+index 36212cf..f6f57bd 100644
+--- a/urlgrabber/grabber.py
++++ b/urlgrabber/grabber.py
+@@ -49,7 +49,7 @@ GENERAL ARGUMENTS (kwargs)
+   progress_obj = None
+ 
+     a class instance that supports the following methods:
+-      po.start(filename, url, basename, length, text)
++      po.start(filename, url, basename, size, now, text)
+       # length will be None if unknown
+       po.update(read) # read == bytes read so far
+       po.end()
diff --git a/debian/patches/series b/debian/patches/series
index d8581d4..a4a59c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 grabber_fix.diff
 progress_fix.diff
 https-verifyhost-fix.diff
+progress_object_callback_fix.diff