diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index a036d298f8..63a1b70dca 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -639,19 +639,21 @@ class VCS
         w.print "-*- coding: utf-8 -*-\n\n"
         cmd_pipe(env, cmd, chdir: @srcdir) do |r|
           while s = r.gets("\ncommit ")
+            h, s = s.split(/^$/, 2)
+            h.gsub!(/^(?:Author|Date): /, '  \&')
             if s.sub!(/\nNotes \(log-fix\):\n((?: +.*\n)+)/, '')
               fix = $1
-              h, s = s.split(/^$/, 2)
               s = s.lines
               fix.each_line do |x|
                 if %r[^ +(\d+)s/(.+)/(.*)/] =~ x
                   s[$1.to_i][$2] = $3
                 end
               end
-              s = [h, s.join('')].join('')
+              s = s.join('')
             end
             s.gsub!(/ +\n/, "\n")
-            w.print s
+            s.sub!(/^Notes:/, '  \&')
+            w.print h, s
           end
         end
       end