diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4669e8aee4..5b829c2d95 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-08  Thiemo Seufer  <ths@mips.com>
+
+	* breakpoint.c (update_breakpoints_after_exec): Fix type mismatch.
+
 2006-08-08  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* symfile.c (download_write_size): Remove.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 98db140158..dcf33e3310 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1327,7 +1327,7 @@ update_breakpoints_after_exec (void)
 	(b->type == bp_catch_vfork) ||
 	(b->type == bp_catch_fork))
       {
-	b->loc->address = (CORE_ADDR) NULL;
+	b->loc->address = (CORE_ADDR) 0;
 	continue;
       }
 
@@ -1380,7 +1380,7 @@ update_breakpoints_after_exec (void)
        unnecessary.  A call to breakpoint_re_set_one always recomputes
        the breakpoint's address from scratch, or deletes it if it can't.
        So I think this assignment could be deleted without effect.  */
-    b->loc->address = (CORE_ADDR) NULL;
+    b->loc->address = (CORE_ADDR) 0;
   }
   /* FIXME what about longjmp breakpoints?  Re-create them here?  */
   create_overlay_event_breakpoint ("_ovly_debug_event");