diff --git a/ChangeLog b/ChangeLog
index 59682c38d8..87cad170aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 16 19:11:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout::ExitException#exception): rescue
+	  UncaughtThrowError which is specific for throw, instead of
+	  ArgumentError.
+
 Sun Nov 16 18:22:18 2014  Eric Wong  <e@80x24.org>
 
 	* tool/update-deps: warning to disable ccache
diff --git a/lib/timeout.rb b/lib/timeout.rb
index d805dce2a3..cf23fb5fb6 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -40,8 +40,7 @@ module Timeout
         bt = caller
         begin
           throw(self, bt)
-        rescue ArgumentError => e
-          raise unless e.message.start_with?("uncaught throw")
+        rescue UncaughtThrowError
           raise Error, message, backtrace
         end
       end