diff --git a/NEWS b/NEWS
index 34b46426eca82c351e0a478c71edb66b9bb4b228..4eed37b976c89748f1a34c2e111194b73a0b98ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Version 2.0.6
+  - Fix cleaner behaviour on nodes not in a cluster (Debian bug 568105)
+  - Fix a string formatting bug
+  - Improve safety of the code in some error paths
+  - Improve data validation in the master of values returned from nodes
+
 Version 2.0.5
   - Fix security issue due to missing validation of iallocator names;
     this allows local and remote execution of arbitrary executables
diff --git a/configure.ac b/configure.ac
index 64ed6c11b04a88d9f03e10ef4fbfee644f9b05d4..5290d45af62f75369cba4b740212f3f68acaaff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [0])
-m4_define([gnt_version_revision], [5])
+m4_define([gnt_version_revision], [6])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],