diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ef271e8f48..d703ee7cbba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-17  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-locals-watch-map)
+	(gdb-locals-watch-map-1): Suppress keymap first.
+	(gdb-edit-locals-map-1): New variable.
+	(gdb-edit-locals-value): New function.
+	(gdb-stack-list-locals-handler): Use them.
+
 2006-08-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mouse.el (global-map): Allow yanking with mouse-2 at a spot whose