diff --git a/client/Makefile.in b/client/Makefile.in
index 0ce15e2..157643f 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -95,7 +95,7 @@ DEPENDS= \
 	$(BASEDIR)/client/src/include/lib3270/ipc/*.h \
 
 CFLAGS= \
-	@CFLAGS@ \
+	@CXXFLAGS@ \
 	-I$(BASEDIR)/common/src/include \
 	-Isrc/include \
 	-DBUILD_DATE=`date +%Y%m%d` \
diff --git a/configure.ac b/configure.ac
index 5d96a47..59a49e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,7 @@ case "$host" in
 
  	*)
 		CFLAGS="$CFLAGS -pthread"
+		CXXFLAGS="$CXXFLAGS -pthread"
 		LDFLAGS="$LDFLAGS -pthread"
 		app_cv_datadir="/usr/share"
 		app_cv_confdir="/etc"
@@ -388,6 +389,28 @@ if test "$app_cv_pic" == "yes"; then
 fi
 
 dnl ---------------------------------------------------------------------------
+dnl Check for C++ 2011 support
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
+
+AX_CHECK_COMPILE_FLAG([-std=gnu++11], [CXXFLAGS="$CXXFLAGS -std=gnu++11"])
+
+
+dnl ---------------------------------------------------------------------------
 dnl Configure which files to generate.
 dnl ---------------------------------------------------------------------------
 
--
libgit2 0.21.2