diff --git a/ChangeLog b/ChangeLog
index c315b4184b..7915444fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 19 05:49:53 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/rexml/element.rb (text=): false should be converted to string.
+	  A patch by Teruo Oshida [ruby-dev:38351]
+
 Sun Oct 18 22:33:25 2009  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: do not require lib/delta.rb.
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 7a3abc65e5..f999b0b2b1 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -492,7 +492,7 @@ module REXML
     def text=( text )
       if text.kind_of? String
         text = Text.new( text, whitespace(), nil, raw() )
-      elsif text and !text.kind_of? Text
+      elsif !text.nil? and !text.kind_of? Text
         text = Text.new( text.to_s, whitespace(), nil, raw() )
       end
       old_text = get_text