diff --git a/ChangeLog b/ChangeLog
index beb67c80..9f0b6d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+NEW IN WAF 2.0.16
+-----------------
+* Fix task semaphore errors on stateful tasks #2232
+* Fix encoding errors with UTF-8 paths on Python 2 #2230
+* Fix encoding errors in waf_unit_test #2220
+* Improve dependency between javac task and use-d generated jars nodes
+* Install pdb files with /debug:* flags #2224
+* Make javadoc detection optional #2225
+* Improve md5_tstamp documentation #2221
+* Add extras/color_msvc to colorizes MSVC outputs #2221
+* Fix symbol regex on mac-o binaries in extras/syms #2222
+* Maintain order of lines in doxyfile in extras/doxygen #2223
+* Improve extras/msvcdeps path handling
+* Add extras/clang_cross for cross-compilation using clang
+
 NEW IN WAF 2.0.15
 -----------------
 * Fix Python path detection under Git-Bash #2217
diff --git a/waf-light b/waf-light
index 08e42d4d..9eb1e179 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.15"
+VERSION="2.0.16"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index 876ea46b..4d9cce34 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=0x2000f00
+HEXVERSION=0x2001000
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.15"
+WAFVERSION="2.0.16"
 """Constant updated on new releases"""
 
-WAFREVISION="503db290b73ef738a495e0d116d6f8ee0b98dcc2"
+WAFREVISION="8cbc8da5ce54dafc16197e468e3578779dcf981d"
 """Git revision when the waf version is updated"""
 
 ABI = 20
diff --git a/wscript b/wscript
index 2d83ab08..06a091db 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.15"
+VERSION="2.0.16"
 APPNAME='waf'
 REVISION=''