diff --git a/ChangeLog b/ChangeLog
index ebe58b7351..47741c41aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 21 23:07:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (win32_stat): WinNT/2k "//host/share" support.
+
 Wed Mar 21 08:05:35 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* win32/dir.h: replace missing/dir.h .
diff --git a/win32/win32.c b/win32/win32.c
index 6f16d4ad06..55e863be94 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2663,6 +2663,24 @@ myrename(const char *oldpath, const char *newpath)
     return res;
 }
 
+static int
+isUNCRoot(const char *path)
+{
+    if (path[0] == '\\' && path[1] == '\\') {
+	const char *p;
+	if (p = strchr(path + 3, '\\')) {
+	    if (!p[1])
+		return 0;
+	    if (p = strchr(p + 1, '\\')) {
+		if (!p[1])
+		    return 1;
+	    } else
+		return 1;
+	}
+    }
+    return 0;
+}
+
 int
 win32_stat(const char *path, struct stat *st)
 {
@@ -2681,10 +2699,11 @@ win32_stat(const char *path, struct stat *st)
     *s = '\0';
     len = strlen(buf1);
     p = CharPrev(buf1, buf1 + len);
-    if (*p == '\\' || *p == ':')
+    if (isUNCRoot(buf1)) {
+	if (*p != '\\')
+	    strcat(buf1, "\\");
+    } else if (*p == '\\' || *p == ':')
 	strcat(buf1, ".");
-    else if (buf1[0] == '\\' && buf1[1] == '\\')
-	strcat(buf1, "\\.");
     if (_fullpath(buf2, buf1, MAXPATHLEN))
 	return stat(buf2, st);
     else