2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index badb9877da..e89f99aeec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 26 23:55:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* NEWS: update for Thread#join incompatible change.
+
 Mon Nov 26 22:44:24 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* thread.c (rb_thread_terminate_all): use native_sleep() instead
diff --git a/NEWS b/NEWS
index ac994b0b4c..61ab041883 100644
--- a/NEWS
+++ b/NEWS
@@ -151,6 +151,9 @@ with all sufficient information, see the ChangeLog file.
         variable has been set.
       * added Thread#backtrace_locations which returns similar information of
         Kernel#caller_locations.
+    * incompatible changes:
+      * Thread#join no longer allows to be used from trap handler. Now it raises
+        ThreadError.
 
   * Time
     * change return value:
@@ -343,3 +346,7 @@ with all sufficient information, see the ChangeLog file.
 
   * OpenStruct new methods can conflict with custom attributes named
     "each_pair", "eql?", "hash" or "to_h".
+
+  * Thread#join
+   
+    See above.