diff --git a/configure.ac b/configure.ac
index aa947ef..b749ad3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,6 @@ if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then
 	ac_cv_sys_largefile_LIBS=""
 fi
 CFLAGS="$CFLAGS $ac_cv_sys_largefile_CFLAGS"
-CXXFLAGS='-std=c++0x'
 LDFLAGS="$LDFLAGS $ac_cv_sys_largefile_LDFLAGS"
 LIBS="$LIBS $ac_cv_sys_largefile_LIBS"
 
@@ -37,7 +36,6 @@ CFLAGS="-Wall -Werror"
 AC_PROG_CXX
 AC_ENABLE_CXXMPH
 if test x$cxxmph = xtrue; then
-	CXXFLAGS="$CXXFLAGS -std=c++0x"
 	AC_SUBST([CXXMPH], "cxxmph")
 fi
 
diff --git a/cxxmph/Makefile.am b/cxxmph/Makefile.am
index 662f488..2d44345 100644
--- a/cxxmph/Makefile.am
+++ b/cxxmph/Makefile.am
@@ -1,3 +1,4 @@
+AM_CXXFLAGS='-std=c++0x'
 TESTS = $(check_PROGRAMS)
 check_PROGRAMS = mph_map_test mph_table_test trigraph_test
 noinst_PROGRAMS = bm_numbers bm_urls