diff --git a/ChangeLog b/ChangeLog
index 872c754110..58b9381c36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 17 12:21:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (RUNRUBY): added RUNRUBYOPT.
+
 Mon Dec 17 11:38:59 2007  Tanaka Akira  <akr@fsij.org>
 
 	* thread_win32.ci (native_thread_create): initialize
diff --git a/Makefile.in b/Makefile.in
index 8dbb27f74f..32b698a0df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ EXEEXT = @EXEEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@
+RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
 
 #### End of system configuration section. ####
 
diff --git a/configure.in b/configure.in
index a011b38fa4..c352118fd7 100644
--- a/configure.in
+++ b/configure.in
@@ -1314,7 +1314,7 @@ if test x"$cross_compiling" = xyes; then
 else
   MINIRUBY='./miniruby$(EXEEXT)'
   PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
 fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)