diff --git a/ChangeLog b/ChangeLog
index 366bf422df..dfd779699d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 26 14:38:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: install goruby if exists.
+
 Wed Dec 26 13:55:02 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/csv.rb:  Cleaned up some code with Ruby 1.9 idioms.
diff --git a/instruby.rb b/instruby.rb
index 4c3ee35d02..ac1ed63ea1 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -165,6 +165,7 @@ exeext = CONFIG["EXEEXT"]
 
 ruby_install_name = CONFIG["ruby_install_name"]
 rubyw_install_name = CONFIG["rubyw_install_name"]
+goruby_install_name = "go" + ruby_install_name
 
 version = CONFIG["ruby_version"]
 bindir = CONFIG["bindir"]
@@ -193,6 +194,9 @@ install?(:local, :arch, :bin) do
   if rubyw_install_name and !rubyw_install_name.empty?
     install rubyw_install_name+exeext, bindir, :mode => 0755
   end
+  if File.exist? goruby_install_name+exeext
+    install goruby_install_name+exeext, bindir, :mode => 0755
+  end
   if enable_shared and dll != lib
     install dll, bindir, :mode => 0755
   end