diff --git a/ChangeLog b/ChangeLog
index 67372ba364..514d362557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr  3 12:43:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (main): passes $(MAKE) to mkmain_cmd
+
+	* ext/extmk.rb (command_output): uses arguments to invoke make.
+
 Mon Mar 30 12:12:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_eval): checks for interrupt, stack and finalizers too.
diff --git a/common.mk b/common.mk
index 1928fdba48..9b12987dcd 100644
--- a/common.mk
+++ b/common.mk
@@ -84,7 +84,7 @@ VCS           = svn
 all: main
 
 main: exts
-	@$(RUNCMD) $(MKMAIN_CMD) MAKE=$(MAKE)
+	@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
 
 exts: $(MKMAIN_CMD)
 
diff --git a/ext/extmk.rb b/ext/extmk.rb
index af28580174..35c7e09128 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -579,9 +579,9 @@ if $command_output
   open($command_output, 'wb') do |f|
     case $command_output
     when /\.sh\z/
-      f.puts message, "rm -f $0; exec #{cmd}"
+      f.puts message, "rm -f $0; exec \"$@\" #{cmd}"
     when /\.bat\z/
-      ["@echo off", message, cmd, "del %0 & exit %ERRORLEVEL%"].each do |s|
+      ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |s|
         f.print s, "\r\n"
       end
     else
diff --git a/version.h b/version.h
index 3cb8d534f2..b17c5f7cec 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-03-30"
+#define RUBY_RELEASE_DATE "2009-04-03"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090330
+#define RUBY_RELEASE_CODE 20090403
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 3
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];