diff --git a/ChangeLog b/ChangeLog
index 9680bf58a5..0f96ac49a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct  2 15:47:55 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: batfile should be CRLF'ed.
+
 Mon Oct  2 01:24:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (test-all): separate directory where running test cases
diff --git a/instruby.rb b/instruby.rb
index b54ff816df..be68feb579 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -262,8 +262,8 @@ install?(:local, :comm, :bin) do
 
     if ruby_bin_dosish
       batfile = File.join(bindir, name + ".bat")
-      open_for_install(batfile, "wb") {|b|
-	b.print((<<EOH+shebang+body.chomp+<<EOF).gsub(/^\s+/, '').gsub(/^$/, "\r"))
+      open_for_install(batfile, "w") {|b|
+	b.print(<<EOH+shebang+body+<<EOF)
 @echo off
 @if not "%~d0" == "~d0" goto WinNT
 #{ruby_bin_dosish} -x "#{batfile}" %1 %2 %3 %4 %5 %6 %7 %8 %9