diff --git a/README b/README
index 8b4ae6b5..cadb3e30 100644
--- a/README
+++ b/README
@@ -129,7 +129,7 @@ may vanish at any point. To select a specific branch use
     git checkout -b <name> origin/<name>
     
     # Stay on version 1.1
-    git checkout -b 1.1 origin/1.1
+    git checkout -b 1.2 origin/1.2
 
 ### Mirrors
 
@@ -150,6 +150,10 @@ If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
 The master branch on the other hand is the development branch and may not be
 working, break your setup or eat the tree in your garden.
 
+### Upgrading from 1.1 to 1.2
+
+No incompatiblities.
+
 ### Upgrading from 1.0 to 1.1
 
 In 1.1 the type **\_\_file** was split into **\_\_directory**, **\_\_file** and
diff --git a/bin/cdist-config b/bin/cdist-config
index 56c49772..ac94efa7 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -19,7 +19,7 @@
 #
 #
 
-__cdist_version="1.1.0"
+__cdist_version="1.2.0"
 
 # Fail if something bogus is going on
 set -u
diff --git a/doc/changelog b/doc/changelog
index 32d5ac63..9b664c0b 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,4 +1,4 @@
-1.2.0:
+1.2.0: 2011-03-19
 	* Added dependencies (see cdist-type(7))
 	* New type __removeline (Daniel Roth)
 	* New type __group (Steven Armstrong)