diff --git a/source/java/org/alfresco/filesys/ftp/FTPNetworkServer.java b/source/java/org/alfresco/filesys/ftp/FTPNetworkServer.java
index ecba21b326..a185206f88 100644
--- a/source/java/org/alfresco/filesys/ftp/FTPNetworkServer.java
+++ b/source/java/org/alfresco/filesys/ftp/FTPNetworkServer.java
@@ -46,6 +46,10 @@ public class FTPNetworkServer extends NetworkFileServer implements Runnable
 
     // Constants
     //
+    
+    // Session Thread group
+    private static final ThreadGroup THREAD_GROUP_SESSION = new ThreadGroup("FTP_SESSION_GROUP");
+    
     // Server version
 
     private static final String ServerVersion = "3.5.0";
@@ -446,7 +450,7 @@ public class FTPNetworkServer extends NetworkFileServer implements Runnable
 
                 // Start the new session in a seperate thread
 
-                Thread srvThread = new Thread(srvSess);
+                Thread srvThread = new Thread(THREAD_GROUP_SESSION, srvSess);
                 srvThread.setDaemon(true);
                 srvThread.setName("Sess_FTP" + srvSess.getSessionId() + "_"
                         + sessSock.getInetAddress().getHostAddress());
diff --git a/source/java/org/alfresco/filesys/smb/server/NetBIOSSessionSocketHandler.java b/source/java/org/alfresco/filesys/smb/server/NetBIOSSessionSocketHandler.java
index 2d3b1c693f..9fa5b20a46 100644
--- a/source/java/org/alfresco/filesys/smb/server/NetBIOSSessionSocketHandler.java
+++ b/source/java/org/alfresco/filesys/smb/server/NetBIOSSessionSocketHandler.java
@@ -29,6 +29,8 @@ import org.alfresco.filesys.smb.mailslot.TcpipNetBIOSHostAnnouncer;
  */
 public class NetBIOSSessionSocketHandler extends SessionSocketHandler
 {
+    // Session Thread group
+    private static final ThreadGroup THREAD_GROUP_SESSION = new ThreadGroup("NETBIOS_SESSION_GROUP");
 
     /**
      * Class constructor
@@ -96,7 +98,7 @@ public class NetBIOSSessionSocketHandler extends SessionSocketHandler
 
                     // Start the new session in a seperate thread
 
-                    Thread srvThread = new Thread(srvSess);
+                    Thread srvThread = new Thread(THREAD_GROUP_SESSION, srvSess);
                     srvThread.setDaemon(true);
                     srvThread.setName("Sess_N" + srvSess.getSessionId() + "_"
                             + sessSock.getInetAddress().getHostAddress());
diff --git a/source/java/org/alfresco/filesys/smb/server/TcpipSMBSessionSocketHandler.java b/source/java/org/alfresco/filesys/smb/server/TcpipSMBSessionSocketHandler.java
index bbc6a235d3..a00f863407 100644
--- a/source/java/org/alfresco/filesys/smb/server/TcpipSMBSessionSocketHandler.java
+++ b/source/java/org/alfresco/filesys/smb/server/TcpipSMBSessionSocketHandler.java
@@ -28,6 +28,8 @@ import org.alfresco.filesys.smb.TcpipSMB;
  */
 public class TcpipSMBSessionSocketHandler extends SessionSocketHandler
 {
+    // Session Thread group
+    private static final ThreadGroup THREAD_GROUP_SESSION = new ThreadGroup("SMB_SESSION_GROUP");
 
     /**
      * Class constructor
@@ -95,7 +97,7 @@ public class TcpipSMBSessionSocketHandler extends SessionSocketHandler
 
                     // Start the new session in a seperate thread
 
-                    Thread srvThread = new Thread(srvSess);
+                    Thread srvThread = new Thread(THREAD_GROUP_SESSION, srvSess);
                     srvThread.setDaemon(true);
                     srvThread.setName("Sess_T" + srvSess.getSessionId() + "_"
                             + sessSock.getInetAddress().getHostAddress());
diff --git a/source/java/org/alfresco/filesys/smb/server/win32/Win32NetBIOSSessionSocketHandler.java b/source/java/org/alfresco/filesys/smb/server/win32/Win32NetBIOSSessionSocketHandler.java
index 8574cbe223..407b01f6ac 100644
--- a/source/java/org/alfresco/filesys/smb/server/win32/Win32NetBIOSSessionSocketHandler.java
+++ b/source/java/org/alfresco/filesys/smb/server/win32/Win32NetBIOSSessionSocketHandler.java
@@ -53,6 +53,10 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
 
     // Constants
     //
+    
+    // Session Thread group
+    private static final ThreadGroup THREAD_GROUP_SESSION = new ThreadGroup("W32NETBIOS_SESSION_GROUP");
+
     // Default LANA offline polling interval
 
     public static final long LANAPollingInterval = 5000; // 5 seconds
@@ -605,7 +609,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
 
                 // Start the new session in a seperate thread
 
-                Thread srvThread = new Thread(srvSess);
+                Thread srvThread = new Thread(THREAD_GROUP_SESSION, srvSess);
                 srvThread.setDaemon(true);
                 srvThread.setName("Sess_W" + srvSess.getSessionId() + "_LSN" + lsn);
                 srvThread.start();
@@ -750,7 +754,7 @@ public class Win32NetBIOSSessionSocketHandler extends SessionSocketHandler imple
 
                 // Start the new session in a seperate thread
 
-                Thread srvThread = new Thread(srvSess);
+                Thread srvThread = new Thread(THREAD_GROUP_SESSION, srvSess);
                 srvThread.setDaemon(true);
                 srvThread.setName("Sess_WS" + srvSess.getSessionId());
                 srvThread.start();