diff --git a/debian/patches/0001-Don-t-use-duplicated-modules.patch b/debian/patches/0001-Don-t-use-duplicated-modules.patch
index 3d82fbff..a6f0b4fd 100644
--- a/debian/patches/0001-Don-t-use-duplicated-modules.patch
+++ b/debian/patches/0001-Don-t-use-duplicated-modules.patch
@@ -14,11 +14,11 @@ fix path
  botocore/utils.py        |  2 +-
  7 files changed, 20 insertions(+), 20 deletions(-)
 
-diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
-index a667bb5..1329c8a 100644
---- a/botocore/awsrequest.py
-+++ b/botocore/awsrequest.py
-@@ -22,15 +22,15 @@ from botocore.compat import six
+Index: python-botocore/botocore/awsrequest.py
+===================================================================
+--- python-botocore.orig/botocore/awsrequest.py	2016-11-10 11:30:23.478805141 +0900
++++ python-botocore/botocore/awsrequest.py	2016-11-10 11:30:23.466805008 +0900
+@@ -22,15 +22,15 @@
  from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit
  from botocore.exceptions import UnseekableStreamError
  from botocore.utils import percent_encode_sequence
@@ -40,11 +40,11 @@ index a667bb5..1329c8a 100644
      HTTPSConnectionPool
  
  
-diff --git a/botocore/compat.py b/botocore/compat.py
-index dbd5113..b5bcaa0 100644
---- a/botocore/compat.py
-+++ b/botocore/compat.py
-@@ -19,9 +19,9 @@ import warnings
+Index: python-botocore/botocore/compat.py
+===================================================================
+--- python-botocore.orig/botocore/compat.py	2016-11-10 11:30:23.478805141 +0900
++++ python-botocore/botocore/compat.py	2016-11-10 11:30:23.466805008 +0900
+@@ -19,9 +19,9 @@
  import hashlib
  import logging
  
@@ -56,11 +56,11 @@ index dbd5113..b5bcaa0 100644
  
  logger = logging.getLogger(__name__)
  
-diff --git a/botocore/endpoint.py b/botocore/endpoint.py
-index 228d43d..1fa1eef 100644
---- a/botocore/endpoint.py
-+++ b/botocore/endpoint.py
-@@ -17,11 +17,11 @@ import logging
+Index: python-botocore/botocore/endpoint.py
+===================================================================
+--- python-botocore.orig/botocore/endpoint.py	2016-11-10 11:30:23.478805141 +0900
++++ python-botocore/botocore/endpoint.py	2016-11-10 11:30:23.466805008 +0900
+@@ -17,11 +17,11 @@
  import time
  import threading
  
@@ -77,7 +77,7 @@ index 228d43d..1fa1eef 100644
  
  from botocore.awsrequest import create_request_object
  from botocore.exceptions import UnknownEndpointError
-@@ -40,7 +40,7 @@ MAX_POOL_CONNECTIONS = 10
+@@ -40,7 +40,7 @@
  filter_ssl_warnings()
  
  try:
@@ -86,7 +86,7 @@ index 228d43d..1fa1eef 100644
      pyopenssl.extract_from_urllib3()
  except ImportError:
      pass
-@@ -52,7 +52,7 @@ def convert_to_response_dict(http_response, operation_model):
+@@ -52,7 +52,7 @@
      This converts the requests library's HTTP response object to
      a dictionary.
  
@@ -95,10 +95,10 @@ index 228d43d..1fa1eef 100644
      :param http_response: The HTTP response from an AWS service request.
  
      :rtype: dict
-diff --git a/botocore/exceptions.py b/botocore/exceptions.py
-index f0fd172..3ac7d3b 100644
---- a/botocore/exceptions.py
-+++ b/botocore/exceptions.py
+Index: python-botocore/botocore/exceptions.py
+===================================================================
+--- python-botocore.orig/botocore/exceptions.py	2016-11-10 11:30:23.478805141 +0900
++++ python-botocore/botocore/exceptions.py	2016-11-10 11:30:23.466805008 +0900
 @@ -12,7 +12,7 @@
  # ANY KIND, either express or implied. See the License for the specific
  # language governing permissions and limitations under the License.
