diff --git a/ChangeLog b/ChangeLog
index 90a15587c..469997469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,8 @@
    be verbose about.  See taskrc(5).
  + New 'execute' command that runs external programs.
  + The default export format is now JSON.
+ + The configuration variable 'json.array' determines whether 'query' command
+   output is enclosed by '[...]'.
 
 # Tracked Features, sorted by ID.
  + Added feature #330, which supports the 'inverse' color attribute.
diff --git a/NEWS b/NEWS
index a30c55c93..1d23cbf76 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,10 @@ New configuration options in taskwarrior 2.0.0
   - New 'color.label' for report column labels.
   - New 'verbose=...' support for individual verbosity settings.
   - New 'avoidlastcolumn' support for Cygwin users.
+  - New 'patterns' enables/disables command line pattern support.
+  - New 'expressions' enables/disables command line expression support.
+  - New 'json.array' determines whether 'query' command output is enclosed by
+    '[...]'.
 
 Newly deprecated features in taskwarrior 2.0.0
 
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index cd6b42ab5..95215559c 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -309,6 +309,11 @@ Defaults to on.
 Enables or disables algebraic expression support on the command line, such as
 "due<eom and (pri=H or pri=M)".  Defaults to on.
 
+.TP
+.B json.array=off
+Determines whether the query command encloses the JSON output in '[...]' to
+create a properly-formed JSON array.  Defaults to off.
+
 .TP
 .B _forcecolor=no
 Taskwarrior shuts off color automatically when the output is not sent directly
diff --git a/src/Config.cpp b/src/Config.cpp
index 531736aa0..1be5d1be9 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -97,6 +97,7 @@ std::string Config::defaults =
   "xterm.title=no                                 # Sets xterm title for some commands\n"
   "expressions=on                                 # Support for algebraic expressions\n"
   "patterns=on                                    # Support for regex patterns\n"
+  "json.array=off                                 # Enclose JSON output in [ ]\n"
   "\n"
   "# Dates\n"
   "dateformat=m/d/Y                               # Preferred input and display date format\n"
diff --git a/src/commands/CmdQuery.cpp b/src/commands/CmdQuery.cpp
index 562d7fea6..53b6c00fb 100644
--- a/src/commands/CmdQuery.cpp
+++ b/src/commands/CmdQuery.cpp
@@ -75,7 +75,13 @@ int CmdQuery::execute (std::string& output)
   // Note: "limit:" feature not supported.
   // TODO Why not?
 
+  // Is output contained within a JSON array?
+  bool json_array = context.config.getBoolean ("json.array");
+
   // Compose output.
+  if (json_array)
+    output += "[\n";
+
   for (task = filtered.begin (); task != filtered.end (); ++task)
   {
     if (task != filtered.begin ())
@@ -84,6 +90,9 @@ int CmdQuery::execute (std::string& output)
     output += task->composeJSON (true);
   }
 
+  if (json_array)
+    output += "\n]";
+
   output += "\n";
   return rc;
 }