diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index fff25c5..79e8025 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -43,3 +43,7 @@ CHECK_RELEASE = YES
 
 # MSVC - skip defining min()/max() macros
 USR_CPPFLAGS_WIN32 += -DNOMINMAX
+
+ifneq ($(filter-out msvc,$(CMPLR_CLASS)),)
+USR_CXXFLAGS += -std=c++11
+endif
diff --git a/src/Makefile b/src/Makefile
index 5036cfd..e55ca07 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,8 +7,6 @@ include $(TOP)/configure/CONFIG
 
 USR_CPPFLAGS += -DPVXS_API_BUILDING
 
-USR_CXXFLAGS += -std=c++11
-
 # fault on any undefined symbols (eg. from missing LIB_SYS_LIBS)
 USR_LDFLAGS_Linux += -Wl,--no-undefined -Wl,--no-allow-shlib-undefined
 USR_LDFLAGS_DEFAULT +=
diff --git a/test/Makefile b/test/Makefile
index 573bf41..c6ed78c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,8 +8,6 @@ include $(TOP)/configure/CONFIG
 # access to private headers
 USR_CPPFLAGS += -I$(TOP)/src
 
-USR_CXXFLAGS += -std=c++11
-
 PROD_LIBS += pvxs Com
 
 TESTPROD += testsock
diff --git a/tools/Makefile b/tools/Makefile
index 0e81413..64eefaa 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,8 +8,6 @@ include $(TOP)/configure/CONFIG
 # access to private headers
 USR_CPPFLAGS += -I$(TOP)/src
 
-USR_CXXFLAGS += -std=c++11
-
 PROD_LIBS += pvxs Com
 
 PROD += pvxvct