diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 0ee22da712..58ff354d3d 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -54,7 +54,7 @@ parser.parse! rescue abort "#{File.basename(Program)}: #{$!}\n#{parser}"
   when :revision_h
     Proc.new {|last, changed, modified, branch, title|
       [
-        "#define RUBY_REVISION \"#{changed[0...10]}\"",
+        "#define RUBY_REVISION #{last.dump}",
         if branch
           e = '..'
           limit = 16
diff --git a/tool/make-snapshot b/tool/make-snapshot
index d81a28c091..0b3d284a90 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -234,7 +234,7 @@ def package(vcs, rev, destdir, tmp = nil)
     warn "#{$0}: unknown version - #{rev}"
     return
   end
-  revision ||= vcs.get_revisions(url)[1]
+  revision ||= vcs.get_revisions(url)[0]
   version = nil
   unless revision
     url = vcs.trunk
@@ -243,7 +243,7 @@ def package(vcs, rev, destdir, tmp = nil)
       warn "#{$0}: #{rev} not found"
       return
     end
-    revision = vcs.get_revisions(url)[1]
+    revision = vcs.get_revisions(url)[0]
   end
   v = nil
   if $exported