diff --git a/ChangeLog b/ChangeLog
index c7c846b8f0..f555b70bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/debug.rb (debug_command): added a deficient format specifier.
+	  fixed: [ruby-core:05419]
+
 Sat Jul  9 22:02:37 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid 
+	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
 	  in Ruby and C by INT2NUM and NUM2INT.
 
 	* ext/win32ole/win32ole.c (ole_invoke2): ditto.
@@ -31,7 +36,7 @@ Wed Jul  6 18:45:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sample/svr.rb: service can be stopped by ill-behaved client; use
-	  tsvr.rb instead. 
+	  tsvr.rb instead.
 
 Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
diff --git a/lib/debug.rb b/lib/debug.rb
index 356a72a11b..70e8aea148 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -255,7 +255,7 @@ class Context
 
   def debug_command(file, line, id, binding)
     MUTEX.lock
-    unless $debugger_restart
+    unless defined?($debugger_restart) and $debugger_restart
       callcc{|c| $debugger_restart = c} 
       at_exit {
         $debugger_restart.call
@@ -330,7 +330,7 @@ class Context
 	when /^\s*wat(?:ch)?\s+(.+)$/
 	  exp = $1
 	  break_points.push [true, 1, exp]
-	  stdout.printf "Set watchpoint %d\n", break_points.size, exp
+	  stdout.printf "Set watchpoint %d:%s\n", break_points.size, exp
 
 	when /^\s*b(?:reak)?$/
 	  if break_points.find{|b| b[1] == 0}