diff --git a/ChangeLog b/ChangeLog
index 7d5b70faa3..e2f6c6e105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 23 15:58:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* signal.c (sighandler): need to re-install sighandler on some
+	  platforms.
+
 Fri Feb 23 15:05:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (set_pioinfo_extra): simplified.
diff --git a/signal.c b/signal.c
index b18bceae75..f8ff47d48f 100644
--- a/signal.c
+++ b/signal.c
@@ -395,6 +395,10 @@ sighandler(int sig)
     rb_vm_t *vm = GET_VM(); /* fix me for Multi-VM */
     ATOMIC_INC(vm->signal_buff[sig]);
     ATOMIC_INC(vm->bufferd_signal_size);
+
+#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
+    ruby_signal(sig, sighandler);
+#endif
 }
 
 # ifdef HAVE_SIGPROCMASK