diff --git a/ChangeLog b/ChangeLog
index b27cdecbdd..d8d6d710a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul  7 01:24:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_extname): fix for file name with spaces.
+	  [ruby-talk:307404]
+
 Sun Jul  6 01:44:46 2008  Tanaka Akira  <akr@fsij.org>
 
 	* Makefile.in (update-rubyspec): create intermediate directories
diff --git a/file.c b/file.c
index ba490c0894..ca80795817 100644
--- a/file.c
+++ b/file.c
@@ -3044,7 +3044,7 @@ rb_file_s_extname(klass, fname)
 		p = last;
 		break;
 	    }
-	    e = dot;
+	    if (*last == '.') e = dot;
 	    continue;
 #else
 	    e = p;	  /* get the last dot of the last component */