diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be124600231..77ba518910b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-13  Seongbae Park <seongbae.park@gmail.com>
+
+	* common.opt (femit-class-debug-always): Turn off by default.
+
 2007-09-13  Bernd Schmidt  <bernd.schmidt@analog.com>
 
 	* config/bfin/bfin.md (reload_outpdi, reload_inpdi): New patterns.
diff --git a/gcc/common.opt b/gcc/common.opt
index a2afcf277ae..909c57bf0ac 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -456,7 +456,7 @@ Common Report Var(flag_eliminate_unused_debug_types) Init(1)
 Perform unused type elimination in debug info
 
 femit-class-debug-always
-Common Report Var(flag_emit_class_debug_always) Init(1)
+Common Report Var(flag_emit_class_debug_always) Init(0)
 Do not suppress C++ class debug information.
 
 fexceptions