diff --git a/ChangeLog b/ChangeLog
index 2bf99d18b1..8cbe3ccdf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
 - bug #4170 Overflow scroll for table grid is not a good solution
 - bug #2961 Relations settings not updated on config change
 - bug #4187 SQL query inline edit doesn't post changes on the first run
++ rfe #1465 Docs for connections to IPv6 only MySQL instances
 
 4.1.1.0 (2013-12-17)
 - bug #4154 Error using UNION query
diff --git a/doc/config.rst b/doc/config.rst
index 4973685bc6..95e32b8fe7 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -196,6 +196,11 @@ Server connection settings
     * dot - ``'.'``, i.e., use named pipes on windows systems
     * empty - ``''``, disables this server
 
+    .. note::
+
+        phpMyAdmin supports connecting to MySQL servers reachable via IPv6 only.
+		To connect to an IPv6 MySQL server, enter its IPv6 address in this field.
+
 .. config:option:: $cfg['Servers'][$i]['port']
 
     :type: string