diff --git a/ChangeLog b/ChangeLog
index bebf51eae9..c98cf85cce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 16 07:12:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/runruby.rb (File.realpath): return real path of expanded path.
+	  [Bug #6598]
+
 Sat Jun 16 07:12:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bootstraptest/runner.rb (main): ignore -j option for compatibility
diff --git a/tool/runruby.rb b/tool/runruby.rb
index 0165634edf..86b9327350 100755
--- a/tool/runruby.rb
+++ b/tool/runruby.rb
@@ -34,8 +34,7 @@ end
 
 unless defined?(File.realpath)
   def File.realpath(*args)
-    Dir.chdir do
-      expand_path(*args)
+    Dir.chdir(expand_path(*args)) do
       Dir.pwd
     end
   end