diff --git a/ChangeLog b/ChangeLog
index ad174b8028..1cd0944e14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 25 02:45:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (rb_file_s_rename): avoid Cygwin's bug.
+
 Sat Feb 24 22:14:00 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* win32/win32.c (myrename): fix error handling.
diff --git a/file.c b/file.c
index c4e6781ae7..c8970f787c 100644
--- a/file.c
+++ b/file.c
@@ -1252,8 +1252,13 @@ rb_file_s_rename(obj, from, to)
     Check_SafeStr(from);
     Check_SafeStr(to);
 
-    if (rename(RSTRING(from)->ptr, RSTRING(to)->ptr) < 0)
+    if (rename(RSTRING(from)->ptr, RSTRING(to)->ptr) < 0) {
+#if defined __CYGWIN__
+	extern unsigned long __attribute__((stdcall)) GetLastError();
+	errno = GetLastError(); /* This is a Cygwin bug */
+#endif
 	rb_sys_fail(RSTRING(from)->ptr);
+    }
 
     return INT2FIX(0);
 }