diff --git a/CHANGES.txt b/CHANGES.txt
index eb8636d1e146b4801598171e13a04b798f4ec88a..c63a95c4ba27ded96e33afbc353ff113e5b9eaef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,12 @@
 Changes
 =======
 
-0.17 (unreleased)
+0.18 (Unreleased)
+-----------------
+
+ * No change yet.
+
+0.17 (2011-08-25)
 -----------------
 
  * Add XWiki software release [Cedric de Saint Martin]
diff --git a/setup.py b/setup.py
index c4ff91ae155637df790c02646e2d286fc201aaa8..1dd809ef68287fb70a44a6b95b5bee332343ac44 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.17'
+version = '0.18-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"