diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5a982ee70f7..666add9e1c9e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-12  Nathan Sidwell  <nathan@acm.org>
+
+	* diagnostic.c (diagnostc_report_diagnostic): Fix formatting.
+
 2016-10-12  Pierre-Marie de Rodat  <derodat@adacore.com>
 
 	* dwarf2out.c (int_loc_descriptor): Generate opcodes for another
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 167a1b587664..2304e14c7618 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -877,13 +877,15 @@ diagnostic_report_diagnostic (diagnostic_context *context,
 		}
 	    }
 	}
+
       /* This tests if the user provided the appropriate -Werror=foo
 	 option.  */
       if (diag_class == DK_UNSPECIFIED
-	  && context->classify_diagnostic[diagnostic->option_index] != DK_UNSPECIFIED)
-	{
-	  diagnostic->kind = context->classify_diagnostic[diagnostic->option_index];
-	}
+	  && (context->classify_diagnostic[diagnostic->option_index]
+	      != DK_UNSPECIFIED))
+	diagnostic->kind
+	  = context->classify_diagnostic[diagnostic->option_index];
+
       /* This allows for future extensions, like temporarily disabling
 	 warnings for ranges of source code.  */
       if (diagnostic->kind == DK_IGNORED)