diff --git a/CHANGES.rst b/CHANGES.rst
index 47ef27f..c71eb29 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,14 @@
 CHANGES
 =======
 
+2.5.5 - 2016-06-14
+------------------
+
+- **Bug** Fix setuptools integration when parsing config files
+
+- **Bug** Don't pass the user's config path as the config_file when creating a
+  StyleGuide
+
 2.5.4 - 2016-02-11
 ------------------
 
diff --git a/flake8/__init__.py b/flake8/__init__.py
index 36dc058..2e0d187 100644
--- a/flake8/__init__.py
+++ b/flake8/__init__.py
@@ -1 +1 @@
-__version__ = '2.5.4'
+__version__ = '2.5.5'