diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 54ed2133451..df3811ce543 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-15  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	* call.c (build_conditional_expr_1): Use OPT_Wextra in warning.
+
 2014-08-14  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* typeck.c (composite_pointer_type, cxx_sizeof_or_alignof_type,
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 43bfe504d21..7044e149115 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5017,7 +5017,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3,
 					type_promotes_to (arg3_type)))))
         {
           if (complain & tf_warning)
-            warning_at (loc, 0, "enumeral and non-enumeral type in "
+            warning_at (loc, OPT_Wextra, "enumeral and non-enumeral type in "
 			"conditional expression");
         }