diff --git a/pandoc.cabal b/pandoc.cabal
index d865862a3..887085572 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -37,7 +37,8 @@ Description:     Pandoc is a Haskell library for converting from one markup
                  only adding a reader or writer.
 Data-Files:
                  -- templates
-                 templates/default.html, templates/default.docbook,
+                 templates/default.html, templates/default.html5,
+                 templates/default.docbook,
                  templates/default.opendocument, templates/default.latex,
                  templates/default.context, templates/default.texinfo,
                  templates/default.man, templates/default.markdown,
diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs
index 0312ba1c6..0d627e447 100644
--- a/src/Text/Pandoc/Templates.hs
+++ b/src/Text/Pandoc/Templates.hs
@@ -85,7 +85,6 @@ getDefaultTemplate _ "native" = return $ Right ""
 getDefaultTemplate _ "json"   = return $ Right ""
 getDefaultTemplate user "odt" = getDefaultTemplate user "opendocument"
 getDefaultTemplate user "epub" = getDefaultTemplate user "html"
-getDefaultTemplate user "html5" = getDefaultTemplate user "html"
 getDefaultTemplate user "beamer" = getDefaultTemplate user "latex"
 getDefaultTemplate user writer = do
   let format = takeWhile (/='+') writer  -- strip off "+lhs" if present
diff --git a/templates b/templates
index 04e35de2d..727772183 160000
--- a/templates
+++ b/templates
@@ -1 +1 @@
-Subproject commit 04e35de2de8c45603993f60e5869bf9d1fddfa28
+Subproject commit 727772183db59ed74a26757c259e6bf947850fa8