diff --git a/ChangeLog b/ChangeLog
index edeb9132f..862452ab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 14 12:40:10 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* object.c (rb_Float): Allow results of to_f to be NaN
+	  [ruby-core:26733]
+
 Mon Dec 14 12:35:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (proc_invoke): unbound block created by define_method
diff --git a/object.c b/object.c
index 75153b843..ab62cbf05 100644
--- a/object.c
+++ b/object.c
@@ -2470,13 +2470,8 @@ rb_Float(val)
 	break;
 
       default:
-      {
-	  VALUE f = rb_convert_type(val, T_FLOAT, "Float", "to_f");
-	  if (isnan(RFLOAT(f)->value)) {
-	      rb_raise(rb_eArgError, "invalid value for Float()");
-	  }
-	  return f;
-      }
+	return rb_convert_type(val, T_FLOAT, "Float", "to_f");
+
     }
 }
 
diff --git a/version.h b/version.h
index cf3fe7acc..dc39977ad 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-14"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091214
-#define RUBY_PATCHLEVEL 235
+#define RUBY_PATCHLEVEL 236
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8