diff --git a/Documentation/Release-Notes/MaxScale-2.1.2-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.2-Release-Notes.md
index 4dd0d16c4..dcbabfbde 100644
--- a/Documentation/Release-Notes/MaxScale-2.1.2-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.1.2-Release-Notes.md
@@ -15,6 +15,25 @@ report at [Jira](https://jira.mariadb.org).
 
 ## Changed Features
 
+### Formatting of IP Addresses and Ports
+
+All messaging that contains both the address and the port are now printed in an
+IPv6 compatible format. The output uses the format defined in
+[RFC 3986] (https://www.ietf.org/rfc/rfc3986.txt) and
+[STD 66] (https://www.rfc-editor.org/std/std66.txt).
+
+In practice this means that the address is enclosed by brackets. The port is
+separated from the address by a colon. Here is an example of the new format:
+
+```
+[192.168.0.201]:3306
+[fe80::fa16:54ff:fe8f:7e56]:3306
+[localhost]:3306
+```
+
+The first is an IPv4 address, the second an IPv6 address and the last one is a
+hostname. All of the addresses use port 3306.
+
 ### Cache
 
 * The storage `storage_inmemory` is now the default, so the parameter
diff --git a/server/core/dcb.c b/server/core/dcb.c
index d591915bc..1e8ae2d0b 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -692,7 +692,7 @@ dcb_connect(SERVER *server, MXS_SESSION *session, const char *protocol)
 
     if (fd == DCBFD_CLOSED)
     {
-        MXS_DEBUG("%lu [dcb_connect] Failed to connect to server %s:%d, "
+        MXS_DEBUG("%lu [dcb_connect] Failed to connect to server [%s]:%d, "
                   "from backend dcb %p, client dcp %p fd %d.",
                   pthread_self(),
                   server->name,
@@ -706,7 +706,7 @@ dcb_connect(SERVER *server, MXS_SESSION *session, const char *protocol)
     }
     else
     {
-        MXS_DEBUG("%lu [dcb_connect] Connected to server %s:%d, "
+        MXS_DEBUG("%lu [dcb_connect] Connected to server [%s]:%d, "
                   "from backend dcb %p, client dcp %p fd %d.",
                   pthread_self(),
                   server->name,
@@ -3087,13 +3087,13 @@ int dcb_listen(DCB *listener, const char *config, const char *protocol_name)
      */
     if (listen(listener_socket, INT_MAX) != 0)
     {
-        MXS_ERROR("Failed to start listening on '%s' with protocol '%s': %d, %s",
-                  config, protocol_name, errno, mxs_strerror(errno));
+        MXS_ERROR("Failed to start listening on '[%s]:%u' with protocol '%s': %d, %s",
+                  host, port, protocol_name, errno, mxs_strerror(errno));
         close(listener_socket);
         return -1;
     }
 
-    MXS_NOTICE("Listening for connections at %s with protocol %s", config, protocol_name);
+    MXS_NOTICE("Listening for connections at [%s]:%u with protocol %s", host, port, protocol_name);
 
     // assign listener_socket to dcb
     listener->fd = listener_socket;
diff --git a/server/core/monitor.c b/server/core/monitor.c
index f163b081e..b8cf33819 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -467,7 +467,7 @@ monitorShow(DCB *dcb, MXS_MONITOR *monitor)
 
     for (MXS_MONITOR_SERVERS *db = monitor->databases; db; db = db->next)
     {
-        dcb_printf(dcb, "%s%s:%d", sep, db->server->name, db->server->port);
+        dcb_printf(dcb, "%s[%s]:%d", sep, db->server->name, db->server->port);
         sep = ", ";
     }
 
@@ -685,7 +685,7 @@ bool check_monitor_permissions(MXS_MONITOR* monitor, const char* query)
     {
         if (mon_connect_to_db(monitor, mondb) != MONITOR_CONN_OK)
         {
-            MXS_ERROR("[%s] Failed to connect to server '%s' (%s:%d) when"
+            MXS_ERROR("[%s] Failed to connect to server '%s' ([%s]:%d) when"
                       " checking monitor user credentials and permissions: %s",
                       monitor->name, mondb->server->unique_name, mondb->server->name,
                       mondb->server->port, mysql_error(mondb->con));
@@ -965,7 +965,7 @@ static void mon_append_node_names(MXS_MONITOR_SERVERS* servers, char* dest, int
     {
         if (status == 0 || servers->server->status & status)
         {
-            snprintf(arr, sizeof(arr), "%s%s:%d", separator, servers->server->name,
+            snprintf(arr, sizeof(arr), "%s[%s]:%d", separator, servers->server->name,
                      servers->server->port);
             separator = ",";
             int arrlen = strlen(arr);
@@ -1049,7 +1049,7 @@ monitor_launch_script(MXS_MONITOR* mon, MXS_MONITOR_SERVERS* ptr, const char* sc
     if (externcmd_matches(cmd, "$INITIATOR"))
     {
         char initiator[strlen(ptr->server->name) + 24]; // Extra space for port
-        snprintf(initiator, sizeof(initiator), "%s:%d", ptr->server->name, ptr->server->port);
+        snprintf(initiator, sizeof(initiator), "[%s]:%d", ptr->server->name, ptr->server->port);
         externcmd_substitute_arg(cmd, "[$]INITIATOR", initiator);
     }
 
@@ -1221,8 +1221,8 @@ void
 mon_log_connect_error(MXS_MONITOR_SERVERS* database, mxs_connect_result_t rval)
 {
     MXS_ERROR(rval == MONITOR_CONN_TIMEOUT ?
-              "Monitor timed out when connecting to server %s:%d : \"%s\"" :
-              "Monitor was unable to connect to server %s:%d : \"%s\"",
+              "Monitor timed out when connecting to server [%s]:%d : \"%s\"" :
+              "Monitor was unable to connect to server [%s]:%d : \"%s\"",
               database->server->name, database->server->port,
               mysql_error(database->con));
 }
diff --git a/server/core/service.c b/server/core/service.c
index cd8dccb5f..4cc5f764b 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -1319,7 +1319,7 @@ printService(SERVICE *service)
     printf("\tBackend databases\n");
     while (ptr)
     {
-        printf("\t\t%s:%d  Protocol: %s\n", ptr->server->name, ptr->server->port, ptr->server->protocol);
+        printf("\t\t[%s]:%d  Protocol: %s\n", ptr->server->name, ptr->server->port, ptr->server->protocol);
         ptr = ptr->next;
     }
     if (service->n_filters)
@@ -1432,7 +1432,7 @@ void dprintService(DCB *dcb, SERVICE *service)
     {
         if (SERVER_REF_IS_ACTIVE(server))
         {
-            dcb_printf(dcb, "\t\t%s:%d    Protocol: %s    Name: %s\n",
+            dcb_printf(dcb, "\t\t[%s]:%d    Protocol: %s    Name: %s\n",
                        server->server->name, server->server->port,
                        server->server->protocol, server->server->unique_name);
         }
diff --git a/server/modules/authenticator/MySQLAuth/dbusers.c b/server/modules/authenticator/MySQLAuth/dbusers.c
index 937d4cfbc..23e712c2f 100644
--- a/server/modules/authenticator/MySQLAuth/dbusers.c
+++ b/server/modules/authenticator/MySQLAuth/dbusers.c
@@ -494,7 +494,7 @@ static bool check_server_permissions(SERVICE *service, SERVER* server,
     {
         int my_errno = mysql_errno(mysql);
 
-        MXS_ERROR("[%s] Failed to connect to server '%s' (%s:%d) when"
+        MXS_ERROR("[%s] Failed to connect to server '%s' ([%s]:%d) when"
                   " checking authentication user credentials and permissions: %d %s",
                   service->name, server->unique_name, server->name, server->port,
                   my_errno, mysql_error(mysql));
diff --git a/server/modules/authenticator/MySQLAuth/mysql_auth.c b/server/modules/authenticator/MySQLAuth/mysql_auth.c
index f2c3d27ba..8aed71e89 100644
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.c
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.c
@@ -349,7 +349,7 @@ mysql_auth_authenticate(DCB *dcb)
         }
         else if (dcb->service->log_auth_warnings)
         {
-            MXS_WARNING("%s: login attempt for user '%s'@%s:%d, authentication failed.",
+            MXS_WARNING("%s: login attempt for user '%s'@[%s]:%d, authentication failed.",
                         dcb->service->name, client_data->user, dcb->remote, dcb_get_port(dcb));
 
             if (is_localhost_address(&dcb->ip) &&
diff --git a/server/modules/filter/mqfilter/mqfilter.c b/server/modules/filter/mqfilter/mqfilter.c
index 8f62eecd4..15b5a6cf2 100644
--- a/server/modules/filter/mqfilter/mqfilter.c
+++ b/server/modules/filter/mqfilter/mqfilter.c
@@ -1159,7 +1159,7 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
              * Something matched the trigger, log the query
              */
 
-            MXS_INFO("Routing message to: %s:%d %s as %s/%s, exchange: %s<%s> key:%s queue:%s",
+            MXS_INFO("Routing message to: [%s]:%d %s as %s/%s, exchange: %s<%s> key:%s queue:%s",
                      my_instance->hostname, my_instance->port,
                      my_instance->vhost, my_instance->username,
                      my_instance->password, my_instance->exchange,
@@ -1490,7 +1490,7 @@ diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
 
     if (my_instance)
     {
-        dcb_printf(dcb, "Connecting to %s:%d as '%s'.\nVhost: %s\tExchange: %s\nKey: %s\tQueue: %s\n\n",
+        dcb_printf(dcb, "Connecting to [%s]:%d as '%s'.\nVhost: %s\tExchange: %s\nKey: %s\tQueue: %s\n\n",
                    my_instance->hostname, my_instance->port,
                    my_instance->username,
                    my_instance->vhost, my_instance->exchange,
diff --git a/server/modules/monitor/auroramon/auroramon.c b/server/modules/monitor/auroramon/auroramon.c
index baaacd220..6f83f1ecf 100644
--- a/server/modules/monitor/auroramon/auroramon.c
+++ b/server/modules/monitor/auroramon/auroramon.c
@@ -79,7 +79,7 @@ void update_server_status(MXS_MONITOR *monitor, MXS_MONITOR_SERVERS *database)
             }
             else
             {
-                MXS_ERROR("Failed to query server %s (%s:%d): %d, %s",
+                MXS_ERROR("Failed to query server %s ([%s]:%d): %d, %s",
                           database->server->unique_name, database->server->name,
                           database->server->port, mysql_errno(database->con),
                           mysql_error(database->con));
diff --git a/server/modules/monitor/galeramon/galeramon.c b/server/modules/monitor/galeramon/galeramon.c
index 5fe526311..b249b3949 100644
--- a/server/modules/monitor/galeramon/galeramon.c
+++ b/server/modules/monitor/galeramon/galeramon.c
@@ -448,7 +448,7 @@ monitorMain(void *arg)
             /* Log server status change */
             if (mon_status_changed(ptr))
             {
-                MXS_DEBUG("Backend server %s:%d state : %s",
+                MXS_DEBUG("Backend server [%s]:%d state : %s",
                           ptr->server->name,
                           ptr->server->port,
                           STRSRVSTATUS(ptr->server));
diff --git a/server/modules/monitor/mmmon/mmmon.c b/server/modules/monitor/mmmon/mmmon.c
index 1d149b7d0..ce12528e4 100644
--- a/server/modules/monitor/mmmon/mmmon.c
+++ b/server/modules/monitor/mmmon/mmmon.c
@@ -538,7 +538,7 @@ monitorMain(void *arg)
             if (mon_status_changed(ptr) ||
                 mon_print_fail_status(ptr))
             {
-                MXS_DEBUG("Backend server %s:%d state : %s",
+                MXS_DEBUG("Backend server [%s]:%d state : %s",
                           ptr->server->name,
                           ptr->server->port,
                           STRSRVSTATUS(ptr->server));
diff --git a/server/modules/monitor/mysqlmon/mysql_mon.c b/server/modules/monitor/mysqlmon/mysql_mon.c
index 387f1e6e8..e8c90a4fa 100644
--- a/server/modules/monitor/mysqlmon/mysql_mon.c
+++ b/server/modules/monitor/mysqlmon/mysql_mon.c
@@ -547,7 +547,7 @@ static MXS_MONITOR_SERVERS *build_mysql51_replication_tree(MXS_MONITOR *mon)
             /* Set the Slave Role */
             if (ismaster)
             {
-                MXS_DEBUG("Master server found at %s:%d with %d slaves",
+                MXS_DEBUG("Master server found at [%s]:%d with %d slaves",
                           database->server->name,
                           database->server->port,
                           nslaves);
@@ -1122,7 +1122,7 @@ monitorMain(void *arg)
                 if (SRV_MASTER_STATUS(ptr->mon_prev_status))
                 {
                     /** Master failed, can't recover */
-                    MXS_NOTICE("Server %s:%d lost the master status.",
+                    MXS_NOTICE("Server [%s]:%d lost the master status.",
                                ptr->server->name,
                                ptr->server->port);
                 }
@@ -1131,12 +1131,12 @@ monitorMain(void *arg)
             if (mon_status_changed(ptr))
             {
 #if defined(SS_DEBUG)
-                MXS_INFO("Backend server %s:%d state : %s",
+                MXS_INFO("Backend server [%s]:%d state : %s",
                          ptr->server->name,
                          ptr->server->port,
                          STRSRVSTATUS(ptr->server));
 #else
-                MXS_DEBUG("Backend server %s:%d state : %s",
+                MXS_DEBUG("Backend server [%s]:%d state : %s",
                           ptr->server->name,
                           ptr->server->port,
                           STRSRVSTATUS(ptr->server));
diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.c b/server/modules/monitor/ndbclustermon/ndbclustermon.c
index 1e40cf6c1..36d8ce5af 100644
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.c
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.c
@@ -348,7 +348,7 @@ monitorMain(void *arg)
             if (ptr->server->status != ptr->mon_prev_status ||
                 SERVER_IS_DOWN(ptr->server))
             {
-                MXS_DEBUG("Backend server %s:%d state : %s",
+                MXS_DEBUG("Backend server [%s]:%d state : %s",
                           ptr->server->name,
                           ptr->server->port,
                           STRSRVSTATUS(ptr->server));
diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
index e62ecab09..6276cae0f 100644
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
@@ -280,7 +280,7 @@ static int gw_do_connect_to_backend(char *host, int port, int *fd)
 
     if (so == -1)
     {
-        MXS_ERROR("Establishing connection to backend server %s:%d failed.", host, port);
+        MXS_ERROR("Establishing connection to backend server [%s]:%d failed.", host, port);
         return rv;
     }
 
@@ -294,7 +294,7 @@ static int gw_do_connect_to_backend(char *host, int port, int *fd)
         }
         else
         {
-            MXS_ERROR("Failed to connect backend server %s:%d due to: %d, %s.",
+            MXS_ERROR("Failed to connect backend server [%s]:%d due to: %d, %s.",
                       host, port, errno, mxs_strerror(errno));
             close(so);
             return rv;
@@ -303,7 +303,7 @@ static int gw_do_connect_to_backend(char *host, int port, int *fd)
 
     *fd = so;
     MXS_DEBUG("%lu [gw_do_connect_to_backend] Connected to backend server "
-              "%s:%d, fd %d.", pthread_self(), host, port, so);
+              "[%s]:%d, fd %d.", pthread_self(), host, port, so);
 
     return rv;
 
diff --git a/server/modules/routing/avrorouter/avro.c b/server/modules/routing/avrorouter/avro.c
index 20cc5a9b1..31a8134b0 100644
--- a/server/modules/routing/avrorouter/avro.c
+++ b/server/modules/routing/avrorouter/avro.c
@@ -892,7 +892,7 @@ diagnostics(MXS_ROUTER *router, DCB *dcb)
             char sync_marker_hex[SYNC_MARKER_SIZE * 2 + 1];
 
             dcb_printf(dcb, "\t\tClient UUID:                 %s\n", session->uuid);
-            dcb_printf(dcb, "\t\tClient_host_port:            %s:%d\n",
+            dcb_printf(dcb, "\t\tClient_host_port:            [%s]:%d\n",
                        session->dcb->remote, dcb_get_port(session->dcb));
             dcb_printf(dcb, "\t\tUsername:                    %s\n", session->dcb->user);
             dcb_printf(dcb, "\t\tClient DCB:                  %p\n", session->dcb);
diff --git a/server/modules/routing/binlogrouter/blr.c b/server/modules/routing/binlogrouter/blr.c
index ab6ea16b0..7501972db 100644
--- a/server/modules/routing/binlogrouter/blr.c
+++ b/server/modules/routing/binlogrouter/blr.c
@@ -1129,7 +1129,7 @@ closeSession(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session)
 
         if (slave->state > 0)
         {
-            MXS_NOTICE("%s: Slave %s:%d, server id %d, disconnected after %ld seconds. "
+            MXS_NOTICE("%s: Slave [%s]:%d, server id %d, disconnected after %ld seconds. "
                        "%d SQL commands, %d events sent (%lu bytes), binlog '%s', "
                        "last position %lu",
                        router->service->name, slave->dcb->remote, dcb_get_port(slave->dcb),
@@ -1532,7 +1532,7 @@ diagnostics(MXS_ROUTER *router, DCB *dcb)
                 dcb_printf(dcb, "\t\tSlave UUID:                              %s\n", session->uuid);
             }
             dcb_printf(dcb,
-                       "\t\tSlave_host_port:                         %s:%d\n",
+                       "\t\tSlave_host_port:                         [%s]:%d\n",
                        session->dcb->remote, dcb_get_port(session->dcb));
             dcb_printf(dcb,
                        "\t\tUsername:                                %s\n",
@@ -1772,7 +1772,7 @@ errorReply(MXS_ROUTER *instance,
                 dcb_close(backend_dcb);
 
                 MXS_ERROR("%s: Master connection error %lu '%s' in state '%s', "
-                          "%s while connecting to master %s:%d",
+                          "%s while connecting to master [%s]:%d",
                           router->service->name, router->m_errno, router->m_errmsg,
                           blrm_states[BLRM_TIMESTAMP], msg,
                           router->service->dbref->server->name,
@@ -1821,7 +1821,7 @@ errorReply(MXS_ROUTER *instance,
         spinlock_release(&router->lock);
 
         MXS_ERROR("%s: Master connection error %lu '%s' in state '%s', "
-                  "%s attempting reconnect to master %s:%d",
+                  "%s attempting reconnect to master [%s]:%d",
                   router->service->name, mysql_errno, errmsg,
                   blrm_states[router->master_state], msg,
                   router->service->dbref->server->name,
@@ -1830,7 +1830,7 @@ errorReply(MXS_ROUTER *instance,
     else
     {
         MXS_ERROR("%s: Master connection error %lu '%s' in state '%s', "
-                  "%s attempting reconnect to master %s:%d",
+                  "%s attempting reconnect to master [%s]:%d",
                   router->service->name, router->m_errno,
                   router->m_errmsg ? router->m_errmsg : "(memory failure)",
                   blrm_states[router->master_state], msg,
@@ -2468,7 +2468,7 @@ destroyInstance(MXS_ROUTER *instance)
         }
     }
 
-    MXS_INFO("%s is being stopped by MaxScale shudown. Disconnecting from master %s:%d, "
+    MXS_INFO("%s is being stopped by MaxScale shudown. Disconnecting from master [%s]:%d, "
              "read up to log %s, pos %lu, transaction safe pos %lu",
              inst->service->name,
              inst->service->dbref->server->name,
diff --git a/server/modules/routing/binlogrouter/blr_master.c b/server/modules/routing/binlogrouter/blr_master.c
index 65aa0e5cb..5d7fc04b0 100644
--- a/server/modules/routing/binlogrouter/blr_master.c
+++ b/server/modules/routing/binlogrouter/blr_master.c
@@ -203,7 +203,7 @@ blr_start_master(void* data)
     }
     router->master->remote = MXS_STRDUP_A(router->service->dbref->server->name);
 
-    MXS_NOTICE("%s: attempting to connect to master server %s:%d, binlog %s, pos %lu",
+    MXS_NOTICE("%s: attempting to connect to master server [%s]:%d, binlog %s, pos %lu",
                router->service->name, router->service->dbref->server->name,
                router->service->dbref->server->port, router->binlog_name, router->current_pos);
 
@@ -706,7 +706,7 @@ blr_master_response(ROUTER_INSTANCE *router, GWBUF *buf)
         /* if semisync option is set, check for master semi-sync availability */
         if (router->request_semi_sync)
         {
-            MXS_NOTICE("%s: checking Semi-Sync replication capability for master server %s:%d",
+            MXS_NOTICE("%s: checking Semi-Sync replication capability for master server [%s]:%d",
                        router->service->name,
                        router->service->dbref->server->name,
                        router->service->dbref->server->port);
@@ -739,7 +739,7 @@ blr_master_response(ROUTER_INSTANCE *router, GWBUF *buf)
                 if (router->master_semi_sync == MASTER_SEMISYNC_NOT_AVAILABLE)
                 {
                     /* not installed */
-                    MXS_NOTICE("%s: master server %s:%d doesn't have semi_sync capability",
+                    MXS_NOTICE("%s: master server [%s]:%d doesn't have semi_sync capability",
                                router->service->name,
                                router->service->dbref->server->name,
                                router->service->dbref->server->port);
@@ -753,7 +753,7 @@ blr_master_response(ROUTER_INSTANCE *router, GWBUF *buf)
                     if (router->master_semi_sync == MASTER_SEMISYNC_DISABLED)
                     {
                         /* Installed but not enabled,  right now */
-                        MXS_NOTICE("%s: master server %s:%d doesn't have semi_sync enabled right now, "
+                        MXS_NOTICE("%s: master server [%s]:%d doesn't have semi_sync enabled right now, "
                                    "Requesting Semi-Sync Replication",
                                    router->service->name,
                                    router->service->dbref->server->name,
@@ -762,7 +762,7 @@ blr_master_response(ROUTER_INSTANCE *router, GWBUF *buf)
                     else
                     {
                         /* Installed and enabled */
-                        MXS_NOTICE("%s: master server %s:%d has semi_sync enabled, Requesting Semi-Sync Replication",
+                        MXS_NOTICE("%s: master server [%s]:%d has semi_sync enabled, Requesting Semi-Sync Replication",
                                    router->service->name,
                                    router->service->dbref->server->name,
                                    router->service->dbref->server->port);
@@ -803,7 +803,7 @@ blr_master_response(ROUTER_INSTANCE *router, GWBUF *buf)
 
         router->master->func.write(router->master, buf);
         MXS_NOTICE("%s: Request binlog records from %s at "
-                   "position %lu from master server %s:%d",
+                   "position %lu from master server [%s]:%d",
                    router->service->name, router->binlog_name,
                    router->current_pos,
                    router->service->dbref->server->name,
@@ -1512,7 +1512,7 @@ blr_handle_binlog_record(ROUTER_INSTANCE *router, GWBUF *pkt)
 
                             MXS_DEBUG("%s: binlog record in file %s, pos %lu has "
                                       "SEMI_SYNC_ACK_REQ and needs a Semi-Sync ACK packet to "
-                                      "be sent to the master server %s:%d",
+                                      "be sent to the master server [%s]:%d",
                                       router->service->name, router->binlog_name,
                                       router->current_pos,
                                       router->service->dbref->server->name,
@@ -2144,7 +2144,7 @@ blr_check_heartbeat(ROUTER_INSTANCE *router)
     {
         if ((t_now - router->stats.lastReply) > (router->heartbeat + BLR_NET_LATENCY_WAIT_TIME))
         {
-            MXS_ERROR("No event received from master %s:%d in heartbeat period (%lu seconds), "
+            MXS_ERROR("No event received from master [%s]:%d in heartbeat period (%lu seconds), "
                       "last event (%s %d) received %lu seconds ago. Assuming connection is dead "
                       "and reconnecting.",
                       router->service->dbref->server->name,
@@ -2408,7 +2408,7 @@ bool blr_send_event(blr_thread_role_t role,
     }
     else
     {
-        MXS_ERROR("Failed to send an event of %u bytes to slave at %s:%d.",
+        MXS_ERROR("Failed to send an event of %u bytes to slave at [%s]:%d.",
                   hdr->event_size, slave->dcb->remote,
                   dcb_get_port(slave->dcb));
     }
diff --git a/server/modules/routing/binlogrouter/blr_slave.c b/server/modules/routing/binlogrouter/blr_slave.c
index 696cf557c..b3d94ae31 100644
--- a/server/modules/routing/binlogrouter/blr_slave.c
+++ b/server/modules/routing/binlogrouter/blr_slave.c
@@ -2174,7 +2174,7 @@ blr_slave_binlog_dump(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue
 
     slave->state = BLRS_DUMPING;
 
-    MXS_NOTICE("%s: Slave %s:%d, server id %d requested binlog file %s from position %lu",
+    MXS_NOTICE("%s: Slave [%s]:%d, server id %d requested binlog file %s from position %lu",
                router->service->name, slave->dcb->remote,
                dcb_get_port(slave->dcb),
                slave->serverid,
@@ -2670,7 +2670,7 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large)
              * but the new binlog file has not yet been created. Therefore
              * we ignore these issues during the rotate processing.
              */
-            MXS_ERROR("%s: Slave %s:%d, server-id %d reached end of file for binlog file %s "
+            MXS_ERROR("%s: Slave [%s]:%d, server-id %d reached end of file for binlog file %s "
                       "at %lu which is not the file currently being downloaded. "
                       "Master binlog is %s, %lu. This may be caused by a "
                       "previous failure of the master.",
@@ -3468,7 +3468,7 @@ blr_stop_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
 
     spinlock_release(&router->lock);
 
-    MXS_NOTICE("%s: STOP SLAVE executed by %s@%s. Disconnecting from master %s:%d, "
+    MXS_NOTICE("%s: STOP SLAVE executed by %s@%s. Disconnecting from master [%s]:%d, "
                "read up to log %s, pos %lu, transaction safe pos %lu",
                router->service->name,
                slave->dcb->user,
@@ -3626,7 +3626,7 @@ blr_start_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
     /** Start replication from master */
     blr_start_master(router);
 
-    MXS_NOTICE("%s: START SLAVE executed by %s@%s. Trying connection to master %s:%d, "
+    MXS_NOTICE("%s: START SLAVE executed by %s@%s. Trying connection to master [%s]:%d, "
                "binlog %s, pos %lu, transaction safe pos %lu",
                router->service->name,
                slave->dcb->user,
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 7b0e3da46..89a8a4d50 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -762,14 +762,14 @@ static void clientReply(MXS_ROUTER *instance,
     {
         bool succp;
 
-        MXS_INFO("Backend %s:%d processed reply and starts to execute active cursor.",
+        MXS_INFO("Backend [%s]:%d processed reply and starts to execute active cursor.",
                  bref->ref->server->name, bref->ref->server->port);
 
         succp = execute_sescmd_in_backend(bref);
 
         if (!succp)
         {
-            MXS_INFO("Backend %s:%d failed to execute session command.",
+            MXS_INFO("Backend [%s]:%d failed to execute session command.",
                      bref->ref->server->name, bref->ref->server->port);
         }
     }
@@ -1087,7 +1087,7 @@ int router_handle_state_switch(DCB *dcb, DCB_REASON reason, void *data)
         goto return_rc;
     }
 
-    MXS_DEBUG("%lu [router_handle_state_switch] %s %s:%d in state %s",
+    MXS_DEBUG("%lu [router_handle_state_switch] %s [%s]:%d in state %s",
               pthread_self(), STRDCBREASON(reason), srv->name, srv->port,
               STRSRVSTATUS(srv));
     CHK_SESSION(((MXS_SESSION *)dcb->session));
@@ -1318,7 +1318,7 @@ static void handleError(MXS_ROUTER *instance,
                     }
                     else if (!SERVER_IS_MASTER(srv) && !srv->master_err_is_logged)
                     {
-                        MXS_ERROR("Server %s:%d lost the master status. Readwritesplit "
+                        MXS_ERROR("Server [%s]:%d lost the master status. Readwritesplit "
                                   "service can't locate the master. Client sessions "
                                   "will be closed.", srv->name, srv->port);
                         srv->master_err_is_logged = true;
@@ -1336,7 +1336,7 @@ static void handleError(MXS_ROUTER *instance,
                     }
                     else
                     {
-                        MXS_ERROR("Server %s:%d lost the master status but could not locate the "
+                        MXS_ERROR("Server [%s]:%d lost the master status but could not locate the "
                                   "corresponding backend ref.", srv->name, srv->port);
                     }
                 }
diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.c b/server/modules/routing/readwritesplit/rwsplit_mysql.c
index 68ca4a3ef..e4e4e0d6e 100644
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.c
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.c
@@ -369,7 +369,7 @@ void check_session_command_reply(GWBUF *writebuf, sescmd_cursor_t *scur, backend
 
         ss_dassert(len + 4 == GWBUF_LENGTH(scur->scmd_cur_cmd->my_sescmd_buf));
 
-        MXS_ERROR("Failed to execute session command in %s:%d. Error was: %s %s",
+        MXS_ERROR("Failed to execute session command in [%s]:%d. Error was: %s %s",
                   bref->ref->server->name,
                   bref->ref->server->port, err, replystr);
         MXS_FREE(err);
diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.c b/server/modules/routing/readwritesplit/rwsplit_route_stmt.c
index 5f020065f..98277e048 100644
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.c
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.c
@@ -209,7 +209,7 @@ bool route_session_write(ROUTER_CLIENT_SES *router_cli_ses,
             if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO) &&
                 BREF_IS_IN_USE((&backend_ref[i])))
             {
-                MXS_INFO("Route query to %s \t%s:%d%s",
+                MXS_INFO("Route query to %s \t[%s]:%d%s",
                          (SERVER_IS_MASTER(backend_ref[i].ref->server)
                           ? "master" : "slave"),
                          backend_ref[i].ref->server->name,
@@ -316,7 +316,7 @@ bool route_session_write(ROUTER_CLIENT_SES *router_cli_ses,
 
             if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO))
             {
-                MXS_INFO("Route query to %s \t%s:%d%s",
+                MXS_INFO("Route query to %s \t[%s]:%d%s",
                          (SERVER_IS_MASTER(backend_ref[i].ref->server)
                           ? "master" : "slave"),
                          backend_ref[i].ref->server->name,
@@ -339,7 +339,7 @@ bool route_session_write(ROUTER_CLIENT_SES *router_cli_ses,
             if (sescmd_cursor_is_active(scur) && &backend_ref[i] != router_cli_ses->rses_master_ref)
             {
                 nsucc += 1;
-                MXS_INFO("Backend %s:%d already executing sescmd.",
+                MXS_INFO("Backend [%s]:%d already executing sescmd.",
                          backend_ref[i].ref->server->name,
                          backend_ref[i].ref->server->port);
             }
@@ -351,7 +351,7 @@ bool route_session_write(ROUTER_CLIENT_SES *router_cli_ses,
                 }
                 else
                 {
-                    MXS_ERROR("Failed to execute session command in %s:%d",
+                    MXS_ERROR("Failed to execute session command in [%s]:%d",
                               backend_ref[i].ref->server->name,
                               backend_ref[i].ref->server->port);
                 }
@@ -607,7 +607,7 @@ bool rwsplit_get_dcb(DCB **p_dcb, ROUTER_CLIENT_SES *rses, backend_type_t btype,
                 }
                 else
                 {
-                    MXS_INFO("Server %s:%d is too much behind the master, %d s. and can't be chosen.",
+                    MXS_INFO("Server [%s]:%d is too much behind the master, %d s. and can't be chosen.",
                              b->server->name, b->server->port, b->server->rlag);
                 }
             }
@@ -1230,7 +1230,7 @@ handle_got_target(ROUTER_INSTANCE *inst, ROUTER_CLIENT_SES *rses,
 
     ss_dassert(target_dcb != NULL);
 
-    MXS_INFO("Route query to %s \t%s:%d <",
+    MXS_INFO("Route query to %s \t[%s]:%d <",
              (SERVER_IS_MASTER(bref->ref->server) ? "master"
               : "slave"), bref->ref->server->name, bref->ref->server->port);
     /**
diff --git a/server/modules/routing/readwritesplit/rwsplit_select_backends.c b/server/modules/routing/readwritesplit/rwsplit_select_backends.c
index 2309f9cb8..b0e812ea8 100644
--- a/server/modules/routing/readwritesplit/rwsplit_select_backends.c
+++ b/server/modules/routing/readwritesplit/rwsplit_select_backends.c
@@ -277,7 +277,7 @@ bool select_connect_backend_servers(backend_ref_t **p_master_ref,
             {
                 if (BREF_IS_IN_USE((&backend_ref[i])))
                 {
-                    MXS_INFO("Selected %s in \t%s:%d",
+                    MXS_INFO("Selected %s in \t[%s]:%d",
                              STRSRVSTATUS(backend_ref[i].ref->server),
                              backend_ref[i].ref->server->name,
                              backend_ref[i].ref->server->port);
@@ -443,7 +443,7 @@ static bool connect_server(backend_ref_t *bref, MXS_SESSION *session, bool execu
         }
         else
         {
-            MXS_ERROR("Failed to execute session command in %s (%s:%d). See earlier "
+            MXS_ERROR("Failed to execute session command in %s ([%s]:%d). See earlier "
                       "errors for more details.",
                       bref->ref->server->unique_name,
                       bref->ref->server->name,
@@ -456,7 +456,7 @@ static bool connect_server(backend_ref_t *bref, MXS_SESSION *session, bool execu
     }
     else
     {
-        MXS_ERROR("Unable to establish connection with server %s:%d",
+        MXS_ERROR("Unable to establish connection with server [%s]:%d",
                   serv->name, serv->port);
     }
 
@@ -489,26 +489,26 @@ static void log_server_connections(select_criteria_t select_criteria,
             switch (select_criteria)
             {
             case LEAST_GLOBAL_CONNECTIONS:
-                MXS_INFO("MaxScale connections : %d in \t%s:%d %s",
+                MXS_INFO("MaxScale connections : %d in \t[%s]:%d %s",
                          b->server->stats.n_current, b->server->name,
                          b->server->port, STRSRVSTATUS(b->server));
                 break;
 
             case LEAST_ROUTER_CONNECTIONS:
-                MXS_INFO("RWSplit connections : %d in \t%s:%d %s",
+                MXS_INFO("RWSplit connections : %d in \t[%s]:%d %s",
                          b->connections, b->server->name,
                          b->server->port, STRSRVSTATUS(b->server));
                 break;
 
             case LEAST_CURRENT_OPERATIONS:
-                MXS_INFO("current operations : %d in \t%s:%d %s",
+                MXS_INFO("current operations : %d in \t[%s]:%d %s",
                          b->server->stats.n_current_ops,
                          b->server->name, b->server->port,
                          STRSRVSTATUS(b->server));
                 break;
 
             case LEAST_BEHIND_MASTER:
-                MXS_INFO("replication lag : %d in \t%s:%d %s",
+                MXS_INFO("replication lag : %d in \t[%s]:%d %s",
                          b->server->rlag, b->server->name,
                          b->server->port, STRSRVSTATUS(b->server));
             default:
diff --git a/server/modules/routing/readwritesplit/rwsplit_session_cmd.c b/server/modules/routing/readwritesplit/rwsplit_session_cmd.c
index 72b474073..c22687fd5 100644
--- a/server/modules/routing/readwritesplit/rwsplit_session_cmd.c
+++ b/server/modules/routing/readwritesplit/rwsplit_session_cmd.c
@@ -216,7 +216,7 @@ GWBUF *sescmd_cursor_process_replies(GWBUF *replybuf,
                             RW_CLOSE_BREF(&ses->rses_backend_ref[i]);
                         }
                         *reconnect = true;
-                        MXS_INFO("Disabling slave %s:%d, result differs from "
+                        MXS_INFO("Disabling slave [%s]:%d, result differs from "
                                  "master's result. Master: %d Slave: %d",
                                  ses->rses_backend_ref[i].ref->server->name,
                                  ses->rses_backend_ref[i].ref->server->port,
diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c
index e4beff9d3..9baf801d4 100644
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@@ -2065,7 +2065,7 @@ static int routeQuery(MXS_ROUTER* instance,
         bref = get_bref_from_dcb(router_cli_ses, target_dcb);
         scur = &bref->bref_sescmd_cur;
 
-        MXS_INFO("Route query to \t%s:%d <",
+        MXS_INFO("Route query to \t[%s]:%d <",
                  bref->bref_backend->server->name,
                  bref->bref_backend->server->port);
         /**
@@ -2413,7 +2413,7 @@ static void clientReply(MXS_ROUTER* instance,
 
             ss_dassert(len + 4 == GWBUF_LENGTH(scur->scmd_cur_cmd->my_sescmd_buf));
 
-            MXS_ERROR("Failed to execute %s in %s:%d. %s %s",
+            MXS_ERROR("Failed to execute %s in [%s]:%d. %s %s",
                       cmdstr,
                       bref->bref_backend->server->name,
                       bref->bref_backend->server->port,
@@ -2481,7 +2481,7 @@ static void clientReply(MXS_ROUTER* instance,
     if (sescmd_cursor_is_active(scur))
     {
 
-        MXS_INFO("Backend %s:%d processed reply and starts to execute "
+        MXS_INFO("Backend [%s]:%d processed reply and starts to execute "
                  "active cursor.",
                  bref->bref_backend->server->name,
                  bref->bref_backend->server->port);
@@ -2714,7 +2714,7 @@ static bool connect_backend_servers(backend_ref_t*   backend_ref,
         {
             SERVER_REF* b = backend_ref[i].bref_backend;
 
-            MXS_INFO("MaxScale connections : %d (%d) in \t%s:%d %s",
+            MXS_INFO("MaxScale connections : %d (%d) in \t[%s]:%d %s",
                      b->connections,
                      b->server->stats.n_current,
                      b->server->name,
@@ -2782,7 +2782,7 @@ static bool connect_backend_servers(backend_ref_t*   backend_ref,
                 {
                     succp = false;
                     MXS_ERROR("Unable to establish "
-                              "connection with slave %s:%d",
+                              "connection with slave [%s]:%d",
                               b->server->name,
                               b->server->port);
                     /* handle connect error */
@@ -2822,7 +2822,7 @@ static bool connect_backend_servers(backend_ref_t*   backend_ref,
 
                 if (BREF_IS_IN_USE((&backend_ref[i])))
                 {
-                    MXS_INFO("Connected %s in \t%s:%d",
+                    MXS_INFO("Connected %s in \t[%s]:%d",
                              STRSRVSTATUS(b->server),
                              b->server->name,
                              b->server->port);
@@ -3381,7 +3381,7 @@ static bool route_session_write(ROUTER_CLIENT_SES* router_cli_ses,
 
             if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO))
             {
-                MXS_INFO("Route query to %s\t%s:%d%s",
+                MXS_INFO("Route query to %s\t[%s]:%d%s",
                          (SERVER_IS_MASTER(backend_ref[i].bref_backend->server) ?
                           "master" : "slave"),
                          backend_ref[i].bref_backend->server->name,
@@ -3488,7 +3488,7 @@ static bool route_session_write(ROUTER_CLIENT_SES* router_cli_ses,
 
             if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO))
             {
-                MXS_INFO("Route query to %s\t%s:%d%s",
+                MXS_INFO("Route query to %s\t[%s]:%d%s",
                          (SERVER_IS_MASTER(backend_ref[i].bref_backend->server) ?
                           "master" : "slave"),
                          backend_ref[i].bref_backend->server->name,
@@ -3513,7 +3513,7 @@ static bool route_session_write(ROUTER_CLIENT_SES* router_cli_ses,
             {
                 succp = true;
 
-                MXS_INFO("Backend %s:%d already executing sescmd.",
+                MXS_INFO("Backend [%s]:%d already executing sescmd.",
                          backend_ref[i].bref_backend->server->name,
                          backend_ref[i].bref_backend->server->port);
             }
@@ -3524,7 +3524,7 @@ static bool route_session_write(ROUTER_CLIENT_SES* router_cli_ses,
                 if (!succp)
                 {
                     MXS_ERROR("Failed to execute session "
-                              "command in %s:%d",
+                              "command in [%s]:%d",
                               backend_ref[i].bref_backend->server->name,
                               backend_ref[i].bref_backend->server->port);
                 }