diff --git a/silecs-cli-client/Makefile b/silecs-cli-client/Makefile
index 5edb7ed9a5675c2b257062df8e9711c8ff46e309..9a2fe659b369b923a38841b8247152b4ccbe7b2a 100644
--- a/silecs-cli-client/Makefile
+++ b/silecs-cli-client/Makefile
@@ -21,7 +21,7 @@ SKIP_MANIFEST = TRUE
 #local
 #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
 #global
-COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
+COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.13.2
 
 #Enable C++11 Support
 COMPILER_FLAGS += -std=c++11
diff --git a/silecs-cli-client/Makefile.dep b/silecs-cli-client/Makefile.dep
index 08237c8e940d25bbe0401bd84cba02686d906e99..2089ed97f10c7b38e1a016c6063c0dbb67c2e811 100644
--- a/silecs-cli-client/Makefile.dep
+++ b/silecs-cli-client/Makefile.dep
@@ -4,14 +4,12 @@ SILECS_COMM_VERSION = 1.0.2
 BOOST_HOME ?= /acc/local/$(CPU)/3rdparty/boost/$(BOOST_VERSION)
 
 #for compile out of eclipse
-SILECS_COMM_HOME ?= ../../git/silecs-communication-cpp/build
-#SILECS_COMM_HOME ?= ../silecs-communication-cpp/build
+SILECS_COMM_HOME ?= ../silecs-communication-cpp/build
 
 LIBXML_PATH ?= /usr/include/libxml2/
 
 #for compile out of eclipse
-SNAP7_BASE ?= ../../git/snap7/snap7-full
-#SNAP7_BASE ?= ../snap7/snap7-full
+SNAP7_BASE ?= ../snap7/snap7-full
 
 DEPENDENT_COMPILER_OPTIONS += -I$(SILECS_COMM_HOME)/include
 DEPENDENT_COMPILER_OPTIONS += -I$(LIBXML_PATH)
diff --git a/silecs-communication-cpp/Makefile b/silecs-communication-cpp/Makefile
index 421366cf28c2209f9909bb1cb2da7867ea3a1c6b..1a542d42493eb2fa631e2d610e9c70b523986167 100644
--- a/silecs-communication-cpp/Makefile
+++ b/silecs-communication-cpp/Makefile
@@ -21,7 +21,7 @@ SKIP_MANIFEST = TRUE
 #local
 #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
 #global
-COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
+COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.13.2
 
 # product configuration
 LIB_NAME = comm
diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile
index 8af309c71ac5a8b2307304a2cc788a3923e2c426..fc5a1765efd6a22b6388add313f7e34ded9effc6 100644
--- a/silecs-diagnostic-cpp/Makefile
+++ b/silecs-diagnostic-cpp/Makefile
@@ -21,7 +21,7 @@ SKIP_MANIFEST = TRUE
 #local
 #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
 #global
-COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
+COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.13.2
 
 # product configuration
 BIN_NAME = $(PROJECT)-$(PRODUCT)