diff --git a/ChangeLog b/ChangeLog
index e4f5dc73fd..34933ec745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 20 21:25:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (MATCH_DATA): access via rb_svar().
+
 Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* eval.c, intern.h (rb_svar): return reference to special variable
diff --git a/eval.c b/eval.c
index b5fcdb1597..23fd32fa42 100644
--- a/eval.c
+++ b/eval.c
@@ -1726,7 +1726,7 @@ copy_node_scope(node, rval)
     POP_ITER();\
 }
 
-#define MATCH_DATA ruby_scope->local_vars[node->nd_cnt]
+#define MATCH_DATA *rb_svar(node->nd_cnt)
 
 static char* is_defined _((VALUE, NODE*, char*));