diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
index bf842f7a2..928990970 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
@@ -211,7 +211,7 @@ public final class Socks5Proxy {
 
             if (this.serverSocket != null) {
                 this.serverThread = new Thread(this.serverProcess);
-                this.serverThread.setName("Smack Local SOCKS5 Proxy");
+                this.serverThread.setName("Smack Local SOCKS5 Proxy [" + this.serverSocket + ']');
                 this.serverThread.setDaemon(true);
                 this.serverThread.start();
             }