diff --git a/ChangeLog b/ChangeLog
index e1557341..beb67c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+NEW IN WAF 2.0.15
+-----------------
+* Fix Python path detection under Git-Bash #2217
+* Provide an option to disable args files #2216
+* Improve command line length calculation for args files #2214
+* Add libs/stubs to Cuda library path #2213
+* Suppress ant_glob java warnings #2212
+* Support multiple 'default_cmd' #2211
+* Warn when buildcopy is used without any files to copy #2210
+* Protobuf examples enhancements #2208 #2209
+* Fix all DeprecationWarning: invalid escape sequence #2207
+
 NEW IN WAF 2.0.14
 -----------------
 * Support Fortran 2008 submodules #2205
diff --git a/waflib/Task.py b/waflib/Task.py
index 0423047b..776786ae 100644
--- a/waflib/Task.py
+++ b/waflib/Task.py
@@ -150,9 +150,6 @@ class Task(evil):
 	always_run = False
 	"""Specify whether task instances must always be executed or not (class attribute)"""
 
-	allow_argsfile = True
-	"""Specify whether task instances support the @argsfile shortcut for sunting arguments to a file (class attribute)"""
-
 	shell = False
 	"""Execute the command with the shell (class attribute)"""
 
@@ -316,7 +313,7 @@ class Task(evil):
 			cmd_bytes = sum([len(arg) for arg in cmd]) + len(cmd) -1
 			# Shunt arguments to a temporary file if the command is
 			# going to be too long.
-			if self.allow_argsfile and (cmd_bytes >= 8192 if Utils.is_win32 else cmd_bytes > 200000):
+			if (cmd_bytes >= 8192 if Utils.is_win32 else cmd_bytes > 200000) and getattr(self, 'allow_argsfile', True):
 				cmd, args = self.split_argfile(cmd)
 				try:
 					(fd, tmp) = tempfile.mkstemp()
diff --git a/waflib/Tools/winres.py b/waflib/Tools/winres.py
index ecaf4f22..9be1ed66 100644
--- a/waflib/Tools/winres.py
+++ b/waflib/Tools/winres.py
@@ -32,8 +32,6 @@ class rc_parser(c_preproc.c_parser):
 	"""
 	Calculates dependencies in .rc files
 	"""
-	allow_argsfile = False
-
 	def filter_comments(self, node):
 		"""
 		Overrides :py:meth:`waflib.Tools.c_preproc.c_parser.filter_comments`