diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b5f99b55b7..32c1447ceab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-14  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable.
+	(gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin)
+	(gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint)
+	(gdb-goto-breakpoint): Generalise for breakpoints with multiple
+	locations.
+	(gdb-info-breakpoints-custom, gdb-assembler-custom)
+	(gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp.
+	(gdb-put-breakpoint-icon): Only display icon for parent breakpoint.
+
 2007-11-11  Juanma Barranquero  <lekktu@gmail.com>
 
 	* international/iso-cvt.el (iso-translate-conventions): Doc fix.