diff --git a/python-setuptools.changes b/python-setuptools.changes
index 4323b75..ee7ae31 100644
--- a/python-setuptools.changes
+++ b/python-setuptools.changes
@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Mon Jul 24 20:08:32 UTC 2017 - michael@stroeder.com
+
+- update to 36.2.2
+
+v36.2.2
+-------
+* #1099: Revert commit a3ec721, restoring intended purpose of
+  extras as part of a requirement declaration.
+
+v36.2.1
+-------
+* fix #1086
+* fix #1087
+* support extras specifiers in install_requires requirements
+
+v36.2.0
+-------
+* #1081: Environment markers indicated in ``install_requires``
+  are now processed and treated as nameless ``extras_require``
+  with markers, allowing their metadata in requires.txt to be
+  correctly generated.
+* #1053: Tagged commits are now released using Travis-CI
+  build stages, meaning releases depend on passing tests on
+  all supported Python versions (Linux) and not just the latest
+  Python version.
+
+v36.1.1
+-------
+* #1083: Correct ``py31compat.makedirs`` to correctly honor
+  ``exist_ok`` parameter.
+* #1083: Also use makedirs compatibility throughout setuptools.
+
+v36.1.0
+-------
+* #1083: Avoid race condition on directory creation in
+  ``pkg_resources.ensure_directory``.
+* Removed deprecation of and restored support for
+  ``upload_docs`` command for sites other than PyPI.
+  Only warehouse is dropping support, but services like
+  `devpi <http://doc.devpi.net/latest/>`_ continue to
+  support docs built by setuptools' plugins. See
+  `this comment <https://bitbucket.org/hpk42/devpi/issues/388/support-rtd-model-for-building-uploading#comment-34292423>`_
+  for more context on the motivation for this change.
+
 -------------------------------------------------------------------
 Thu Jun  8 10:04:16 UTC 2017 - dmueller@suse.com
 
diff --git a/python-setuptools.spec b/python-setuptools.spec
index f5e9930..997ed25 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.0.1
+Version:        36.2.2
 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.0.1.zip b/setuptools-36.0.1.zip
deleted file mode 100644
index 844cf2a..0000000
--- a/setuptools-36.0.1.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a
-size 711296
diff --git a/setuptools-36.2.2.zip b/setuptools-36.2.2.zip
new file mode 100644
index 0000000..69742bd
--- /dev/null
+++ b/setuptools-36.2.2.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38156edc9b9b21f8926821d3f994abf931a50c1a2a6a2bab4d195b7d866d9bb0
+size 714105