diff --git a/ChangeLog b/ChangeLog
index 9f0b6d64..3a132751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+NEW IN WAF 2.0.17
+-----------------
+* Improve build performance on FreeBSD and Python3 #2241
+* Add Python 3.8 flag detection for building embedded interpreters #2239
+* Prevent Qt5 uninstallation errors when c++ files are generated
+* Improve installation/uninstallation colors
+
 NEW IN WAF 2.0.16
 -----------------
 * Fix task semaphore errors on stateful tasks #2232
diff --git a/waf-light b/waf-light
index 9eb1e179..8c50d0b1 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.16"
+VERSION="2.0.17"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index 4d9cce34..d0759aad 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=0x2001000
+HEXVERSION=0x2001100
 """Constant updated on new releases"""
 
-WAFVERSION="2.0.16"
+WAFVERSION="2.0.17"
 """Constant updated on new releases"""
 
-WAFREVISION="8cbc8da5ce54dafc16197e468e3578779dcf981d"
+WAFREVISION="6bc6cb599c702e985780e9f705b291b812123693"
 """Git revision when the waf version is updated"""
 
 ABI = 20
diff --git a/wscript b/wscript
index 06a091db..76067794 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.16"
+VERSION="2.0.17"
 APPNAME='waf'
 REVISION=''