diff --git a/config.mk.in b/config.mk.in
index 6e0aa0a6..d4afbca9 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -1,6 +1,7 @@
 CC = @CC@
-CFLAGS = @CFLAGS@
-CXXFLAGS += -fPIC -std=c++0x
+CXX = @CXX@
+CFLAGS += @CFLAGS@
+CXXFLAGS += -fPIC -std=c++11 @CXXFLAGS@
 SQLPP = @SQLPP@
 
 XML2_CPPFLAGS = @XML2_CPPFLAGS@
diff --git a/configure.ac b/configure.ac
index 08c1920b..35194bcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,6 +377,7 @@ AC_MSG_RESULT([  PointCloud is now configured for ${host}])
 AC_MSG_RESULT()
 AC_MSG_RESULT([ -------------- Compiler Info ------------- ])
 AC_MSG_RESULT([  C compiler:           ${CC} ${CFLAGS}])
+AC_MSG_RESULT([  CXX compiler:         ${CXX} ${CXXFLAGS}])
 AC_MSG_RESULT([  SQL preprocessor:     ${SQLPP}])
 AC_MSG_RESULT()
 AC_MSG_RESULT([ -------------- Dependencies -------------- ])