diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index d7821bd9e..ef8852ebf 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -43,7 +43,7 @@ endif
 
 OS := $(shell uname)
 
-COMMON_CFLAGS = -g $(C_OPT) -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wmissing-declarations -Wstrict-prototypes -fno-strict-aliasing -march=native -m64 -I$(SPDK_ROOT_DIR)/include
+COMMON_CFLAGS = -g $(C_OPT) -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wmissing-declarations -fno-strict-aliasing -march=native -m64 -I$(SPDK_ROOT_DIR)/include
 
 ifeq ($(CONFIG_WERROR), y)
 COMMON_CFLAGS += -Werror
@@ -94,7 +94,8 @@ SPDK_PCIACCESS_CFLAGS=-DUSE_PCIACCESS
 COMMON_CFLAGS += $(SPDK_PCIACCESS_CFLAGS)
 endif
 
-CFLAGS   += $(COMMON_CFLAGS) -Wno-pointer-sign -std=gnu99
+CFLAGS   += $(COMMON_CFLAGS) -Wno-pointer-sign -Wstrict-prototypes -std=gnu99
+CXXFLAGS += $(COMMON_CFLAGS) -std=c++0x
 
 ifeq ($(CONFIG_ADDRESS_SANITIZER),y)
 COMMON_CFLAGS += -fsanitize=address