diff --git a/ChangeLog b/ChangeLog
index f4beb044..989b0508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,7 +36,7 @@ Valerio Pilo
 
 2011-03-13 Stephane Letz  <letz@grame.fr>
 
-	* Correct JackNetMaster::SetBufferSize.
+	* Rework internal slave driver management, JackServerGlobals now handle same parameters as jackdmp.
 
 2011-03-11 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackServerGlobals.cpp b/common/JackServerGlobals.cpp
index 10349078..16523d03 100644
--- a/common/JackServerGlobals.cpp
+++ b/common/JackServerGlobals.cpp
@@ -363,8 +363,7 @@ bool JackServerGlobals::Init()
             if (!driver_desc) {
                 jack_error("jackdmp: unknown slave driver '%s'", name);
             } else {
-                JackDriverInfo* info = fInstance->AddSlave(driver_desc, NULL);
-                (*it1).second = info;
+                (*it1).second = fInstance->AddSlave(driver_desc, NULL);
             }
         }
 
@@ -374,7 +373,7 @@ bool JackServerGlobals::Init()
             if (!driver_desc) {
                 jack_error("jackdmp: unknown driver '%s'", "loopback");
             } else {
-                fInstance->AddSlave(driver_desc, NULL);
+                fSlavesList["loopback"] = fInstance->AddSlave(driver_desc, NULL);
             }
         }