diff --git a/ChangeLog b/ChangeLog
index f5412449ffd8ac..b93e6d27b9c60c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug  9 13:24:25 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/win32.[ch]: emulate rename(2).
+
 Tue Aug  8 14:01:46 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 	* ext/tcltklib/tcltklib.c: support --enable-tcltk_stubs
diff --git a/version.h b/version.h
index d3dcaa3e10fd31..40dea33192bf51 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.5.5"
-#define RUBY_RELEASE_DATE "2000-08-08"
+#define RUBY_RELEASE_DATE "2000-08-09"
 #define RUBY_VERSION_CODE 155
-#define RUBY_RELEASE_CODE 20000808
+#define RUBY_RELEASE_CODE 20000809
diff --git a/win32/win32.c b/win32/win32.c
index 7d589ec593b6d3..d7f12d3f0b74f2 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2432,3 +2432,51 @@ win32_getenv(const char *name)
 
     return curitem;
 }
+
+int
+myrename(const char *oldpath, const char *newpath)
+{
+    int res = 0;
+    int oldatts;
+    int newatts;
+
+    oldatts = GetFileAttributes(oldpath);
+    newatts = GetFileAttributes(newpath);
+
+    if (oldatts == -1) {
+	printf("file to move doesn't exist");
+	return -1;
+    }
+
+    if (newatts != -1 && newatts & FILE_ATTRIBUTE_READONLY)
+	SetFileAttributesA(newpath, newatts & ~ FILE_ATTRIBUTE_READONLY);
+
+    if (!MoveFile(oldpath, newpath))
+	res = -1;
+
+    if (res == 0 || (GetLastError() != ERROR_ALREADY_EXISTS
+		  && GetLastError() != ERROR_FILE_EXISTS))
+	goto done;
+
+    if (IsWinNT()) {
+	if (MoveFileEx(oldpath, newpath, MOVEFILE_REPLACE_EXISTING))
+	    res = 0;
+    } else {
+	for (;;) {
+	    if (!DeleteFile(newpath) && GetLastError() != ERROR_FILE_NOT_FOUND)
+		break;
+	    else if (MoveFile(oldpath, newpath)) {
+		  res = 0;
+		  break;
+	    }
+	}
+    }
+
+done:
+    if (res)
+	errno = GetLastError();
+    else
+	SetFileAttributes(newpath, oldatts);
+
+    return res;
+}
diff --git a/win32/win32.h b/win32/win32.h
index add6f142500fad..9e6e1534893bf0 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -207,6 +207,7 @@ extern struct protoent *  mygetprotobynumber(int);
 extern struct servent *  mygetservbyname(char *, char *);
 extern struct servent * mygetservbyport(int, char *);
 extern char *win32_getenv(const char *);
+extern int myrename(const char *, const char *);
 
 extern int chown(const char *, int, int);
 extern int link(char *, char *);
@@ -408,4 +409,9 @@ extern char *mystrerror(int);
 #endif
 #define getenv win32_getenv
 
+#ifdef rename
+#undef rename
+#endif
+#define rename myrename
+
 #endif