diff --git a/CHANGES.rst b/CHANGES.rst
index 4bbed023..2ae3f1cc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,106 @@
 Changelog
 =========
 
+0.17.0 (2018-08-20)
+-------------------
+
+- Make benchmarks script Py3 compatible. [Stefan Behnel]
+
+- Add Go lang port. [iddober]
+
+- Add reference to C# port. [ericcoleman]
+
+- Chore: remove license header from files. [Jose Diaz-Gonzalez]
+
+  The files should all inherit the projects license.
+
+
+- Fix README title style. [Thomas Grainger]
+
+- Add readme check. [Thomas Grainger]
+
+  install docutils and Pygments
+
+
+- Cache pip. [Thomas Grainger]
+
+- Upgrade pip/setuptools for hypothesis. [Thomas Grainger]
+
+- Feat: drop py26 and py33 support from tox. [Jose Diaz-Gonzalez]
+
+- Feat: drop support for 2.6 in test_fuzzywuzzy.py. [Jose Diaz-Gonzalez]
+
+- Feat: drop reference to 2.4 from readme. [Jose Diaz-Gonzalez]
+
+- Feat: drop py2.6 and py3.3 classifiers. [Jose Diaz-Gonzalez]
+
+- Feat: drop 2.6 and 3.3 support. [Jose Diaz-Gonzalez]
+
+  These are no longer supported. Please upgrade your python version if you are using either version.
+
+- Fuzz: _token_sort: check for equivalence. [Ralf Ramsauer]
+
+  If we don't have to full_process the strings, we can safely assume to
+  return 100 in case both candidates equal.
+
+  Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+
+
+- Test: add more test cases. [Ralf Ramsauer]
+
+  Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+
+
+- Utils: add and use check_for_equivalence decorator. [Ralf Ramsauer]
+
+  And decorate basic scoring functions.
+
+  The check_for_equivalence decorator MUST be used after the
+  check_for_none decorator, as otherwise ratio(None, None) will get a
+  score of 100.
+
+  This fixes the first part of the recently introduced changes in the test
+  set.
+
+  Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+
+
+- Tests: add some corner cases. [Ralf Ramsauer]
+
+  '' and '' are equal, so are '{' and '{'. Test if fuzzywuzzy gives them a
+  score of 100.
+
+  For the moment, this patch breaks tests, fixes in fuzzywuzzy follow.
+
+  Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+
+
+- Utils: remove superfluous check. [Ralf Ramsauer]
+
+  Decorators make sure that only non None-values are passed. We can safely
+  assume that None will never get here.
+
+  Other than that, None's shouldn't simply be ignored and erroneously
+  changed to empty strings. Better let users fail.
+
+  This commit doesn't break any tests.
+
+  Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+
+
+- README: add missing requirements. [Ralf Ramsauer]
+
+  pycodestyle and hypothesis are required for automatic testing. Add them
+  to README's requirement section.
+
+  Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+
+
+- Remove empty document. [Ralf Ramsauer]
+
+  Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+
+
 0.16.0 (2017-12-18)
 -------------------
 
diff --git a/README.rst b/README.rst
index a8a455b8..939c5e68 100644
--- a/README.rst
+++ b/README.rst
@@ -40,13 +40,13 @@ Using PIP via Github
 
 .. code:: bash
 
-    pip install git+git://github.com/seatgeek/fuzzywuzzy.git@0.16.0#egg=fuzzywuzzy
+    pip install git+git://github.com/seatgeek/fuzzywuzzy.git@0.17.0#egg=fuzzywuzzy
 
 Adding to your ``requirements.txt`` file (run ``pip install -r requirements.txt`` afterwards)
 
 .. code:: bash
 
-    git+ssh://git@github.com/seatgeek/fuzzywuzzy.git@0.16.0#egg=fuzzywuzzy
+    git+ssh://git@github.com/seatgeek/fuzzywuzzy.git@0.17.0#egg=fuzzywuzzy
     
 Manually via GIT
 
diff --git a/fuzzywuzzy/__init__.py b/fuzzywuzzy/__init__.py
index 8e23ba94..6c369a36 100644
--- a/fuzzywuzzy/__init__.py
+++ b/fuzzywuzzy/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.16.0'
+__version__ = '0.17.0'