diff --git a/ChangeLog b/ChangeLog
index 09894199..165f400a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@ Michael Voigt
   Jackdmp changes log
 ---------------------------
 
+2008-11-17 Stephane Letz  <letz@grame.fr>
+
+	* Use JACK_DRIVER_DIR variable in internal clients loader.
+
 2008-11-16 Stephane Letz  <letz@grame.fr>
 
 	* Client and library global context cleanup in case of incorrect shutdown handling (that is applications not correctly closing client after server has shutdown).
diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp
index a8d2a9f5..13087448 100644
--- a/common/JackInternalClient.cpp
+++ b/common/JackInternalClient.cpp
@@ -19,14 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "JackSystemDeps.h"
-
-#ifndef WIN32
-#ifndef ADDON_DIR
-#include "config.h"
-#endif
-#endif
-
 #include "JackGraphManager.h"
+#include "JackConstants.h"
 #include "JackInternalClient.h"
 #include "JackLockedEngine.h"
 #include "JackServer.h"
@@ -79,7 +73,10 @@ static void PrintLoadError(const char* so_name)
 
 static void BuildClientPath(char* path_to_so, int path_len, const char* so_name)
 {
-    snprintf(path_to_so, path_len, ADDON_DIR "/%s.so", so_name);
+    const char* driver_dir;
+    if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) 
+        driver_dir = ADDON_DIR;
+    snprintf(path_to_so, path_len, "%s/%s.so", driver_dir, so_name);
 }
 
 #endif
diff --git a/example-clients/alias.c b/example-clients/alias.c
index 9d1b098b..87a19b88 100644
--- a/example-clients/alias.c
+++ b/example-clients/alias.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <getopt.h>
 #include <jack/jack.h>
-//#include <config.h>
 
 char * my_name;
 
diff --git a/posix/JackPosixServerLaunch.cpp b/posix/JackPosixServerLaunch.cpp
index 645f0a1a..99aa4f05 100644
--- a/posix/JackPosixServerLaunch.cpp
+++ b/posix/JackPosixServerLaunch.cpp
@@ -18,10 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
-#ifndef JACK_LOCATION
-#include "config.h"
-#endif
-
+#include "JackConstants.h"
 #include "JackChannel.h"
 #include "JackLibGlobals.h"
 #include "JackServerLaunch.h"