diff --git a/ChangeLog b/ChangeLog
index 029e9820..959aafeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+NEW IN WAF 2.1.4
+----------------
+* Prevent subprocesses from disrupting the main build process through inherited stdin
+* Fix a regression that prevents displaying help from custom commands
+
 NEW IN WAF 2.1.3
 ----------------
 * Work around a race condition in mingw Python
diff --git a/waf-light b/waf-light
index 8da39505..3ed33b0e 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.1.3"
+VERSION="2.1.4"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index fe07869c..ff8efd68 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=0x2010300
+HEXVERSION=0x2010400
 """Constant updated on new releases"""
 
-WAFVERSION="2.1.3"
+WAFVERSION="2.1.4"
 """Constant updated on new releases"""
 
-WAFREVISION="ee9a11d51e94d31c548fd5b6a8103c68327b3354"
+WAFREVISION="627780cbb74b86b31016c822dcf2b0bfcbb337cb"
 """Git revision when the waf version is updated"""
 
 WAFNAME="waf"
diff --git a/wscript b/wscript
index ec1fe63f..8cab96de 100644
--- a/wscript
+++ b/wscript
@@ -9,7 +9,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 ./waf-light  --tools=compat15,/comp/waf/aba.py --prelude=$'\tfrom waflib.extras import aba\n\taba.foo()'
 """
 
-VERSION="2.1.3"
+VERSION="2.1.4"
 APPNAME='waf'
 REVISION=''