diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs
index 3b1a2e7a..29d174de 100644
--- a/websocket-sharp/Server/HttpServer.cs
+++ b/websocket-sharp/Server/HttpServer.cs
@@ -630,9 +630,17 @@ namespace WebSocketSharp.Server
       return !(usr || port) ? "The secure connection requires a server certificate." : null;
     }
 
+    private static string convertToString (System.Net.IPAddress address)
+    {
+      var str = address.ToString ();
+      return address.AddressFamily == AddressFamily.InterNetworkV6
+             ? String.Format ("[{0}]", str)
+             : str;
+    }
+
     private void init (string hostname, System.Net.IPAddress address, int port, bool secure)
     {
-      _hostname = hostname ?? address.ToString ();
+      _hostname = hostname ?? convertToString (address);
       _address = address;
       _port = port;
       _secure = secure;