diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22535bd2223b..cfd0a864e0b4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-10  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/51806
+	* opts.c (common_handle_option): Handle -Werror.
+
 2012-01-10  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* config/m68k/sync.md ("atomic_compare_and_swap<mode>_1"): Fix
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 95ce166a2043..10a9ddd86eae 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-10  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/51806
+	* c-opts.c (c_common_handle_option): Move -Werror handling
+	to language independent code.
+
 2012-01-05  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/51764
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 3a4d8a87f62d..4f0d8861470b 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -449,10 +449,6 @@ c_common_handle_option (size_t scode, const char *arg, int value,
       cpp_opts->warn_endif_labels = value;
       break;
 
-    case OPT_Werror:
-      global_dc->warning_as_error_requested = value;
-      break;
-
     case OPT_Wformat:
       set_Wformat (value);
       break;
diff --git a/gcc/opts.c b/gcc/opts.c
index 2ed556030eb2..6532b56d7528 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1420,6 +1420,10 @@ common_handle_option (struct gcc_options *opts,
       /* Currently handled in a prescan.  */
       break;
 
+    case OPT_Werror:
+      dc->warning_as_error_requested = value;
+      break;
+
     case OPT_Werror_:
       if (lang_mask == CL_DRIVER)
 	break;