diff --git a/CHANGES.txt b/CHANGES.txt
index 71ca0729f82a38d2e8ac7a96885065bdcf0a3158..71ec87fbc9b253a2d9cde17d47861ba2d982af47 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ Changes
 
  * Update PHP configuration to set session and date options.
    [Alain Takoudjou Kamdem]
+ * Improve logrotate policy and haproxy config for erp5
+   [Sebastien Robin]
 
 0.20 (2011-09-07)
 -----------------
diff --git a/setup.py b/setup.py
index a804860ca980c2ce346e8a5044145ff8cea589be..f45d188077cf8afd11d68721a1ab5ec576971338 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.21-dev'
+version = '0.21'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"