diff --git a/ChangeLog b/ChangeLog
index dd7e3a71bd..d0d27b241e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Thu Jun 30 23:52:12 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (trap): non-string trap hander was ignored.
+	  fixed: [ruby-dev:26417]
+
 Thu Jun 30 19:00:21 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
 	* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
-	  for [ruby-dev:26410]. And support a numeric form of 0d99999. 
+	  for [ruby-dev:26410]. And support a numeric form of 0d99999.
 
 Thu Jun 30 17:28:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
diff --git a/signal.c b/signal.c
index 0adc447313..9c168d1fce 100644
--- a/signal.c
+++ b/signal.c
@@ -652,6 +652,9 @@ trap(arg)
     if (func == SIG_IGN || func == SIG_DFL) {
 	command = 0;
     }
+    else {
+	command = arg->cmd;
+    }
 
     switch (TYPE(arg->sig)) {
       case T_FIXNUM: