diff --git a/ChangeLog b/ChangeLog
index 08674227fb..8788c6f51c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 20 04:02:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (rb_thread_raised_clear): should not clear flags other than
+	  raised flags.  a patch by Tomoyuki Chikanaga <chikanag AT
+	  nippon-control-system.co.jp> at [ruby-dev:37794].  [ruby-dev:37776]
+
 Wed Jan 14 13:09:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/socket/extconf.rb (gai_strerror): checks if available and if
diff --git a/node.h b/node.h
index 604bc837d0..3161af1190 100644
--- a/node.h
+++ b/node.h
@@ -481,7 +481,7 @@ int rb_thread_reset_raised(rb_thread_t th);
 #define rb_thread_raised_set(th, f)   ((th)->flags |= (f))
 #define rb_thread_raised_reset(th, f) ((th)->flags &= ~(f))
 #define rb_thread_raised_p(th, f)     (((th)->flags & (f)) != 0)
-#define rb_thread_raised_clear(th)    ((th)->flags = 0)
+#define rb_thread_raised_clear(th)    (rb_thread_raised_reset(th, RAISED_MASK))
 
 #if defined(__cplusplus)
 }  /* extern "C" { */
diff --git a/version.h b/version.h
index 89de4d56a0..73f0ef70f0 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-14"
+#define RUBY_RELEASE_DATE "2009-01-20"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090114
+#define RUBY_RELEASE_CODE 20090120
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 20
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];