diff --git a/.gdbinit b/.gdbinit
index 2e882cd19b..3ecc8f5a8c 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,3 +1,6 @@
+if dummy_gdb_enums.special_consts
+end
+
 define rp
   if (VALUE)$arg0 & RUBY_FIXNUM_FLAG
     printf "FIXNUM: %ld\n", $arg0 >> 1
@@ -217,6 +220,9 @@ define rp
     output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
     printf "): "
     print *(NODE *)$arg0
+  if ($flags & RUBY_T_MASK) == RUBY_T_ZOMBIE
+    printf "T_ZOMBIE: "
+    print (struct RData *)$arg0
   else
     printf "unknown: "
     print (struct RBasic *)$arg0
@@ -251,6 +257,7 @@ define rp
   end
   end
   end
+  end
 end
 document rp
   Print a Ruby's VALUE.
diff --git a/ChangeLog b/ChangeLog
index 934878099c..6ce9f145ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Dec 27 17:08:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .gdbinit (dummy_gdb_enums.special_consts): forces to load debug
+	  info on Mac OS X.
+
+	* .gdbinit (rp): added T_ZOMBIE.
+
 Sat Dec 27 16:18:02 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* eval.c (rb_frame_callee, rb_frame_caller): rb_frame_callee()