diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 82fa1b47de..36547a3b94 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* NEWS (set breakpoint condition-evaluation): Change "gdb" to "host".
+	Describe also the option "auto".
+
 2012-03-22  Richard Henderson  <rth@redhat.com>
 
 	* sparc-linux-nat.c (_initialize_sparc_linux_nat): Fix prototype.
diff --git a/gdb/NEWS b/gdb/NEWS
index 696de32204..f21921a038 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -102,8 +102,9 @@ HP OpenVMS ia64			ia64-hp-openvms*
 
 set breakpoint condition-evaluation
 show breakpoint condition-evaluation
-  Controls whether breakpoint conditions are evaluated by GDB ("gdb") or by
-  GDBserver ("target").
+  Controls whether breakpoint conditions are evaluated by GDB ("host") or by
+  GDBserver ("target").  Default option "auto" chooses the most efficient
+  available mode.
   This option can improve debugger efficiency depending on the speed of the
   target.