diff --git a/Documentation/About/Limitations.md b/Documentation/About/Limitations.md
index d3deb3898..18fe54653 100644
--- a/Documentation/About/Limitations.md
+++ b/Documentation/About/Limitations.md
@@ -251,9 +251,19 @@ need to be truncated to valid block lengths before starting the avrorouter.
 
 ## MySQL Authentication Related Limitations (MySQLAuth)
 
-* MariaDB MaxScale can not manage authentication that uses wildcard matching in hostnames
-  in the mysql.user table of the backend database. The only wildcards that can be
-  used are in IP address entries.
+* MariaDB MaxScale supports authentication that uses wildcard matching in
+  hostnames in the mysql.user-table of the backend database. For IP-address
+  entries either '%' or '_'-wildcards are accepted, they should not be mixed
+  in the same entry. For text addresses both wildcards can be mixed.
+
+* When wildcards are used with text-form hostnames, MariaDB MaxScale uses
+  the `getnameinfo()`-function (from glibc) to perform the reverse DNS lookup.
+  This is a slow operation, which will stall the calling thread for an
+  unspecified time. The lookup is only performed if the mysql.user-table
+  contains a text hostname with wilcards for the client. Also, do note that
+  the IP and hostname seen by the backend will be those of the machine running
+  MariaDB MaxScale, while the username and password will be those of the
+  original client.
 
 * MySQL old style passwords are not supported. MySQL versions 4.1 and newer use
   a new authentication protocol which does not support pre-4.1 style passwords.
diff --git a/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
index 9b30d4244..88e38c41c 100644
--- a/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
@@ -125,6 +125,13 @@ For more details, read the [Galeramon documentation](../Monitors/Galera-Monitor.
 MaxAdmin now defaults to Emacs editing mode instead of VIM. To activate
 with VIM-mode start MaxAdmin with option -i.
 
+### Support for text wildcards in hostnames
+
+Wildcards in text-form hostnames in the mysql.user-table of the backend
+database are now supported. For matching, the client IP-address must be
+converted to text-form, which requires a reverse DNS lookup. Please see
+[Limitations](../About/Limitations.md) for more information.
+
 ## New Features
 
 ### Dynamic server configuration