diff --git a/gearbox/commands/serve.py b/gearbox/commands/serve.py
index f70a010..814a296 100644
--- a/gearbox/commands/serve.py
+++ b/gearbox/commands/serve.py
@@ -689,7 +689,10 @@ def get_request(self):
         server_class = SecureWSGIServer
 
     if threaded:
-        from SocketServer import ThreadingMixIn
+        try:
+            from socketserver import ThreadingMixIn
+        except ImportError:
+            from SocketServer import ThreadingMixIn
         class GearboxWSGIServer(ThreadingMixIn, server_class): pass
         server_type = 'Threaded'
     else: