diff --git a/.gitignore b/.gitignore
index 1129ae2..d15aa9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ tests/atomic.qcow2
 /docker-3.4.0.tar.gz
 /docker-3.4.1.tar.gz
 /docker-3.5.0.tar.gz
+/docker-3.7.0.tar.gz
diff --git a/python-docker.spec b/python-docker.spec
index 8774a14..90681bc 100644
--- a/python-docker.spec
+++ b/python-docker.spec
@@ -13,11 +13,11 @@
 %global srcname docker
 
 Name:           python-%{srcname}
-Version:        3.5.0
-Release:        2%{?dist}
+Version:        3.7.0
+Release:        1%{?dist}
 Summary:        A Python library for the Docker Engine API
 License:        ASL 2.0
-URL:            https://pypi.python.org/pypi/%{srcname}
+URL:            https://pypi.org/project/%{srcname}
 Source0:        https://files.pythonhosted.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz
 
 # Upstream uses environment markers to conditionally apply some dependencies.
@@ -51,6 +51,7 @@ Requires:       python%{?fedora:2}-ipaddress >= 1.0.16
 Requires:       python%{?fedora:2}-pyOpenSSL
 Requires:       python%{?fedora:2}-idna
 Requires:       python%{?fedora:2}-cryptography
+Requires:       python%{?fedora:2}-paramiko
 
 Obsoletes:      python-docker-py < 1:2
 
@@ -83,6 +84,7 @@ Requires:       python3-docker-pycreds >= 0.2.1
 Requires:       python3-pyOpenSSL
 Requires:       python3-idna
 Requires:       python3-cryptography
+Requires:       python3-paramiko
 
 %if 0%{?fedora} >= 26
 Obsoletes:      python3-docker-py < 1:2
@@ -104,8 +106,10 @@ git config user.email "noreply@example.com"
 git config user.name "John Foo"
 git add .
 git commit -a -q -m "%{version} baseline."
-# Apply all the patches.
-git am %{patches}
+# rebase-helper strips patch metadata, need to do apply & commit instead
+# https://github.com/rebase-helper/rebase-helper/issues/566
+git apply %{patches}
+git commit -a -q -m "all patches applied"
 %endif
 
 %build
@@ -153,6 +157,9 @@ cp -avr tests/ %{buildroot}%{_libexecdir}/installed-tests/%{name}/
 %endif # tests
 
 %changelog
+* Tue Feb 05 2019 Tomas Tomecek <ttomecek@redhat.com> - 3.7.0-1
+- New upstream release 3.7.0
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/remove-environment-markers.patch b/remove-environment-markers.patch
index fca91a6..7ff3b3d 100644
--- a/remove-environment-markers.patch
+++ b/remove-environment-markers.patch
@@ -1,17 +1,5 @@
-From a3d5850d63fe57037de47aa68b57fdba5a059e0c Mon Sep 17 00:00:00 2001
-From: Tomas Tomecek <ttomecek@redhat.com>
-Date: Fri, 4 Jan 2019 12:45:56 +0100
-Subject: [PATCH] remove environment markers
-
-since they are not present in setuptools in CentOS
-
-Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
----
- setup.py | 36 ++++++++----------------------------
- 1 file changed, 8 insertions(+), 28 deletions(-)
-
 diff --git a/setup.py b/setup.py
-index 1b208e5..67f1582 100644
+index 94fbdf4..466f7a0 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -3,6 +3,7 @@ from __future__ import print_function
@@ -22,8 +10,14 @@ index 1b208e5..67f1582 100644
  
  from setuptools import setup, find_packages
  
-@@ -16,33 +17,13 @@ requirements = [
+@@ -14,38 +15,19 @@ requirements = [
+     'websocket-client >= 0.32.0',
+     'docker-pycreds >= 0.4.0',
      'requests >= 2.14.2, != 2.18.0',
++    'pyOpenSSL>=17.5.0',
++    'cryptography>=1.3.4',
++    'idna>=2.0.0',
++    'paramiko>=2.4.2',
  ]
  
 -extras_require = {
@@ -50,7 +44,10 @@ index 1b208e5..67f1582 100644
 -    # https://github.com/pypa/pip/issues/4391).  Once that's fixed, instead of
 -    # installing the extra dependencies, install the following instead:
 -    # 'requests[security] >= 2.5.2, != 2.11.0, != 2.12.2'
--    'tls': ['pyOpenSSL>=0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
+-    'tls': ['pyOpenSSL>=17.5.0', 'cryptography>=1.3.4', 'idna>=2.0.0'],
+-
+-    # Only required when connecting using the ssh:// protocol
+-    'ssh': ['paramiko>=2.4.2'],
 -
 -}
 +if sys.version_info[:2] < (3, 5):
@@ -63,14 +60,12 @@ index 1b208e5..67f1582 100644
  
  version = None
  exec(open('docker/version.py').read())
-@@ -69,7 +50,6 @@ setup(
+@@ -74,8 +56,6 @@ setup(
      packages=find_packages(exclude=["tests.*", "tests"]),
      install_requires=requirements,
      tests_require=test_requirements,
 -    extras_require=extras_require,
+-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
      zip_safe=False,
      test_suite='tests',
      classifiers=[
--- 
-2.20.1
-
diff --git a/sources b/sources
index 7578719..aca648b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (docker-3.5.0.tar.gz) = ba3c453de597ebdd91eb924a38a305a18f8acc80dd38a635d679f2cc1e8bc341cc65ebe37775d8ddc92de05edebb1736da2e0f36382f907e3714a88d04d09416
+SHA512 (docker-3.7.0.tar.gz) = 5ab071ea92ccf143b9a80bb25dc23fadd8c808c05bdc70356e570c17294826fcc8894ae5786581c3c9171da5b7b365e95eb2c0c27a336f8617497e751ef34dcf