diff --git a/Documentation/About/Limitations.md b/Documentation/About/Limitations.md
index 35aa2a1d0..943424845 100644
--- a/Documentation/About/Limitations.md
+++ b/Documentation/About/Limitations.md
@@ -10,6 +10,17 @@ In versions 2.1.2 and earlier, the configuration files are limited to 1024
 characters per line. This limitation was increased to 16384 characters in
 MaxScale 2.1.3.
 
+## Security limitiations
+
+### MariaDB 10.2
+
+The parser of MaxScale correctly parses `WITH` statements, but fails to
+collect columns, functions and tables used in the `SELECT` defining the
+`WITH` clause.
+
+Consequently, the database firewall will **not** block `WITH` statements
+where the `SELECT` of the `WITH` clause refers to forbidden columns.
+
 ## Protocol limitations
 
 ### Limitations with MySQL Protocol support (MySQLClient)
diff --git a/Documentation/About/Support-for-10.2.md b/Documentation/About/Support-for-10.2.md
new file mode 100644
index 000000000..d2a3fbf62
--- /dev/null
+++ b/Documentation/About/Support-for-10.2.md
@@ -0,0 +1,100 @@
+# Support for MariaDB 10.2
+
+MariaDB 10.2 introduces a fair amount of new
+[features](https://mariadb.com/kb/en/mariadb/what-is-mariadb-102/).
+
+In the following will be explained what impact some of those features have,
+when used together with MaxScale 2.1.
+
+## [Window Functions](https://mariadb.com/kb/en/mariadb/window-functions/)
+
+The parser of MariaDB MaxScale has not been extended with the window
+function syntax (the `OVER` keyword is not recognized) and hence statements
+using window functions will not be completely parsed.
+
+Since the database firewall filter will block all statements that
+cannot be completely parsed, all statements that use window functions
+will be blocked, if the database firewall filter is used.
+
+Otherwise the statements will be routed correctly.
+
+## [SHOW CREATE USER](https://mariadb.com/kb/en/mariadb/show-create-user/)
+
+Cannot be completely parsed by the MaxScale parser and hence will be
+blocked by the database firewall filter, if it is used.
+
+Otherwise the statements will be routed correctly.
+
+## [CREATE USER](https://mariadb.com/kb/en/mariadb/create-user/)
+
+The new options are not parsed by the MaxScale parser and hence any
+statements using those will be blocked by the database firewall filter,
+if it is used.
+
+Otherwise the statements will be routed correctly.
+
+## [ALTER USER](https://mariadb.com/kb/en/mariadb/alter-user/)
+
+The new options are not parsed by the MaxScale parser and hence any
+statements using those will be blocked by the database firewall filter,
+if it is used.
+
+Otherwise the statements will be routed correctly.
+
+## [WITH](https://mariadb.com/kb/en/mariadb/with/)
+
+The MaxScale parser correctly parses `WITH` statements such as
+```
+WITH t AS (SELECT a FROM t1 WHERE b >= 'c')
+SELECT * FROM t2,t WHERE t2.c=t.a;
+```
+,
+```
+SELECT t1.a,t1.b FROM t1,t2
+  WHERE t1.a>t2.c AND
+        t2.c in (WITH t as (SELECT * FROM t1 WHERE t1.a<5)
+                   SELECT t2.c FROM t2,t WHERE t2.c=t.a);
+```
+and
+```
+WITH engineers AS (
+  SELECT * FROM employees WHERE dept IN ('Development','Support')
+)
+SELECT * FROM engineers E1
+  WHERE NOT EXISTS (SELECT 1
+    FROM engineers E2
+    WHERE E2.country=E1.country
+    AND E2.name <> E1.name);
+```
+.
+
+However, the MaxScale parser fails to collect columns and table names
+from the `SELECT` of the `WITH` clause and consequently the database
+firewall filter will **NOT** be able to block `WITH` statements where
+the `SELECT` of the `WITH` clause refers to to forbidden columns.
+
+## [CHECK CONSTRAINT](https://mariadb.com/kb/en/mariadb/constraint/)
+
+The new options are not parsed by the MaxScale parser and hence any
+statements using those will be blocked by the database firewall filter,
+if it is used.
+
+Otherwise the statements will be routed correctly.
+
+## [DEFAULT with expressions](https://mariadb.com/kb/en/mariadb/create-table/#default)
+
+Parsed and handled correctly.
+
+## [EXECUTE IMMEDIATE](https://mariadb.com/kb/en/mariadb/execute-immediate/)
+
+An `EXECUTE IMMEDIATE` statement will only be partially parsed, which means
+that such statements will be blocked by the database firewall filter,
+if it is used.
+
+## [JSON functions](https://mariadb.com/kb/en/mariadb/json-functions/)
+
+The MaxScape parser treats them as any other function.
+
+However, as the parser is not aware of which JSON functions are strictly
+_read-only_ any statement using a JSON function will always be routed to
+_master_.
diff --git a/Documentation/Release-Notes/MaxScale-2.1.3-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.3-Release-Notes.md
index 89b2af04c..430931d20 100644
--- a/Documentation/Release-Notes/MaxScale-2.1.3-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.1.3-Release-Notes.md
@@ -14,6 +14,13 @@ release notes:
 For any problems you encounter, please consider submitting a bug
 report at [Jira](https://jira.mariadb.org).
 
+## MariaDB 10.2
+
+MaxScale 2.1 has not been extended to understand all new features that
+MariaDB 10.2 introduces. Please see
+[Support for 10.2](About/Support-for-10.2.md)
+for details.
+
 ## Changed Features
 
 ### Cache