diff --git a/ChangeLog b/ChangeLog
index 202ac7e1a0..600ca03f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 29 09:05:07 2011  Nobuyoshi Nakada  <>
+
+	* thread_pthread.h: no Structured Exception Handling like macros.
+	  [ruby-core:40432] [Bug #5491]
+
 Fri Oct 28 22:05:34 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/sdbm/_sdbm.c: RCS $Id$ removed.
diff --git a/thread_pthread.h b/thread_pthread.h
index f180a79d27..b3e7c36cf0 100644
--- a/thread_pthread.h
+++ b/thread_pthread.h
@@ -32,6 +32,11 @@ typedef struct native_thread_data_struct {
 
 #include <semaphore.h>
 
+#undef except
+#undef try
+#undef leave
+#undef finally
+
 typedef struct rb_global_vm_lock_struct {
     /* fast path */
     unsigned long acquired;