diff --git a/ChangeLog b/ChangeLog
index aa5cf37a..9ef9b428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+NEW IN WAF 2.0.22
+-----------------
+* Fix stdin propagation with faulty vcvarsall scripts #2315
+* Enable mixing Unix-style paths with destdir on Windows platforms #2337
+* Fix shell escaping unit test parameters #2314
+* Improve extras/clang_compilation_database and extras/swig compatibility #2336
+* Propagate C++ flags to the Cuda compiler in extras/cuda #2311
+* Fix detection of Qt 5.0.0 (preparation for Qt6) #2331
+* Enable Haxe processing #2308
+* Fix regression in MACOSX_DEPLOYMENT_TARGET caused by distutils #2330
+* Fix extras/wafcache concurrent trimming issues #2312
+* Fix extras/wafcache symlink handling #2327
+
 NEW IN WAF 2.0.21
 -----------------
 * Set the default --msvc_version from VSCMD_VER if present #2299
diff --git a/waf-light b/waf-light
index cb9168a6..97beb520 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.21"
+VERSION="2.0.22"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index 0ce9df6e..07ee1201 100755
--- 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=0x2001500
+HEXVERSION=0x2001600
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.21"
+WAFVERSION="2.0.22"
 """Constant updated on new releases"""
 
-WAFREVISION="edde20a6425a5c3eb6b47d5f3f5c4fbc93fed5f4"
+WAFREVISION="816d5bc48ba2abc4ac22f2b44d94d322bf992b9c"
 """Git revision when the waf version is updated"""
 
 WAFNAME="waf"
diff --git a/wscript b/wscript
index 3c54df35..0cbd14d8 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.21"
+VERSION="2.0.22"
 APPNAME='waf'
 REVISION=''