diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3147eeb91e1..2b5568504d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-20  Marek Polacek  <polacek@redhat.com>
+
+	* common.opt (fsanitize-undefined-trap-on-error): Add Driver.
+
 2015-06-19  Kaz Kojima  <kkojima@gcc.gnu.org>
 
 	PR target/66591
diff --git a/gcc/common.opt b/gcc/common.opt
index 32b416a324f..dd49ae31880 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -918,7 +918,7 @@ Common Report
 This switch is deprecated; use -fsanitize-recover= instead
 
 fsanitize-undefined-trap-on-error
-Common Report Var(flag_sanitize_undefined_trap_on_error) Init(0)
+Common Driver Report Var(flag_sanitize_undefined_trap_on_error) Init(0)
 Use trap instead of a library function for undefined behavior sanitization
 
 fasynchronous-unwind-tables