diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aaad736d9d..3211a43164 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-20  Keith Seitz  <keiths@redhat.com>
+
+	* breakpoint.h (struct breakpoint): Add comment to
+	extra_string indicating that this member is mallod'd.
+	* breakpoint.c (base_breakpoint_dtor): Free extra_string.
+
 2013-03-20  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/15289
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 0ff4683362..c844187467 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -12788,6 +12788,7 @@ base_breakpoint_dtor (struct breakpoint *self)
 {
   decref_counted_command_line (&self->commands);
   xfree (self->cond_string);
+  xfree (self->extra_string);
   xfree (self->addr_string);
   xfree (self->filter);
   xfree (self->addr_string_range_end);
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 7a2c629dfe..68f3ed9abe 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -726,7 +726,8 @@ struct breakpoint
        there is no condition.  */
     char *cond_string;
 
-    /* String form of extra parameters, or NULL if there are none.  */
+    /* String form of extra parameters, or NULL if there are none.
+     Malloc'd.  */
     char *extra_string;
 
     /* Holds the address of the related watchpoint_scope breakpoint