diff --git a/ChangeLog b/ChangeLog
index 4b873ff8fe..a13bbebba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 17 11:31:47 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak (MAKE): workaround for nmake 8.
+
 Tue Jan 17 11:06:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8.
diff --git a/win32/setup.mak b/win32/setup.mak
index 4779741752..ab7960090e 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -37,6 +37,7 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
 -basic-vars-: nul
 	@type << > $(MAKEFILE)
 ### Makefile for ruby $(OS) ###
+MAKE = nmake
 srcdir = $(srcdir:\=/)
 prefix = $(prefix:\=/)
 EXTSTATIC = $(EXTSTATIC)