diff --git a/ChangeLog b/ChangeLog
index b055d7be22..10eaa11ce4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  6 12:04:30 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): use sub! instead of []= because
+	  []= causes exception.
+
 Thu Jun  6 11:42:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* lib/thread.rb (Queue::pop): get rid of race condition.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 03422778cb..c75c248ab4 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -254,7 +254,7 @@ config.h: Makefile $(srcdir)/win32/Makefile.sub
 
 config.status: Makefile $(srcdir)/win32/Makefile.sub $(MINIRUBY)
 	@echo Creating config.status
-	@$(MINIRUBY) -pe "chomp(' ');~/@CFLAGS@/||$$_['$(CFLAGS)']='$$(CFLAGS)'" << > $@
+	@$(MINIRUBY) -pe "~/@CFLAGS@/||$$_.sub!(/#{Regexp.quote('$(CFLAGS)')}/o, '$$(CFLAGS)')" << > $@
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
 s,@CFLAGS@,$(CFLAGS),;t t