diff --git a/ChangeLog b/ChangeLog
index 6c97ffef77..b20564d0f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 19 22:03:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: add -DNT to $CFLAGS instead of $CPPFLAGS.
+
+	* win32/setup.mak: ditto.
+
 Fri Apr 19 16:22:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index fcef0aad66..23688ebbaa 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -65,10 +65,10 @@ prefix = /usr
 DESTDIR = $(prefix)
 !endif
 !if !defined(CFLAGS)
-CFLAGS = -nologo -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
+CFLAGS = -nologo -MD -DNT=1 $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
 !endif
 !if !defined(CPPFLAGS)
-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing -DLIBRUBY_SO=\"$(LIBRUBY_SO)\" -DNT=1
+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing -DLIBRUBY_SO=\"$(LIBRUBY_SO)\"
 !endif
 !if !defined(LDFLAGS)
 LDFLAGS = $(CFLAGS) -Fm
diff --git a/win32/setup.mak b/win32/setup.mak
index 0c0acfa1e6..353493a1c9 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -19,8 +19,8 @@ Makefile:
 	@echo RUBY_INSTALL_NAME = ruby>> $@
 	@echo RUBY_SO_NAME = $(OS)-$$(RUBY_INSTALL_NAME)17>> $@
 	@echo prefix = /usr>> $@
-	@echo CFLAGS = -nologo -MD $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)>> $@
-	@echo CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\" -DNT=1>> $@
+	@echo CFLAGS = -nologo -MD -DNT=1 $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)>> $@
+	@echo CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\">> $@
 	@echo LDFLAGS = $$(CFLAGS) -Fm>> $@
 	@echo XLDFLAGS = >> $@
 	@echo RFLAGS = -r>> $@