@@ -108,11 +108,11 @@ index f0fd172..3ac7d3b 100644
  
  
  class BotoCoreError(Exception):
-diff --git a/botocore/retryhandler.py b/botocore/retryhandler.py
-index 09b59e5..58913ec 100644
---- a/botocore/retryhandler.py
-+++ b/botocore/retryhandler.py
-@@ -17,8 +17,8 @@ import functools
+Index: python-botocore/botocore/retryhandler.py
+===================================================================
+--- python-botocore.orig/botocore/retryhandler.py	2016-11-10 11:30:23.478805141 +0900
++++ python-botocore/botocore/retryhandler.py	2016-11-10 11:30:23.466805008 +0900
+@@ -17,8 +17,8 @@
  import logging
  from binascii import crc32
  
@@ -123,11 +123,11 @@ index 09b59e5..58913ec 100644
  
  from botocore.exceptions import ChecksumError, EndpointConnectionError
  
-diff --git a/botocore/stub.py b/botocore/stub.py
-index 9413ba8..ca657b6 100644
---- a/botocore/stub.py
-+++ b/botocore/stub.py
-@@ -17,7 +17,7 @@ from pprint import pformat
+Index: python-botocore/botocore/stub.py
+===================================================================
+--- python-botocore.orig/botocore/stub.py	2016-11-10 11:30:23.478805141 +0900
++++ python-botocore/botocore/stub.py	2016-11-10 11:30:23.466805008 +0900
+@@ -17,7 +17,7 @@
  from botocore.validate import validate_parameters
  from botocore.exceptions import ParamValidationError, \
      StubResponseError, StubAssertionError
@@ -135,12 +135,12 @@ index 9413ba8..ca657b6 100644
 +from requests.models import Response
  
  
- ANY = object()
-diff --git a/botocore/utils.py b/botocore/utils.py
-index 6218b8a..4339acd 100644
---- a/botocore/utils.py
-+++ b/botocore/utils.py
-@@ -28,7 +28,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
+ class _ANY(object):
+Index: python-botocore/botocore/utils.py
+===================================================================
+--- python-botocore.orig/botocore/utils.py	2016-11-10 11:30:23.478805141 +0900
++++ python-botocore/botocore/utils.py	2016-11-10 11:30:23.466805008 +0900
+@@ -28,7 +28,7 @@
  from botocore.exceptions import InvalidDNSNameError, ClientError
  from botocore.exceptions import MetadataRetrievalError
  from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit
diff --git a/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch b/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch
index 90eea064..d26d4963 100644
--- a/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch
+++ b/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch
@@ -16,10 +16,10 @@ Subject: Don't use duplicated modules (in tests)
  tests/unit/test_utils.py                             | 2 +-
  10 files changed, 16 insertions(+), 16 deletions(-)
 
-diff --git a/tests/integration/test_glacier.py b/tests/integration/test_glacier.py
-index 23a7f34..96cedf0 100644
---- a/tests/integration/test_glacier.py
-+++ b/tests/integration/test_glacier.py
+Index: python-botocore/tests/integration/test_glacier.py
+===================================================================
+--- python-botocore.orig/tests/integration/test_glacier.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/integration/test_glacier.py	2016-11-10 11:30:36.066944449 +0900
 @@ -13,7 +13,7 @@
  from tests import unittest
  
@@ -29,11 +29,11 @@ index 23a7f34..96cedf0 100644
  import botocore.session
  
  
-diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py
-index 83e2cc2..89994a4 100644
---- a/tests/integration/test_s3.py
-+++ b/tests/integration/test_s3.py
-@@ -24,13 +24,13 @@ from contextlib import closing
+Index: python-botocore/tests/integration/test_s3.py
+===================================================================
+--- python-botocore.orig/tests/integration/test_s3.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/integration/test_s3.py	2016-11-10 11:30:36.066944449 +0900
+@@ -24,13 +24,13 @@
  
  from nose.plugins.attrib import attr
  
