diff --git a/ChangeLog b/ChangeLog
index 197907a177..7cf52e36a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-Sat Sep 27 03:57:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep 27 04:28:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rmext): preceding dots are not a part of extension.
 
+	* file.c (rb_file_s_extname): ditto.
+
 Sat Sep 27 03:15:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm.c (vm_jump_tag_but_local_jump): exc is not used if val is nil.
diff --git a/file.c b/file.c
index e16f4a83bc..1b4894d5cb 100644
--- a/file.c
+++ b/file.c
@@ -3144,6 +3144,7 @@ rb_file_s_extname(VALUE klass, VALUE fname)
 	name = ++p;
 
     e = 0;
+    while (*p && *p == '.') p++;
     while (*p) {
 	if (*p == '.' || istrailinggabage(*p)) {
 #if USE_NTFS