diff --git a/ChangeLog b/ChangeLog
index 2c897b720a..287afe2339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul  4 20:39:20 2013  Tanaka Akira  <akr@fsij.org>
+
+	* tool/make-snapshot: Exit with EXIT_FAILURE when it fails.
+
 Thu Jul  4 20:20:23 2013  Tanaka Akira  <akr@fsij.org>
 
 	* bignum.c (maxpow_in_bdigit_dbl): Use tables if available.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 4d5cfc4c4f..81f4cb0658 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -265,8 +265,12 @@ ensure
   FileUtils.rm_rf(v) if v and !$exported and !$keep_temp
 end
 
+success = true
 revisions.collect {|rev| package(rev, destdir)}.flatten.each do |name|
-  name or next
+  if !name
+    success = false
+    next
+  end
   str = open(name, "rb") {|f| f.read}
   md5 = Digest::MD5.hexdigest str
   sha = Digest::SHA256.hexdigest str
@@ -277,4 +281,6 @@ revisions.collect {|rev| package(rev, destdir)}.flatten.each do |name|
   puts
 end
 
+exit false if !success
+
 # vim:fileencoding=US-ASCII sw=2 ts=4 noexpandtab ff=unix