diff --git a/Makefile.am b/Makefile.am
index 433eefeb..dca37c85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,16 @@
 ## Process this file with automake to produce Makefile.in
+AM_CXXFLAGS = -std=gnu++11
+
 ACLOCAL_AMFLAGS = -I m4
 
 AUTOMAKE_OPTIONS = foreign
 
 # Build . before src so that our all-local and clean-local hooks kicks in at
 # the right time.
 SUBDIRS = googletest googlemock
 
 EXTRA_DIST = \
   BUILD.bazel \
   CMakeLists.txt \
   README.md \
   WORKSPACE
diff --git a/ci/build-linux-autotools.sh b/ci/build-linux-autotools.sh
index 8954a4f0..385e8c21 100755
--- a/ci/build-linux-autotools.sh
+++ b/ci/build-linux-autotools.sh
@@ -1,44 +1,44 @@
 #!/usr/bin/env bash
 # Copyright 2017 Google Inc.
 # All Rights Reserved.
 #
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
 # in the documentation and/or other materials provided with the
 # distribution.
 #     * Neither the name of Google Inc. nor the names of its
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 set -e
 
 . ci/get-nprocessors.sh
 
 # Create the configuration script
 autoreconf -i
 
 # Run in a subdirectory to keep the sources clean
 mkdir build || true
 cd build
-../configure CXX="-std=c++11"
+../configure
 
 make -j {NPROCESSORS:-2}