diff --git a/ChangeLog b/ChangeLog
index 199d8b17..fbe7e06e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+NEW IN WAF 2.0.20
+-----------------
+* Detect -flto and -fno-lto in parse_config #2281
+* Improve custom option processing #2280
+* Enable Clang on cygwin #2279
+* Make distclean target 'no_lock_in_top/run' modifiers compatible with env vars #2271
+* Update irix compiler detection
+* Exclude ConfigSet from altering ConfigurationContext.run_build caches #2273
+* Add gas support in extras/gccdeps.py #2278
+* Improve compatibility with custom commands in extras/clang_compilation_database #2274
+
 NEW IN WAF 2.0.19
 -----------------
 * Enable race-free pdb file generation waflib/extras/msvc_pdb.py #1731
diff --git a/waf-light b/waf-light
index d6cf3288..e280b90a 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.19"
+VERSION="2.0.20"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index ec3cb66b..3f1b4fa4 100644
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -18,13 +18,13 @@ else:
 	import imp
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x2001300
+HEXVERSION=0x2001400
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.19"
+WAFVERSION="2.0.20"
 """Constant updated on new releases"""
 
-WAFREVISION="e83405712e95b47c040763fdfa468c04dfe72e4b"
+WAFREVISION="668769470956da8c5b60817cb8884cd7d0f87cd4"
 """Git revision when the waf version is updated"""
 
 WAFNAME="waf"
diff --git a/wscript b/wscript
index f95e568b..3e127b73 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.19"
+VERSION="2.0.20"
 APPNAME='waf'
 REVISION=''