diff --git a/Yesod/Markdown.hs b/Yesod/Markdown.hs
--- a/Yesod/Markdown.hs
+++ b/Yesod/Markdown.hs
@@ -25,7 +25,7 @@
   , writePandocTrusted
   -- * Option sets
   , yesodDefaultWriterOptions
-  , yesodDefaultParserState
+  , yesodDefaultReaderOptions
   -- * Form helper
   , markdownField
   )
@@ -90,12 +90,12 @@
 --   sets and sanitization.
 markdownToHtml :: Markdown -> Html
 markdownToHtml = writePandoc yesodDefaultWriterOptions
-               . parseMarkdown yesodDefaultParserState
+               . parseMarkdown yesodDefaultReaderOptions
 
 -- | Same but with no sanitization run
 markdownToHtmlTrusted :: Markdown -> Html
 markdownToHtmlTrusted = writePandocTrusted yesodDefaultWriterOptions
-                      . parseMarkdown yesodDefaultParserState
+                      . parseMarkdown yesodDefaultReaderOptions
 
 -- | Reads markdown in from the specified file; returns the empty string 
 --   if the file does not exist
@@ -118,19 +118,19 @@
 writePandocTrusted wo = preEscapedToMarkup . writeHtmlString wo
 
 -- | Parses Markdown into the intermediate Pandoc type
-parseMarkdown :: ParserState -> Markdown -> Pandoc
+parseMarkdown :: ReaderOptions -> Markdown -> Pandoc
 parseMarkdown ro (Markdown m) = readMarkdown ro m
 
 -- | Pandoc defaults, plus Html5, minus WrapText
 yesodDefaultWriterOptions :: WriterOptions
-yesodDefaultWriterOptions = defaultWriterOptions
+yesodDefaultWriterOptions = def
   { writerHtml5    = True
   , writerWrapText = False
   }
 
 -- | Pandoc defaults, plus Smart, plus ParseRaw
-yesodDefaultParserState :: ParserState
-yesodDefaultParserState = defaultParserState
-    { stateSmart    = True
-    , stateParseRaw = True
+yesodDefaultReaderOptions :: ReaderOptions
+yesodDefaultReaderOptions = def
+    { readerSmart    = True
+    , readerParseRaw = True
     }
diff --git a/yesod-markdown.cabal b/yesod-markdown.cabal
--- a/yesod-markdown.cabal
+++ b/yesod-markdown.cabal
@@ -1,5 +1,5 @@
 name:                yesod-markdown
-version:             0.5.1
+version:             0.6
 synopsis:            Tools for using markdown in a yesod application
 description:         A subset of pandoc functionality useful for markdown processing in yesod applications
 homepage:            http://github.com/pbrisbin/yesod-markdown
@@ -16,7 +16,7 @@
 
   build-depends: base            >= 4     && < 5
                , text            >= 0.11  && < 0.12
-               , pandoc          >= 1.9   && < 1.10
+               , pandoc          >= 1.10  && < 1.11
                , blaze-html      >= 0.5   && < 0.6
                , xss-sanitize    >= 0.3.1 && < 0.4
                , directory