diff --git a/ChangeLog b/ChangeLog
index 5f74db4b8f..52035b900f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  3 13:18:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_live_slot): live slot count should not include final
+	  slot (contains T_ZOMBIE) count.
+
 Tue Jun  3 13:03:21 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (obj_free): fix spacing.
diff --git a/gc.c b/gc.c
index 3b0becadf8..30938e1563 100644
--- a/gc.c
+++ b/gc.c
@@ -2743,7 +2743,7 @@ lazy_sweep_enable(void)
 static size_t
 objspace_live_slot(rb_objspace_t *objspace)
 {
-    return objspace->profile.total_allocated_object_num - objspace->profile.total_freed_object_num;
+    return objspace->profile.total_allocated_object_num - objspace->profile.total_freed_object_num - heap_pages_final_slots;
 }
 
 static size_t