diff --git a/ChangeLog b/ChangeLog
index 6d4770b33b..cb040e4c97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 27 09:41:54 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* tool/rbinstall.rb (install?(:local, :comm, :bin, :'bin-comm')):
+	  Makes it vim friendly.  __END__ in a heredoc is confusing with 
+	  the script end for vim.
+
 Sun Dec 27 09:13:55 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* sample/occur2.rb: have been broken. fixed for Ruby 1.9 feature.
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 4263cdaced..cf5827e6e2 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -424,18 +424,18 @@ install?(:local, :comm, :bin, :'bin-comm') do
     open_for_install(cmd, $script_mode) do
       case $cmdtype
       when "bat"
-        "#{<<EOH}#{shebang}#{body}#{<<EOF}".gsub(/$/, "\r")
-@echo off
-@if not "%~d0" == "~d0" goto WinNT
-#{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-@goto endofruby
-:WinNT
-"%~dp0#{ruby_install_name}" -x "%~f0" %*
-@goto endofruby
-EOH
-__END__
-:endofruby
-EOF
+        [<<-"EOH".gsub(/^\s+/, ''), shebang, body, <<-"EOF".gsub(/^\s+/, '')].join.gsub(/$/, "\r")
+          @echo off
+          @if not "%~d0" == "~d0" goto WinNT
+          #{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+          @goto endofruby
+          :WinNT
+          "%~dp0#{ruby_install_name}" -x "%~f0" %*
+          @goto endofruby
+        EOH
+          __END__
+          :endofruby
+        EOF
       when "cmd"
         "#{<<"/EOH"}#{shebang}#{body}"
 @"%~dp0#{ruby_install_name}" -x "%~f0" %*