diff --git a/silecs-cli-client/Makefile b/silecs-cli-client/Makefile
index 621bb4bec8569d2c64519818449dffb56e57b202..5edb7ed9a5675c2b257062df8e9711c8ff46e309 100644
--- a/silecs-cli-client/Makefile
+++ b/silecs-cli-client/Makefile
@@ -23,6 +23,9 @@ SKIP_MANIFEST = TRUE
 #global
 COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
 
+#Enable C++11 Support
+COMPILER_FLAGS += -std=c++11
+
 # product configuration
 BIN_NAME = $(PROJECT)-$(PRODUCT)
 DBG = false
diff --git a/silecs-communication-cpp/Makefile b/silecs-communication-cpp/Makefile
index d3f59590009d7309b58d15790ec3e83734a8d8ec..421366cf28c2209f9909bb1cb2da7867ea3a1c6b 100644
--- a/silecs-communication-cpp/Makefile
+++ b/silecs-communication-cpp/Makefile
@@ -35,6 +35,9 @@ MINOR ?= 0
 PATCH ?= 0
 COMPILER_FLAGS = -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) -DPATCH=$(PATCH)
 
+#Enable C++11 Support
+COMPILER_FLAGS += -std=c++11
+
 # Comment IN/Out to enable NI-Support
 #COMPILER_FLAGS += -DNI_SUPPORT_ENABLED=TRUE
 
diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile
index 396512dbd962525bf90956d0d29c0bf403e8d828..8af309c71ac5a8b2307304a2cc788a3923e2c426 100644
--- a/silecs-diagnostic-cpp/Makefile
+++ b/silecs-diagnostic-cpp/Makefile
@@ -30,6 +30,10 @@ DBG = false
 #DEFINES = -DWITH_RBAC -D_REENTRANT -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 DEFINES = -D_REENTRANT -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 COMPILER_FLAGS = -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -mtune=generic $(DEFINES)
+
+#Enable C++11 Support
+COMPILER_FLAGS += -std=c++11
+
 LINKER_FLAGS = -Wl,-O1
 
 # list Qt generated files