diff --git a/ChangeLog b/ChangeLog
index c3730ac392..f7d97d30ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan 31 21:29:58 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
+	  parent is specified, since Text.check may need doctype.  partially
+	  revert r26518.
+
 Sun Jan 31 21:10:15 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* vm_insnhelper.c (vm_throw): fixed infinite loop.  [ruby-core:27969]
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index c01ab33590..5cef876c52 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -117,7 +117,7 @@ module REXML
 
       @string.gsub!( /\r\n?/, "\n" )
 
-      Text.check(@string, illegal, doctype) if @raw
+      Text.check(@string, illegal, doctype) if @raw and @parent
     end
 
     def parent= parent