diff --git a/docs/JSON-RPC.md b/docs/JSON-RPC.md
index a4d6243cc2..039a659ef8 100644
--- a/docs/JSON-RPC.md
+++ b/docs/JSON-RPC.md
@@ -17,7 +17,8 @@ It can be generated like this:
 $ openssl rand -base64 10 > /file/with/a/secret.txt
 ```
 
-The JSON-RPC server defaults to listening on the local loopback network interface (127.0.0.1).  This can be optionally changed by using the `--jsonrpcbindip <ip address>` command line option. **IPv4 only. IPv6 support has not been tested.**
+The JSON-RPC server defaults to listening on the local loopback network interface (127.0.0.1).
+This can be optionally changed by using the `--jsonrpcbindip <ip address>` command line option.
 
 
 ## Wire protocol
diff --git a/src/main.cpp b/src/main.cpp
index 38b536929d..c5ec0f7e16 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -801,7 +801,7 @@ int main ( int argc, char** argv )
 
         if ( strJsonRpcBindIP.trimmed().isEmpty() )
         {
-            qCritical() << qUtf8Printable ( QString ( "JSON-RPC is enabled but no bind address was provided, exiting." ) );
+            qCritical() << qUtf8Printable ( QString ( "JSON-RPC is enabled but the bind address provided is empty, exiting." ) );
             exit ( 1 );
         }
 
@@ -1107,7 +1107,7 @@ QString UsageArguments ( char** argv )
            "      --jsonrpcsecretfile\n"
            "                        path to a single-line file which contains a freely\n"
            "                        chosen secret to authenticate JSON-RPC users.\n"
-           "      --jsonrpcbindip   optional network address to bind RPC server. Defaults to 127.0.0.1 (IPv4 only, IPv6 not tested).\n"
+           "      --jsonrpcbindip   optional network address to bind RPC server. Defaults to 127.0.0.1.\n"
            "  -Q, --qos             set the QoS value. Default is 128. Disable with 0\n"
            "                        (see the Jamulus website to enable QoS on Windows)\n"
            "  -t, --notranslation   disable translation (use English language)\n"
diff --git a/tools/generate_json_rpc_docs.py b/tools/generate_json_rpc_docs.py
index 228c9952fd..852414636e 100755
--- a/tools/generate_json_rpc_docs.py
+++ b/tools/generate_json_rpc_docs.py
@@ -204,7 +204,8 @@ def to_markdown(self):
 $ openssl rand -base64 10 > /file/with/a/secret.txt
 ```
 
-The JSON-RPC server defaults to listening on the local loopback network interface (127.0.0.1).  This can be optionally changed by using the `--jsonrpcbindip <ip address>` command line option. **IPv4 only. IPv6 support has not been tested.**
+The JSON-RPC server defaults to listening on the local loopback network interface (127.0.0.1).
+This can be optionally changed by using the `--jsonrpcbindip <ip address>` command line option.
 
 
 ## Wire protocol