diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 1e2a6fc440..8a72bd3786 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -19,6 +19,7 @@ def self.output=(output)
   @output = output
 end
 @suppress_not_found = false
+@limit = 20
 
 format = '%Y-%m-%dT%H:%M:%S%z'
 srcdir = nil
@@ -39,6 +40,9 @@ parser = OptionParser.new {|opts|
     self.output = :modified
     format = fmt if fmt
   end
+  opts.on("--limit=NUM", "limit branch name length (#@limit)", Integer) do |n|
+    @limit = n
+  end
   opts.on("-q", "--suppress_not_found") do
     @suppress_not_found = true
   end
@@ -60,7 +64,7 @@ vcs = nil
         ("#define RUBY_FULL_REVISION #{last.inspect}" unless short == last),
         if branch
           e = '..'
-          limit = 16
+          limit = @limit
           name = branch.sub(/\A(.{#{limit-e.size}}).{#{e.size+1},}/o) {$1+e}
           "#define RUBY_BRANCH_NAME #{name.dump}"
         end,