diff --git a/ChangeLog b/ChangeLog
index 17a01898d9..5b67901e73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 10 14:55:55 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* math.c (math_atanh): Fix bug for Math.atanh(+/-1). It now returns
+	  +-Infinity. [ruby-core:26028]
+
 Sat Oct 10 14:09:40 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* thread.c (rb_threadptr_execute_interrupts_rec, rb_threadptr_raise):
diff --git a/math.c b/math.c
index 51caf35c5d..630aa13baa 100644
--- a/math.c
+++ b/math.c
@@ -298,7 +298,6 @@ math_atanh(VALUE obj, VALUE x)
     d0 = RFLOAT_VALUE(x);
     d = atanh(d0);
     domain_check(d0, d, "atanh");
-    infinity_check(x, d, "atanh");
     return DBL2NUM(d);
 }