diff --git a/fix-sle11-test-failure.patch b/fix-sle11-test-failure.patch
deleted file mode 100644
index cd84bba..0000000
--- a/fix-sle11-test-failure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This fixes a test failure on SLE11SP3:
-Error is:
-AssertionError: error: must supply either home or prefix/exec-prefix -- not both
-
---- a/setuptools/tests/test_egg_info.py
-+++ b/setuptools/tests/test_egg_info.py
-@@ -217,7 +217,7 @@ class TestEggInfo(object):
-         if cmd is None:
-             cmd = [
-                 'install',
--                '--home', env.paths['home'],
-+                '--prefix', env.paths['home'],
-                 '--install-lib', env.paths['lib'],
-                 '--install-scripts', env.paths['scripts'],
-                 '--install-data', env.paths['data'],
diff --git a/python-setuptools.changes b/python-setuptools.changes
index ee7ae31..93073a4 100644
--- a/python-setuptools.changes
+++ b/python-setuptools.changes
@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Tue Sep 19 04:30:46 UTC 2017 - tbechtold@suse.com
+
+- update to 36.5.0:
+  * #170: When working with Mercurial checkouts, use Windows-friendly
+    syntax for suppressing output.
+  * Inspired by #1134, performed substantial refactoring of
+    ``pkg_resources.find_on_path`` to facilitate an optimization
+    for paths with many non-version entries.
+  * #1075: Add new ``Description-Content-Type`` metadata field. `See here for
+    documentation on how to use this field.
+    <https://packaging.python.org/specifications/#description-content-type>`_
+  * #1068: Sort files and directories when building eggs for
+    deterministic order.
+  * #196: Remove caching of easy_install command in fetch_build_egg.
+    Fixes issue where ``pytest-runner-N.N`` would satisfy the installation
+    of ``pytest``.
+  * #1129: Fix working set dependencies handling when replacing conflicting
+    distributions (e.g. when using ``setup_requires`` with a conflicting
+    transitive dependency, fix #1124).
+  * #1133: Improved handling of README files extensions and added
+    Markdown to the list of searched READMES.
+  * #1135: Improve performance of pkg_resources import by not invoking
+    ``access`` or ``stat`` and using ``os.listdir`` instead.
+  * #1131: Make possible using several files within ``file:`` directive
+    in metadata.long_description in ``setup.cfg``.
+  * fix #1105: Fix handling of requirements with environment
+    markers when declared in ``setup.cfg`` (same treatment as
+    for #1081).
+  * #462: Don't assume a directory is an egg by the ``.egg``
+    extension alone.
+  * #1093: Fix test command handler with extras_require.
+  * #1112, #1091, #1115: Now using Trusty containers in
+    Travis for CI and CD.
+  * #1092: ``pkg_resources`` now uses ``inspect.getmro`` to
+    resolve classes in method resolution order.
+  * #1102: Restore behavior for empty extras.
+
 -------------------------------------------------------------------
 Mon Jul 24 20:08:32 UTC 2017 - michael@stroeder.com
 
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 997ed25..3161d62 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -19,7 +19,7 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oldpython python
 Name:           python-setuptools
-Version:        36.2.2
+Version:        36.5.0
 Release:        0
 Summary:        Easily download, build, install, upgrade, and uninstall Python packages
 License:        Python-2.0 or ZPL-2.0
diff --git a/setuptools-36.2.2.zip b/setuptools-36.2.2.zip
deleted file mode 100644
index 69742bd..0000000
--- a/setuptools-36.2.2.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38156edc9b9b21f8926821d3f994abf931a50c1a2a6a2bab4d195b7d866d9bb0
-size 714105
diff --git a/setuptools-36.5.0.zip b/setuptools-36.5.0.zip
new file mode 100644
index 0000000..3238067
--- /dev/null
+++ b/setuptools-36.5.0.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64
+size 721505