diff --git a/ChangeLog b/ChangeLog
index 4752aaec09..90b598d391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 15 15:09:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/setup.mak: strip out empty lines from CPP output.
+
 Tue Jan 15 03:41:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
diff --git a/win32/setup.mak b/win32/setup.mak
index 13b5edd23f..86f6f6ae55 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -115,7 +115,8 @@ int main(int argc, char **argv)
 	@del rtname.*
 
 -version-: nul
-	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
+	@$(APPEND)
+	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
 #include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR