diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 7be69f50b070b..6d57b0183a34d 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -487,12 +487,7 @@ footnoteSection opts notes = do
   return $
     if null notes
        then mempty
-       else
-        nl opts >>
-          container (nl opts >> hrtag >> nl opts >>
-            -- if HTML5 then we're using <aside> and not <li>
-            (if html5 then id else H.ol) (mconcat notes >> nl opts)
-            >> nl opts)
+       else nl opts >> container (nl opts >> hrtag >> nl opts >> mconcat notes >> nl opts)
 
 -- | Parse a mailto link; return Just (name, domain) or Nothing.
 parseMailto :: String -> Maybe (String, String)
@@ -1167,9 +1162,9 @@ inlineToHtml opts inline = do
 
 blockListToNote :: PandocMonad m => WriterOptions -> String -> [Block] -> StateT WriterState m Html
 blockListToNote opts ref blocks =
-  -- If last block is Para or Plain, include the backlink at the end of
+  -- If first block is Para or Plain, include the backlink at the start of
   -- that block. Otherwise, insert a new Plain block with the backlink.
-  let backlink = [Link ("",["footnote-back"],[]) [Str (ref ++ ":")] ("#" ++ "fnref" ++ ref,[]), Space]
+  let backlink = [Link ("",["footnote-back"],[]) [Str (ref ++ ".")] ("#" ++ "fnref" ++ ref,[]), Space]
       blocks'  = case blocks of
                   [] -> []
                   (firstBlock:otherBlocks) ->
@@ -1180,7 +1175,7 @@ blockListToNote opts ref blocks =
 
   in  do contents <- blockListToHtml opts blocks'
          html5 <- gets stHtml5
-         let noteElement = if html5 then H5.aside else H.li
+         let noteElement = if html5 then H5.aside else H.div
          let noteItem = noteElement ! prefixedId opts ("fn" ++ ref) $ contents
          epubVersion <- gets stEPUBVersion
          let noteItem' = case epubVersion of