diff --git a/ChangeLog b/ChangeLog
index 448dd8d152..863e3094ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,7 +47,7 @@ Wed Jun  5 00:09:32 2013  Tanaka Akira  <akr@fsij.org>
 
 Tue Jun  4 23:44:02 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* object.c (rb_Hash): fix docs. patched by Stefan Schüßler.
+	* object.c (rb_Hash): fix docs. patched by Stefan Sch"ussler.
 	  [ruby-core:55299] [Bug #8487]
 
 Tue Jun  4 23:16:49 2013  Benoit Daloze  <eregontp@gmail.com>
diff --git a/tool/mkrunnable.rb b/tool/mkrunnable.rb
index dda49ed769..82de4eee13 100755
--- a/tool/mkrunnable.rb
+++ b/tool/mkrunnable.rb
@@ -36,7 +36,7 @@ end
 
 alias ln_dir_safe ln_safe
 
-if /mingw|mswin/ =~ CROSS_COMPILING
+if /mingw|mswin/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
   extend Mswin
 end