diff --git a/README.md b/README.md
index 6c455f0e0a4..f20a790eb19 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,36 @@ DD MMM YYYY
 
 ### UPDATES IN 2.1.4
 
+#### Security fix: Query route
+
+The query route was deprecated, as a replacement exists within the HTTP router
+itself. You can pass a "query" option to the assemble method containing either
+the query string or an array of key-value pairs:
+
+```php
+$url = $router->assemble(array(
+    'name' => 'foo',
+), array(
+    'query' => array(
+        'page' => 3,
+        'sort' => 'DESC',
+    ), 
+    // or: 'query' => 'page=3&sort=DESC'
+));
+
+// via URL helper/plugin:
+$rendererOrController->url('foo', array(), array('query' => $request->getQuery()));
+```
+
+Additionally, the merging of query parameters into the route match was removed
+to avoid potential security issues. Please use the query container of the
+request object instead.
+
+For more information on the security vector, please see
+[ZF2013-01](http://framework.zend.com/security/ZF2013-01).
+
+#### Better polyfill support
+
 Better polyfill support in `Zend\Session` and `Zend\Stdlib`. Polyfills
 (version-specific class replacements) have caused some issues in the 2.1 series.
 In particular, users who were not using Composer were unaware/uncertain about
diff --git a/library/Zend/Mvc/Router/Http/Query.php b/library/Zend/Mvc/Router/Http/Query.php
index a807e966c05..e6ce959f298 100644
--- a/library/Zend/Mvc/Router/Http/Query.php
+++ b/library/Zend/Mvc/Router/Http/Query.php
@@ -15,6 +15,11 @@
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\RequestInterface as Request;
 
+ /**
+ * Legacy purposes only, to prevent code that uses it from breaking.
+ */
+trigger_error('Query route deprecated as of ZF 2.1.4; use the "query" option of the HTTP router\'s assembling method instead', E_USER_DEPRECATED);
+
 /**
  * Query route.
  *
@@ -82,13 +87,10 @@ public static function factory($options = array())
      */
     public function match(Request $request, $pathOffset = null)
     {
-        if (!method_exists($request, 'getQuery')) {
-            return null;
-        }
-
-        $matches = $this->recursiveUrldecode($request->getQuery()->toArray());
-
-        return new RouteMatch(array_merge($this->defaults, $matches));
+        // We don't merge the query parameters into the rotue match here because
+        // of possible security problems. Use the Query object instead which is
+        // included in the Request object.
+        return new RouteMatch($this->defaults);
     }
 
     /**