diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6344a539492099bc1876ade232b60cbde0898b31..47d414190a3ce50fb16cb50f6508259ee1da8454 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-12  Jason Merrill  <jason@redhat.com>
+
+	* common.opt (fabi-version): Change default to 0.
+
 2014-06-12  Jason Merrill  <jason@redhat.com>
 
 	* toplev.c (process_options): Reject -fabi-version=1.
diff --git a/gcc/common.opt b/gcc/common.opt
index f61fab52b73476cc1552fad88a165a1958d77e6e..7f0509229d01ba90a8354d16ea184c28bfec30e7 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -808,7 +808,8 @@ Driver Undocumented
 ; Additional positive integers will be assigned as new versions of
 ; the ABI become the default version of the ABI.
 fabi-version=
-Common Joined RejectNegative UInteger Var(flag_abi_version) Init(2)
+Common Joined RejectNegative UInteger Var(flag_abi_version) Init(0)
+The version of the C++ ABI in use
 
 faggressive-loop-optimizations
 Common Report Var(flag_aggressive_loop_optimizations) Optimization Init(1)