1 files changed, 4 insertions, 0 deletions
diff --git a/pandoc.hs b/pandoc.hs
index 06bfa148c..3394c79dd 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -1019,6 +1019,8 @@ defaultReaderName fallback (x:xs) =
     ".xhtml"    -> "html"
     ".html"     -> "html"
     ".htm"      -> "html"
+    ".md"       -> "markdown"
+    ".markdown" -> "markdown"
     ".tex"      -> "latex"
     ".latex"    -> "latex"
     ".ltx"      -> "latex"
@@ -1375,6 +1377,8 @@ convertWithOpts opts args = do
       readSource src = case parseURI src of
                             Just u | uriScheme u `elem` ["http:","https:"] ->
                                        readURI src
+                                   | uriScheme u == "file:" ->
+                                       UTF8.readFile (uriPath u)
                             _       -> UTF8.readFile src
       readURI src = do
         res <- openURL src