diff --git a/ChangeLog b/ChangeLog
index e3abd08faf..7984b1174e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 26 16:41:35 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (ntfs_tail): filename which starts with '.' is valid.
+
+	* file.c (file_expand_path): cygwin symlink support.
+
 Mon May 26 07:15:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_dump.c (rb_vm_bugreport): rb_make_backtrace has no arguments.
diff --git a/file.c b/file.c
index e695582d04..d5f39c7979 100644
--- a/file.c
+++ b/file.c
@@ -2555,6 +2555,7 @@ rb_path_end(const char *path)
 static char *
 ntfs_tail(const char *path)
 {
+    while (*path == '.') path++;
     while (*path && *path != ':') {
 	if (istrailinggabage(*path)) {
 	    const char *last = path++;
@@ -2869,7 +2870,7 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
 #ifdef __CYGWIN__
 	    if (lnk_added && len > 4 &&
 		STRCASECMP(wfd.cFileName + len - 4, ".lnk") == 0) {
-		len -= 4;
+		wfd.cFileName[len -= 4] = '\0';
 	    }
 #endif
 	    if (!p) p = buf;