diff --git a/ext/ragel/base_lexer.rl b/ext/ragel/base_lexer.rl
index 4b7a4b1..f3adfba 100644
--- a/ext/ragel/base_lexer.rl
+++ b/ext/ragel/base_lexer.rl
@@ -292,6 +292,14 @@
     allowed_text   = any* -- terminate_text;
 
     text := |*
+        # Input such as just "</" or "<?". This rule takes precedence over the
+        # rules below, but only if those don't match.
+        terminate_text => {
+            callback("on_text", data, encoding, ts, te);
+
+            fnext main;
+        };
+
         # Text followed by a special tag, such as "foo<!--"
         allowed_text @{ mark = p; } terminate_text => {
             callback("on_text", data, encoding, ts, mark);
diff --git a/spec/oga/xml/lexer/general_spec.rb b/spec/oga/xml/lexer/general_spec.rb
index d238c7c..fe95ad9 100644
--- a/spec/oga/xml/lexer/general_spec.rb
+++ b/spec/oga/xml/lexer/general_spec.rb
@@ -21,5 +21,17 @@ describe Oga::XML::Lexer do
     example 'lex a > as regular text' do
       lex('>').should == [[:T_TEXT, '>', 1]]
     end
+
+    example 'lex </ as regular text' do
+      lex('</').should == [[:T_TEXT, '</', 1]]
+    end
+
+    example 'lex <! as regular text' do
+      lex('<!').should == [[:T_TEXT, '<!', 1]]
+    end
+
+    example 'lex <? as regular text' do
+      lex('<?').should == [[:T_TEXT, '<?', 1]]
+    end
   end
 end