diff --git a/ChangeLog b/ChangeLog
index d742bf253d04..1a06c97419d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-26  Jason Merrill  <jason@redhat.com>
+
+	* configure.ac: When bootstrapping with GCC, add -std=c++98 to CXX.
+	* configure: Regenerate.
+
 2015-05-16  James Bowman  <james.bowman@ftdichip.com>
 
 	* configure.ac: FT32 target added.
diff --git a/configure b/configure
index d8043298ad09..633afa405a41 100755
--- a/configure
+++ b/configure
@@ -5407,6 +5407,12 @@ $as_echo "$as_me: WARNING: trying to bootstrap a cross compiler" >&2;}
     ;;
 esac
 
+# When bootstrapping with GCC, build stage 1 in C++98 mode to ensure that a
+# C++98 compiler can still start the bootstrap.
+if test "$enable_bootstrap:$GXX" = "yes:yes"; then
+  CXX="$CXX -std=c++98"
+fi
+
 # Used for setting $lt_cv_objdir
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
diff --git a/configure.ac b/configure.ac
index 4da04b76fdf8..431cb170e163 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1442,6 +1442,12 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in
     ;;
 esac
 
+# When bootstrapping with GCC, build stage 1 in C++98 mode to ensure that a
+# C++98 compiler can still start the bootstrap.
+if test "$enable_bootstrap:$GXX" = "yes:yes"; then
+  CXX="$CXX -std=c++98"
+fi
+
 # Used for setting $lt_cv_objdir
 _LT_CHECK_OBJDIR