diff --git a/ChangeLog b/ChangeLog
index 070a970b6b..032e75d334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jan  9 14:25:00 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
+	  (VisualC++6) so use -O2b2xg- if  $(MSC_VER) < 1400. [ruby-core:7040]
+
+	* lib/webrick/httpservlet/filehandler.rb: fixed typo. (Kero van Gelder)
+	  [ruby-core:7075]
+
 Sun Jan  8 14:15:27 2006  Tanaka Akira  <akr@m17n.org>
 
 	* eval.c (GCC_VERSION_BEFORE): check __INTEL_COMPILER.
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 918393dbd4..ae30c436fe 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -51,7 +51,7 @@ module WEBrick
               return true
             end
           rescue
-            if HTTPUtils::split_header_valie(ir).member?(res['etag'])
+            if HTTPUtils::split_header_value(ir).member?(res['etag'])
               return true
             end
           end
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index fbb0a12fa5..613297950d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -76,8 +76,12 @@ ARCH = $(PROCESSOR_ARCHITECTURE)
 DEBUGFLAGS = -Zi
 !endif
 !if !defined(OPTFLAGS)
+!if $(MSC_VER) < 1400
+OPTFLAGS = -O2b2xg-
+!else
 OPTFLAGS = -O2b2xty-
 !endif
+!endif
 !if !defined(OS)
 OS = mswin32
 !endif