@@ -50,7 +50,7 @@ index 83e2cc2..89994a4 100644
  from botocore.config import Config
  from botocore.exceptions import ClientError
  
-@@ -777,7 +777,7 @@ class TestS3SigV4Client(BaseS3ClientTest):
+@@ -777,7 +777,7 @@
                  raise ConnectionError("Simulated ConnectionError raised.")
              else:
                  return original_send(self, *args, **kwargs)
@@ -59,11 +59,11 @@ index 83e2cc2..89994a4 100644
                          mock_http_adapter_send):
              response = self.client.put_object(Bucket=self.bucket_name,
                                                Key='foo.txt', Body=body)
-diff --git a/tests/integration/test_smoke.py b/tests/integration/test_smoke.py
-index 1a475ed..b8b30e5 100644
---- a/tests/integration/test_smoke.py
-+++ b/tests/integration/test_smoke.py
-@@ -19,8 +19,8 @@ from nose.tools import assert_equals, assert_true
+Index: python-botocore/tests/integration/test_smoke.py
+===================================================================
+--- python-botocore.orig/tests/integration/test_smoke.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/integration/test_smoke.py	2016-11-10 11:30:36.066944449 +0900
+@@ -19,8 +19,8 @@
  from botocore import xform_name
  import botocore.session
  from botocore.client import ClientError
@@ -74,7 +74,7 @@ index 1a475ed..b8b30e5 100644
  
  
  # Mapping of service -> api calls to try.
-@@ -292,7 +292,7 @@ def _make_client_call_with_errors(client, operation_name, kwargs):
+@@ -292,7 +292,7 @@
              raise ConnectionError("Simulated ConnectionError raised.")
          else:
              return original_send(self, *args, **kwargs)
@@ -83,11 +83,11 @@ index 1a475ed..b8b30e5 100644
                      mock_http_adapter_send):
          try:
              response = operation(**kwargs)
-diff --git a/tests/unit/auth/test_signers.py b/tests/unit/auth/test_signers.py
-index f084576..aa140d3 100644
---- a/tests/unit/auth/test_signers.py
-+++ b/tests/unit/auth/test_signers.py
-@@ -25,7 +25,7 @@ import botocore.auth
+Index: python-botocore/tests/unit/auth/test_signers.py
+===================================================================
+--- python-botocore.orig/tests/unit/auth/test_signers.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/unit/auth/test_signers.py	2016-11-10 11:30:36.066944449 +0900
+@@ -25,7 +25,7 @@
  import botocore.credentials
  from botocore.compat import HTTPHeaders, urlsplit, parse_qs, six
  from botocore.awsrequest import AWSRequest
@@ -96,11 +96,11 @@ index f084576..aa140d3 100644
  
  
  class BaseTestWithFixedDate(unittest.TestCase):
-diff --git a/tests/unit/response_parsing/test_response_parsing.py b/tests/unit/response_parsing/test_response_parsing.py
-index 97249d6..afa6474 100644
---- a/tests/unit/response_parsing/test_response_parsing.py
-+++ b/tests/unit/response_parsing/test_response_parsing.py
-@@ -20,7 +20,7 @@ import difflib
+Index: python-botocore/tests/unit/response_parsing/test_response_parsing.py
+===================================================================
+--- python-botocore.orig/tests/unit/response_parsing/test_response_parsing.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/unit/response_parsing/test_response_parsing.py	2016-11-10 11:30:36.066944449 +0900
+@@ -20,7 +20,7 @@
  from tests import unittest, create_session
  
  from mock import Mock
@@ -109,11 +109,11 @@ index 97249d6..afa6474 100644
  
  import botocore.session
  from botocore import xform_name
