diff --git a/ChangeLog b/ChangeLog
index 150430113..885777e37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-15  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 39947: Test/D04parameter.ztst: Test out-of-rantge multiple
+	array subscripts with and without (@).
+
 2016-11-15  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* 39937: Src/params.c: fix a problem introduced by 39886.
diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst
index 97c8ba3fc..4cbd2fa0f 100644
--- a/Test/D04parameter.ztst
+++ b/Test/D04parameter.ztst
@@ -2041,3 +2041,11 @@
   () { print -r -- "${(q)1}" "${(b)1}" "${(qq)1}" } '=foo'
 0:(q) and (b) quoting deal with the EQUALS option
 >\=foo =foo '=foo'
+
+  args() { print $#; }
+  a=(foo)
+  args "${a[3,-1]}"
+  args "${(@)a[3,-1]}"
+0:Out-of-range multiple array subscripts with quoting, with and without (@)
+>1
+>0