diff --git a/README b/README
--- a/README
+++ b/README
@@ -42,7 +42,7 @@
 any kind.  (See COPYRIGHT for full copyright and warranty notices.)
 Other contributors include Recai Oktaş, Paulo Tanimoto, Peter Wang,
 Andrea Rossato, Eric Kow, infinity0x, Luke Plant, shreevatsa.public,
-rodja.trappe, Bradley Kuhn, thsutton.
+rodja.trappe, Bradley Kuhn, thsutton, Justin Bogner.
 
 [GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License"
 
diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+pandoc (1.5.0.1)
+
+  [ John MacFarlane ]
+
+  * HTML writer: Fixed error in math writer (with MathML option)
+    that caused an infinite loop for unparsable MathML.
+
 pandoc (1.5)
 
   [ John MacFarlane ]
diff --git a/pandoc.cabal b/pandoc.cabal
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 Name:            pandoc
-Version:         1.5
+Version:         1.5.0.1
 Cabal-Version:   >= 1.2
 Build-Type:      Custom
 License:         GPL
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -465,9 +465,11 @@
                                   case texMathToMathML dt str of
                                         Right r -> return $ primHtml $
                                                     ppcElement conf r
-                                        Left  _ -> inlineToHtml opts
-                                                     (Math t str)
-                               PlainMath -> 
+                                        Left  _ -> inlineListToHtml opts
+                                                    (readTeXMath str) >>=
+                                                      return . (thespan !
+                                                      [theclass "math"])
+                               PlainMath ->
                                   inlineListToHtml opts (readTeXMath str) >>=
                                   return . (thespan ! [theclass "math"]) ) 
     (TeX str)        -> case writerHTMLMathMethod opts of