-diff --git a/tests/unit/test_awsrequest.py b/tests/unit/test_awsrequest.py
-index d37aa24..e43d627 100644
---- a/tests/unit/test_awsrequest.py
-+++ b/tests/unit/test_awsrequest.py
-@@ -418,7 +418,7 @@ class TestAWSHTTPConnection(unittest.TestCase):
+Index: python-botocore/tests/unit/test_awsrequest.py
+===================================================================
+--- python-botocore.orig/tests/unit/test_awsrequest.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/unit/test_awsrequest.py	2016-11-10 11:30:36.066944449 +0900
+@@ -418,7 +418,7 @@
          conn.sock = s
          # Test that the standard library method was used by patching out
          # the ``_tunnel`` method and seeing if the std lib method was called.
@@ -122,11 +122,11 @@ index d37aa24..e43d627 100644
                     'HTTPConnection._tunnel') as mock_tunnel:
              conn._tunnel()
              self.assertTrue(mock_tunnel.called)
-diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py
-index b7f9cbf..038a3b7 100644
---- a/tests/unit/test_endpoint.py
-+++ b/tests/unit/test_endpoint.py
-@@ -15,7 +15,7 @@ from tests import unittest
+Index: python-botocore/tests/unit/test_endpoint.py
+===================================================================
+--- python-botocore.orig/tests/unit/test_endpoint.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/unit/test_endpoint.py	2016-11-10 11:30:36.066944449 +0900
+@@ -15,7 +15,7 @@
  
  from mock import Mock, patch, sentinel
  from nose.tools import assert_equals
@@ -135,11 +135,11 @@ index b7f9cbf..038a3b7 100644
  
  from botocore.compat import six
  from botocore.awsrequest import AWSRequest
-diff --git a/tests/unit/test_response.py b/tests/unit/test_response.py
-index 7b2eb25..35d07c8 100644
---- a/tests/unit/test_response.py
-+++ b/tests/unit/test_response.py
-@@ -20,7 +20,7 @@ import botocore
+Index: python-botocore/tests/unit/test_response.py
+===================================================================
+--- python-botocore.orig/tests/unit/test_response.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/unit/test_response.py	2016-11-10 11:30:36.066944449 +0900
+@@ -20,7 +20,7 @@
  from botocore import response
  from botocore.compat import six
  from botocore.exceptions import IncompleteReadError
@@ -148,10 +148,10 @@ index 7b2eb25..35d07c8 100644
  
  XMLBODY1 = (b'<?xml version="1.0" encoding="UTF-8"?><Error>'
              b'<Code>AccessDenied</Code>'
-diff --git a/tests/unit/test_retryhandler.py b/tests/unit/test_retryhandler.py
-index 3f31a69..a6f05b8 100644
---- a/tests/unit/test_retryhandler.py
-+++ b/tests/unit/test_retryhandler.py
+Index: python-botocore/tests/unit/test_retryhandler.py
+===================================================================
+--- python-botocore.orig/tests/unit/test_retryhandler.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/unit/test_retryhandler.py	2016-11-10 11:30:36.066944449 +0900
 @@ -16,8 +16,8 @@
  from tests import unittest
  
@@ -163,11 +163,11 @@ index 3f31a69..a6f05b8 100644
  
  from botocore import retryhandler
  from botocore.exceptions import ChecksumError
-diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
-index 5d5cd85..2feee5e 100644
---- a/tests/unit/test_utils.py
-+++ b/tests/unit/test_utils.py
-@@ -25,7 +25,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
+Index: python-botocore/tests/unit/test_utils.py
+===================================================================
+--- python-botocore.orig/tests/unit/test_utils.py	2016-11-10 11:30:36.074944538 +0900
++++ python-botocore/tests/unit/test_utils.py	2016-11-10 11:30:36.066944449 +0900
+@@ -25,7 +25,7 @@
  from botocore.exceptions import ClientError
  from botocore.exceptions import InvalidDNSNameError, MetadataRetrievalError
  from botocore.model import ServiceModel