diff --git a/ChangeLog b/ChangeLog
index 8292a9550c..1ee360e68c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 26 02:47:08 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (dist): tool/make-snapshot is executable.
+
+	* tool/make-snapshot (package): supported release numbers 1.9.0-x.
+
 Tue Aug 26 02:43:50 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/io.h (rb_io_t): new field: writeconv_pre_opts.
diff --git a/common.mk b/common.mk
index c8d243ce05..839b562e6c 100644
--- a/common.mk
+++ b/common.mk
@@ -797,7 +797,7 @@ vtune: miniruby$(EXEEXT)
 	vtl view -ha -mn miniruby$(EXEEXT) -sum -sort -cd | $(RUNRUBY) $(srcdir)/tool/vtlh.rb > ha.lines
 
 dist: $(PREP) $(PROGRAM)
-	$(SHELL) $(srcdir)/tool/make-snapshot . $(TARNAME)
+	$(srcdir)/tool/make-snapshot . $(TARNAME)
 
 up:
 	@$(VCS) up "$(srcdir)"
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 65f5bd024d..f6529d9c25 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -53,9 +53,10 @@ def package(rev, destdir)
   when /\Astable\z/
     url = SVNURL + "branches/"
     url = url + `svn ls #{url}`[/.*^(ruby_\d+_\d+)\//m, 1]
-  when /\A\(.*\..*\..*\)-/
-    patchlevel = true
-    url = SVNURL + "tags/v#{rev.sub(/-p?/, '_').tr('.', '_')}"
+  when /\A(.*)\.(.*)\.(.*)-(p)?(.*)/
+    patchlevel = !!$4
+    tag = "#{$4}#{$5}"
+    url = SVNURL + "tags/v#{$1}_#{$2}_#{$3}_#{$5}"
   when /\./
     url = SVNURL + "branches/ruby_#{rev.tr('.', '_')}"
   else
@@ -97,7 +98,7 @@ def package(rev, destdir)
     patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1]
     tag = (patchlevel ? "p#{patchlevel}" : "r#{revision}")
   else
-    tag = "r#{revision}"
+    tag ||= "r#{revision}"
   end
   v = "ruby-#{version}-#{tag}"
   File.directory?(v) or File.rename "ruby", v