diff --git a/websocket-sharp/Net/HttpListener.cs b/websocket-sharp/Net/HttpListener.cs
index e209b105..dc5ef056 100644
--- a/websocket-sharp/Net/HttpListener.cs
+++ b/websocket-sharp/Net/HttpListener.cs
@@ -74,6 +74,7 @@ namespace WebSocketSharp.Net
     private bool                                                 _disposed;
     private bool                                                 _ignoreWriteExceptions;
     private bool                                                 _listening;
+    private Logger                                               _logger;
     private HttpListenerPrefixCollection                         _prefixes;
     private string                                               _realm;
     private bool                                                 _reuseAddress;
@@ -101,6 +102,8 @@ namespace WebSocketSharp.Net
       _ctxRegistry = new Dictionary<HttpListenerContext, HttpListenerContext> ();
       _ctxRegistrySync = ((ICollection) _ctxRegistry).SyncRoot;
 
+      _logger = new Logger ();
+
       _prefixes = new HttpListenerPrefixCollection (this);
 
       _waitQueue = new List<HttpListenerAsyncResult> ();
@@ -117,6 +120,12 @@ namespace WebSocketSharp.Net
       }
     }
 
+    internal Logger Log {
+      get {
+        return _logger;
+      }
+    }
+
     internal bool ReuseAddress {
       get {
         return _reuseAddress;
diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs
index 4946ec7d..57e84042 100644
--- a/websocket-sharp/Server/HttpServer.cs
+++ b/websocket-sharp/Server/HttpServer.cs
@@ -141,7 +141,7 @@ namespace WebSocketSharp.Server
       _port = port;
       _secure = secure;
       _listener = new HttpListener ();
-      _logger = new Logger ();
+      _logger = _listener.Log;
       _services = new WebSocketServiceManager (_logger);
       _state = ServerState.Ready;
       _sync = new object ();