diff --git a/ChangeLog b/ChangeLog
index 9dc71166f5..c4da5ff2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 17 18:34:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (vm_xrealloc): free as like standard free if size is zero.
+
 Thu Sep 17 15:41:02 2009  Koichi Sasada  <ko1@atdot.net>
 
 	* eval_intern.h: use rb_node_newnode() directly.
diff --git a/gc.c b/gc.c
index dc8916b885..6469e98b58 100644
--- a/gc.c
+++ b/gc.c
@@ -604,6 +604,8 @@ garbage_collect_with_gvl(rb_objspace_t *objspace)
     }
 }
 
+static void vm_xfree(rb_objspace_t *objspace, void *ptr);
+
 static void *
 vm_xmalloc(rb_objspace_t *objspace, size_t size)
 {
@@ -652,7 +654,10 @@ vm_xrealloc(rb_objspace_t *objspace, void *ptr, size_t size)
 	negative_size_allocation_error("negative re-allocation size");
     }
     if (!ptr) return ruby_xmalloc(size);
-    if (size == 0) size = 1;
+    if (size == 0) {
+	vm_xfree(objspace, ptr);
+	return 0;
+    }
     if (ruby_gc_stress && !ruby_disable_gc_stress)
 	garbage_collect_with_gvl(objspace);