diff --git a/ChangeLog b/ChangeLog
index 9ef9b428..c37e8d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+NEW IN WAF 2.0.23
+-----------------
+* Fix the Qt3D* libraries detection #2368
+* Fix swig processing when \r is preset in the module name #2350
+* Add RISC-V generic detection #2322
+* Detect gcc first on GNU/kFreeBSD #2336
+* Improve waflib/extras/msvcdeps performance #2323
+
 NEW IN WAF 2.0.22
 -----------------
 * Fix stdin propagation with faulty vcvarsall scripts #2315
diff --git a/waf-light b/waf-light
index 97beb520..cc631033 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.22"
+VERSION="2.0.23"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index 07ee1201..36d1ca74 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=0x2001600
+HEXVERSION=0x2001700
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.22"
+WAFVERSION="2.0.23"
 """Constant updated on new releases"""
 
-WAFREVISION="816d5bc48ba2abc4ac22f2b44d94d322bf992b9c"
+WAFREVISION="cc6b34cf555d354c34f554c41206134072588de7"
 """Git revision when the waf version is updated"""
 
 WAFNAME="waf"
diff --git a/wscript b/wscript
index 0cbd14d8..ce214cad 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.22"
+VERSION="2.0.23"
 APPNAME='waf'
 REVISION=''