diff --git a/lib/mapi/rtf.rb b/lib/mapi/rtf.rb
index 4130066..4a2c67d 100644
--- a/lib/mapi/rtf.rb
+++ b/lib/mapi/rtf.rb
@@ -235,7 +235,7 @@ def rtf2html rtf
 			ignore_tag = nil
 			# skip up to the first htmltag. return nil if we don't ever find one
 			return nil unless scan.scan_until /(?=\{\\\*\\htmltag)/
-			until scan.empty?
+			until scan.eos?
 				if scan.scan /\{/
 				elsif scan.scan /\}/
 				elsif scan.scan /\\\*\\htmltag(\d+) ?/
diff --git a/ruby-msg.gemspec b/ruby-msg.gemspec
index 4d3f26d..6b39e1f 100644
--- a/ruby-msg.gemspec
+++ b/ruby-msg.gemspec
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
 	s.files += Dir.glob('test/test_*.rb')
 	s.files += Dir.glob('bin/*')
 
-	s.has_rdoc = true
 	s.extra_rdoc_files = ['README.rdoc', 'ChangeLog']
 	s.rdoc_options += [
 		'--main', 'README.rdoc',