diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## MMark 0.0.5.4
+
+* Empty autolinks are now disallowed. `<>` will result in literal `<>` in
+  resulting HTML.
+
 ## MMark 0.0.5.3
 
 * Now HTML is escaped properly inside inline code spans.
diff --git a/Text/MMark/Parser.hs b/Text/MMark/Parser.hs
--- a/Text/MMark/Parser.hs
+++ b/Text/MMark/Parser.hs
@@ -663,6 +663,7 @@
 
 pAutolink :: IParser Inline
 pAutolink = between (char '<') (char '>') $ do
+  notFollowedBy (char '>')
   uri' <- URI.parser
   let (txt, uri) =
         case isEmailUri uri' of
diff --git a/mmark.cabal b/mmark.cabal
--- a/mmark.cabal
+++ b/mmark.cabal
@@ -1,5 +1,5 @@
 name:                 mmark
-version:              0.0.5.3
+version:              0.0.5.4
 cabal-version:        >= 1.18
 tested-with:          GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
 license:              BSD3
diff --git a/tests/Text/MMarkSpec.hs b/tests/Text/MMarkSpec.hs
--- a/tests/Text/MMarkSpec.hs
+++ b/tests/Text/MMarkSpec.hs
@@ -1677,7 +1677,7 @@
           "<p>&lt;foo+@bar.example.com&gt;</p>\n"
       it "CM578" $
         "<>" ==->
-          "<p><a href></a></p>\n"
+          "<p>&lt;&gt;</p>\n"
       it "CM579" $
         "< http://foo.bar >" ==->
           "<p>&lt; http://foo.bar &gt;</p>\n"