diff --git a/ChangeLog b/ChangeLog
index bc6da363e7..d1e333f820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 12 16:30:23 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* tool/merger.rb (#default_merge_branch): Add support for
+	  Subversion 1.7 which adopted a whole new working directory
+	  structure.
+
 Sun Feb 12 15:14:41 2012  Kazuki Tsujimoto  <kazuki@callcc.net>
 
 	* benchmark/driver.rb: suppress unused/shadowing variable warnings.
diff --git a/tool/merger.rb b/tool/merger.rb
index d8ae16016b..6f82541e0d 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -112,7 +112,7 @@ def tag intv_p = false
 end
 
 def default_merge_branch
-  /branches\/ruby_1_8_/ =~ IO.binread(".svn/entries", 100) ? 'branches/ruby_1_8' : 'trunk'
+  %r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk'
 end
 
 case ARGV[0]