diff --git a/src/main/java/net/floodlightcontroller/jython/Server.java b/src/main/java/net/floodlightcontroller/jython/Server.java
index 2f909ab8419a984f8061232bc4b02d2320079c95..47ec1a52a930a4cf6c1734627c2154c50d91fbaa 100644
--- a/src/main/java/net/floodlightcontroller/jython/Server.java
+++ b/src/main/java/net/floodlightcontroller/jython/Server.java
@@ -32,6 +32,7 @@ public class Server extends Thread {
 			this.locals = new HashMap<String, Object>();
 		}
 		this.locals.put("log", Server.log);
+		this.setName("debugserver");
 	}
 
     /**
diff --git a/src/main/python/debugserver.py b/src/main/python/debugserver.py
index 5eb3f60a46d2bc645f6e7f72fe64737358b02fc6..d8c81f9d49c3ff1c1e77f3b04acefa9dbfbf93e5 100644
--- a/src/main/python/debugserver.py
+++ b/src/main/python/debugserver.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import sys
+from threading import currentThread
 from SocketServer import BaseRequestHandler, TCPServer
 from code import InteractiveConsole
 
@@ -37,7 +38,8 @@ class DebugConsole(InteractiveConsole):
 
 class DebugServerHandler(BaseRequestHandler):
     def __init__(self, request, client_address, server):
-        _log.debug('Open connection to DebugServer from: %s' % str(client_address))
+        currentThread()._thread.setName("debugserver-%s:%d" % client_address)
+        _log.debug('Open connection to DebugServer from %s:%d' % client_address)
         BaseRequestHandler.__init__(self, request, client_address, server)
 
     def handle(self):
@@ -51,13 +53,14 @@ class DebugServer(TCPServer):
     allow_reuse_address = True
 
     def handle_error(self, request, client_address):
-        _log.debug('Closing connection to DebugServer from: %s' % str(client_address))
+        _log.debug('Closing connection to DebugServer from %s:%d' % client_address)
         request.close()
 
 def run_server(port=6655, host='0.0.0.0', locals=locals()):
+    currentThread()._thread.setName("debugserver-main")
+
     global _locals
     _locals = locals
-
     if "log" in locals.keys():
         global _log
         _log = locals["log"]