diff -Nru shortuuid-0.4.2/debian/changelog shortuuid-0.4.2/debian/changelog
--- shortuuid-0.4.2/debian/changelog	2015-07-01 04:59:54.000000000 +0000
+++ shortuuid-0.4.2/debian/changelog	2015-10-24 23:50:56.000000000 +0000
@@ -1,3 +1,19 @@
+shortuuid (0.4.2-4ubuntu1) xenial; urgency=medium
+
+  * Build-depend on python-pep8.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 25 Oct 2015 01:50:47 +0200
+
+shortuuid (0.4.2-4) unstable; urgency=medium
+
+  * Fixes incompatible with pep8 1.6.2-0.1. (Closes: #799310)
+    Thanks report and patch Chris Lamb <lamby@debian.org>.
+    Adds debian/patches/Fixed-incompatible-with-pep8-1.6.2-0.1.patch.
+  * debian/control
+    Adds dh-python to Build-Depends.
+
+ -- Kouhei Maeda <mkouhei@palmtb.net>  Thu, 08 Oct 2015 08:13:44 +0900
+
 shortuuid (0.4.2-3) unstable; urgency=medium
 
   * Uploading to unstable. 
diff -Nru shortuuid-0.4.2/debian/control shortuuid-0.4.2/debian/control
--- shortuuid-0.4.2/debian/control	2015-04-18 22:33:55.000000000 +0000
+++ shortuuid-0.4.2/debian/control	2015-10-24 23:50:22.000000000 +0000
@@ -3,8 +3,10 @@
 Priority: optional
 Maintainer: Kouhei Maeda <mkouhei@palmtb.net>
 Build-Depends: debhelper (>= 8.0.0),
+               dh-python,
                python-all (>= 2.6),
                python-setuptools,
+               python-pep8,
                pep8,
                python3-all (>= 3.2),
                python3-setuptools,
diff -Nru shortuuid-0.4.2/debian/patches/Fixed-incompatible-with-pep8-1.6.2-0.1.patch shortuuid-0.4.2/debian/patches/Fixed-incompatible-with-pep8-1.6.2-0.1.patch
--- shortuuid-0.4.2/debian/patches/Fixed-incompatible-with-pep8-1.6.2-0.1.patch	1970-01-01 00:00:00.000000000 +0000
+++ shortuuid-0.4.2/debian/patches/Fixed-incompatible-with-pep8-1.6.2-0.1.patch	2015-10-07 23:13:02.000000000 +0000
@@ -0,0 +1,26 @@
+Description: Incompatible with pep8 1.6.2-0.1
+Author: Chris Lamb <lamby@debian.org>
+Last-Update: 2015-09-17
+Index: shortuuid-0.4.2/shortuuid/tests.py
+===================================================================
+--- shortuuid-0.4.2.orig/shortuuid/tests.py	2014-04-19 02:11:20.000000000 +0900
++++ shortuuid-0.4.2/shortuuid/tests.py	2015-10-08 08:04:57.633369067 +0900
+@@ -6,7 +6,7 @@
+ from uuid import UUID, uuid4
+ 
+ sys.path.insert(0, os.path.abspath(__file__ + "/../.."))
+-from shortuuid.main import *
++from shortuuid.main import *  # noqa
+ 
+ 
+ class LegacyShortUUIDTest(unittest.TestCase):
+@@ -103,8 +103,7 @@
+                                      ['repeat', True],
+                                      ['paths', [os.path.dirname(
+                                          os.path.abspath(__file__))]]],
+-                                    parse_argv=False,
+-                                    config_file=True)
++                                    parse_argv=False)
+         report = pep8style.check_files()
+         assert report.total_errors == 0
+ 
diff -Nru shortuuid-0.4.2/debian/patches/series shortuuid-0.4.2/debian/patches/series
--- shortuuid-0.4.2/debian/patches/series	2014-04-03 08:42:53.000000000 +0000
+++ shortuuid-0.4.2/debian/patches/series	2015-10-07 23:04:22.000000000 +0000
@@ -1 +1,2 @@
 update_egg-info.patch
+Fixed-incompatible-with-pep8-1.6.2-0.1.patch