diff --git a/CHANGES.rst b/CHANGES.rst
index f982cbca..ef44376b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,18 @@
 Changelog
 =========
 
+2.5.18 (unreleased)
+-------------------
+
+New:
+
+- *add item here*
+
+Fixes:
+
+- *add item here*
+
+
 2.5.17 (2015-11-26)
 -------------------
 
diff --git a/setup.py b/setup.py
index 0c478bbe..5851d564 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '2.5.17'
+version = '2.5.18.dev0'
 
 long_description = \
     open("README.rst").read() + "\n" + open("CHANGES.rst").read()