diff --git a/ChangeLog b/ChangeLog
index edca2240..02acc055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
 NEW IN WAF 1.8.7
 ----------------
-* Fixed the libdir suffix on Redhat 64-bit systems
+* Fixed the default libdir installation suffix on Redhat 64-bit systems #1536
+* Fixed the Python 2.6 detection on Redhat systems #1538
 * Enabled gccdeps to work with clang
 * Fixed the detection of clang from the gcc tools
 * Added orig_run_str to help subclasses (do not use Task.hcode)
 * Fixed the detection of older clang compilers versions
+* NEC compiler support
+* Enabled batched_cc.py to work with msvc too
+* Enabled unity.py to process c files
+* Faster dependency calculation in c_dumbpreproc
+* New stracedeps example (cfg blog entry)
+* Added support for xz compression in waf and waf dist (Python 3.5)
 
 NEW IN WAF 1.8.6
 ----------------
diff --git a/TODO b/TODO
index d988304e..80bcffae 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,7 @@ Waf 1.9
 * Provide a more efficient ConfigSet implementation
 * Remove the split functions from Utils
 * Ensure _cache.py are valid python files
+* Include the tool 'nobuild' by default
 
 Waf 1.8.x
 ---------
diff --git a/waf-light b/waf-light
index 9c813d2b..39ac5fad 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="1.8.6"
+VERSION="1.8.7"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index 90aab78e..762dfda3 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=0x1080600
+HEXVERSION=0x1080700
 """Constant updated on new releases"""
 
-WAFVERSION="1.8.6"
+WAFVERSION="1.8.7"
 """Constant updated on new releases"""
 
-WAFREVISION="cc875ba2c2a7bd78d7a84b038f542339d6f34ce3"
+WAFREVISION="e5056b9ade7bb224f53baab13a0ce136344ab602"
 """Git revision when the waf version is updated"""
 
 ABI = 98
diff --git a/wscript b/wscript
index bb18e641..77545082 100644
--- a/wscript
+++ b/wscript
@@ -10,7 +10,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 """
 
 
-VERSION="1.8.6"
+VERSION="1.8.7"
 APPNAME='waf'
 REVISION=''