diff --git a/tool/make-snapshot b/tool/make-snapshot
index 9e05e66..babccd0 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -139,7 +139,7 @@ def package(vcs, rev, destdir, tmp = nil)
   when /\Atags\//
     url = vcs.tag($')
   when /\Astable\z/
-    vcs.branch_list(/ruby_[0-9]*/) {|n| url = /\Aruby_\d+_\d+\z/ =~ n}
+    vcs.branch_list("ruby_[0-9]*") {|n| url = n[/\Aruby_\d+_\d+\z/]}
     url &&= vcs.branch(url)
   when /\A(.*)\.(.*)\.(.*)-(preview|rc)(\d+)/
     prerelease = true
diff --git a/tool/vcs.rb b/tool/vcs.rb
index 71eb689..fc473bb 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -161,7 +161,7 @@ class VCS
     def branch_list(pat)
       IO.popen(%W"svn ls #{branch('')}") do |f|
         f.each do |line|
-          line.chomp!('/')
+          line.strip!.chomp!('/')
           yield(line) if File.fnmatch?(pat, line)
         end
       end