diff --git a/ChangeLog b/ChangeLog
index b61599e73d..0f441041bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 14 08:48:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
+	  space and compiler command line.
+
 Sun Nov 14 04:22:32 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
 
 	* symbian/setup (config.h): Added HAVE_LABS and HAVE_LLABS to config.h.
diff --git a/win32/setup.mak b/win32/setup.mak
index 1004eca771..45fcee0956 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -60,7 +60,7 @@ NTVER = $(NTVER)
 !endif
 <<
 !if !defined(BASERUBY)
-	@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I >> $(MAKEFILE)
+	@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE)
 !endif
 
 -system-vars-: -runtime- -unicows-
@@ -76,7 +76,7 @@ NTVER = $(NTVER)
 	@echo TARGET_OS = mswin64 >>$(MAKEFILE)
 
 -runtime-: nul
-	$(CC) -MD <<rtname.c user32.lib -link > nul
+	@$(CC) -MD <<rtname.c user32.lib -link > nul
 #include <windows.h>
 #include <memory.h>
 #include <string.h>