diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5594cff69071ffeca359e3b60d14122fa2db77f6..adafb71444b902d80605e0e4c0cc3dd335d8d2bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,6 +95,7 @@ message ( STATUS "ROOT_VERSION: ${ROOT_VERSION}" )
 # Configure BOOST
 find_package( Boost 1.49 REQUIRED )
 add_definitions( -DBOOST_SPIRIT_USE_PHOENIX_V3 )
+set ( ENV{Boost_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} )
 
 # Configure Geant4
 if(DD4HEP_USE_GEANT4)
diff --git a/DDCore/include/DD4hep/config.h b/DDCore/include/DD4hep/config.h
index e00188d628d2848f188c2a416fad3f7d45379e98..e80a1e4924fc3d03e86b3e5c937ffb47d2dd1d5d 100644
--- a/DDCore/include/DD4hep/config.h
+++ b/DDCore/include/DD4hep/config.h
@@ -20,7 +20,7 @@
 
 #define DD4HEP_CONDITIONS_DEBUG  1
 /// Valid implementations of the Gaudi plugin service are 1 and 2
-#define DD4HEP_PLUGINSVC_VERSION 1
+#define DD4HEP_PLUGINSVC_VERSION 2
 
 #ifdef DD4HEP_INSTANCE_COUNTS
 #define INCREMENT_COUNTER InstanceCount::increment(this)
diff --git a/cmake/MakeGaudiMap.cmake b/cmake/MakeGaudiMap.cmake
index 30cfd7fd752e3fb6b40c73d5abae9129ee6449f3..0301cc7fb255146af4f34a42b2e42bf54afecfde 100644
--- a/cmake/MakeGaudiMap.cmake
+++ b/cmake/MakeGaudiMap.cmake
@@ -9,9 +9,9 @@ message(STATUS " *** Gaudi listcomponents: Generate map for ${libname} ..." )
     ) 
 
   if(APPLE)
-    SET ( ENV{DYLD_LIBRARY_PATH} ${genmap_install_dir}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH}:${Boost_LIBRARY_DIRS} )
+    SET ( ENV{DYLD_LIBRARY_PATH} ${genmap_install_dir}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH}:$ENV{Boost_LIBRARY_DIRS} )
     EXECUTE_PROCESS( COMMAND echo DYLD_LIBRARY_PATH = $ENV{DYLD_LIBRARY_PATH} )
-    EXECUTE_PROCESS( COMMAND echo Boost_LIBRARY_DIRS = ${Boost_LIBRARY_DIRS} )
+    EXECUTE_PROCESS( COMMAND echo Boost_LIBRARY_DIRS = $ENV{Boost_LIBRARY_DIRS} )
   else()
     SET ( ENV{LD_LIBRARY_PATH} ${genmap_install_dir}:$ENV{LD_LIBRARY_PATH} )
     #SET ( ENV{LD_PRELOAD} /lib64/libglapi.so )