diff --git a/ChangeLog b/ChangeLog
index 713bb8fa..eef0590a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+NEW IN WAF 2.0.12
+-----------------
+* Fix broken inheritance task trees #2194
+
 NEW IN WAF 2.0.11
 -----------------
 * Do not raise an exception on check_cfg/mandatory=False/-vv #2193
diff --git a/waf-light b/waf-light
index 204bf2fd..a2efc852 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.11"
+VERSION="2.0.12"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index bb47c921..7c6cd960 100644
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -11,13 +11,13 @@ from waflib import Utils, Errors, Logs
 import waflib.Node
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x2000b00
+HEXVERSION=0x2000c00
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.11"
+WAFVERSION="2.0.12"
 """Constant updated on new releases"""
 
-WAFREVISION="a97f6fb0941091b4966b625f15ec32fa783a8bec"
+WAFREVISION="54841218840ffa34fddf834680a5a17db69caa12"
 """Git revision when the waf version is updated"""
 
 ABI = 20
diff --git a/wscript b/wscript
index ddf0ff8f..8ed667a1 100644
--- a/wscript
+++ b/wscript
@@ -11,7 +11,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 
 from __future__ import with_statement
 
-VERSION="2.0.11"
+VERSION="2.0.12"
 APPNAME='waf'
 REVISION=''