diff --git a/ChangeLog b/ChangeLog
index 9a747b9c51..e463a4505a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 19 23:40:37 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* variable.c (remove_trace): should not access already freed area.
+
+	* variable.c (rb_f_untrace_var): fix memory leak.
+
 Fri Oct 19 17:55:14 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* marshal.c (w_uclass): cloned class is not user
diff --git a/variable.c b/variable.c
index 71f8585def..70cd46e1ce 100644
--- a/variable.c
+++ b/variable.c
@@ -598,7 +598,9 @@ remove_trace(entry)
 	    trace->next = next->next;
 	    free(next);
 	}
-	trace = next;
+	else {
+	    trace = next;
+	}
     }
     entry->trace = t.next;
 }
@@ -629,7 +631,6 @@ rb_f_untrace_var(argc, argv)
 	    trace->removed = 1;
 	    trace = next;
 	}
-	entry->trace = 0;
 
 	if (!entry->block_trace) remove_trace(entry);
 	return ary;
diff --git a/version.h b/version.h
index 8e3e276976..9bef25f4e7 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.7.1"
-#define RUBY_RELEASE_DATE "2001-10-19"
+#define RUBY_RELEASE_DATE "2001-10-21"
 #define RUBY_VERSION_CODE 171
-#define RUBY_RELEASE_CODE 20011019
+#define RUBY_RELEASE_CODE 20011021