diff --git a/ChangeLog b/ChangeLog
index 1f26d0666f..db347b387f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 29 16:11:23 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: clean up temporaly symlink.
+	  [ruby-dev:21420]
+
 Mon Sep 29 11:16:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_thread_atfork): wrong format specifier.
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 3df34504dc..0c81b65675 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -15,13 +15,13 @@ end
 
 def have_symlink?
   begin
-    File.symlink 'not_exist', 'not_exist_2'
+    File.symlink 'not_exist', 'symlink_test'
+    return true
   rescue NotImplementedError
     return false
-  rescue
-    return true
+  ensure
+    File.unlink 'symlink_test' if File.symlink?('symlink_test')
   end
-  true   # never reach
 end