diff --git a/ChangeLog b/ChangeLog
index 765df8cb..64c5a05a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,6 @@ NEW IN WAF 1.9 preview 2
 ------------------------
 
 * General enhancements:
-  - Add the tool 'nobuild.py'
-  - Remove qt4 and kde4 from the default modules
   - Have Clang detected first on many platforms, in particular on FreeBSD #1528
   - Remove Node.cache_sig and Node.sig so that dependencies are on file contents #1580
   - Change cflags in the beginning / cppflags at the end #1505
@@ -11,7 +9,6 @@ NEW IN WAF 1.9 preview 2
   - Interpret empty command-line defines as integer values #1704
   - Waf tools are not cached on "waf configure" by default anymore; pass conf.load(.., cache=True)
   - Enable a consistent progress bar output #1641
-  - New --profile command-line option
   - Add ${VAR?X} constructs in script expressions to enable simple conditional outputs
   - Enable 'waf dist' to package arbitrary symlinks in tarballs #1719
   - Enable regexp objects in @extension besides strings for file extensions
@@ -20,33 +17,38 @@ NEW IN WAF 1.9 preview 2
     when all tasks in the previous group are complete; bld.post_mode=POST_LAZY
     is now the default (playground/dynamic_build/ examples)
   - Process Qt5 files in the way suggested by the Qt documentation
+  - Installation methods install_files/install_as/symlink_as create regular task generators
+    and regular tasks so that installation outputs can be re-used easily
+  - Subclass waflib.Build.ConfiguredContext to enable configuration-dependent user commands
 
 * Performance highlights:
   - Reduce the key size in bld.task_sigs by adding bld.node_sigs and bld.imp_sigs
   - Remove __hash__ and __eq__ from Context, Node and Task #1629
   - Make lazy visual studio detection the default
-  - Remove the uses of run_once that can consume a lot of memory
+  - Remove the uses of run_once that can consume a lot of memory; add a proper LRU cache
   - Enable pre-forked builds by default to achieve faster builds, up to 2x speedup on short-lived processes
+  - Enable faster consumers in Runner.py
+  - Add the tool 'nobuild.py' to help with performance troubleshooting
+  - Enable profiling with the --profile command-line option
 
 * API changes:
   - The minimum Python version required is Python 2.5
+  - Add Task.get_cwd()
   - Remove the duplicate split() functions from Utils
   - Remove the command called "update"
-  - Add Task.get_cwd()
   - Remove Utils.nogc
-  - Modify Utils.run_once so that it accepts a list of *args
-  - Rewrote the main task consumer in Runner.py for performance purposes
-  - Use relative paths in apply_incpaths by default (and absolute ones when paths cross drives)
   - Remove Configure.err_handler
   - Remove TaskBase.attr() which was never used
   - Remove Build.POST_BOTH which was never used
-  - Task.sig_vars, Task.sig_explit_deps and Task.sig_implicit_deps return None
-  - Better consistency between check_cfg and check_cc variables
-  - Subclass waflib.Build.ConfiguredContext to enable configuration-dependent user commands
   - Remove Task.dep_vars as it is never used (define Task.vars on instances if necessary)
+  - Remove the unused attribute 'mac_resources', use 'mac_files' instead (see demos/mac_app)
+  - Remove qt4 and kde4 from the default modules
+  - Task.sig_vars, Task.sig_explit_deps and Task.sig_implicit_deps return None
+  - Use relative paths in apply_incpaths by default (and absolute ones when paths cross drives)
+  - Modify Utils.run_once so that it accepts a list of *args
+  - Better consistency between check_cfg and check_cc variables
   - task_gen.mapping and task_gen.prec are not defined by default on instances anymore, but
     instances can still define their own mappings to override the defaults, but in
     that case all mappings/precedences must be present. These features were not used in Waf 1.8.
-  - Unused attribute 'mac_resources' is no longer supported, use mac_files (see demos/mac_app)
-  - The _task suffix is no longer truncated from Task class names
+  - Do not truncate the _task suffix from Task class names
 
diff --git a/waf-light b/waf-light
index 08ac2f5c..89c29925 100755
--- a/waf-light
+++ b/waf-light
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # encoding: ISO8859-1
 # Thomas Nagy, 2005-2016
+#
+# This is waf 1.9 p2, the second preview version of waf 1.9
 
 """
 Redistribution and use in source and binary forms, with or without