diff --git a/ChangeLog b/ChangeLog
index 8204f798d7..fdac357873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Mon Dec 15 14:15:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 15 14:39:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call0): NODE_ZSUPER supported.  [ruby-core:20480]
 
 	* vm_eval.c (vm_call_super): uses method_missing().
 
diff --git a/vm_eval.c b/vm_eval.c
index be3c0fc5be..20d7c920d6 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -35,6 +35,7 @@ vm_call0(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid,
 	blockptr = th->passed_block;
 	th->passed_block = 0;
     }
+  again:
     switch (nd_type(body)) {
       case RUBY_VM_METHOD_NODE:{
 	rb_control_frame_t *reg_cfp;
@@ -99,6 +100,16 @@ vm_call0(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid,
 			      recv, klass, argc, (VALUE *)argv, blockptr);
 	break;
       }
+      case NODE_ZSUPER:{
+	klass = RCLASS_SUPER(klass);
+	if (!klass || !(body = rb_method_node(klass, id))) {
+	    return method_missing(recv, id, argc, argv, 0);
+	}
+	RUBY_VM_CHECK_INTS();
+	nosuper = CALL_SUPER;
+	body = body->nd_body;
+	goto again;
+      }
       default:
 	rb_bug("unsupported: vm_call0(%s)", ruby_node_name(nd_type(body)));
     }