diff --git a/ChangeLog b/ChangeLog
index 4e0f1663eb..197b9b5d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 26 15:29:55 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (CPP): check predefined value.
+
 Tue Sep 26 07:55:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_shift): should not move memory region if array
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 706c078b54..c4e2f2c66d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -40,7 +40,7 @@ VPATH = $(srcdir);$(srcdir)/missing;$(srcdir)/win32
 !if !defined(CC)
 CC = cl
 !endif
-!if !defined(CPP)
+!if !defined(CPP) || "$(CPP)" == "cl"
 CPP = $(CC) -E
 !endif
 !if !defined(YACC)