diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 2.0.9
+
+* Better empty HTML tag list
+
 ### 2.0.8.1
 
 * Make it work with ghc-8.0 [#181](https://github.com/yesodweb/shakespeare/pull/181)
diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
--- a/Text/Hamlet/Parse.hs
+++ b/Text/Hamlet/Parse.hs
@@ -630,21 +630,28 @@
     lift (HamletSettings a b c d) = [|HamletSettings $(lift a) $(lift b) $(lift c) $(lift d)|]
 
 
+-- See the html specification for a list of all void elements:
+-- https://www.w3.org/TR/html/syntax.html#void-elements
 htmlEmptyTags :: Set String
 htmlEmptyTags = Set.fromAscList
     [ "area"
     , "base"
-    , "basefont"
+    , "basefont" -- not html 5
     , "br"
     , "col"
-    , "frame"
+    , "embed"
+    , "frame"    -- not html 5
     , "hr"
     , "img"
     , "input"
-    , "isindex"
+    , "isindex"  -- not html 5
+    , "keygen"
     , "link"
     , "meta"
     , "param"
+    , "source"
+    , "track"
+    , "wbr"
     ]
 
 -- | Defaults settings: HTML5 doctype and HTML-style empty tags.
diff --git a/shakespeare.cabal b/shakespeare.cabal
--- a/shakespeare.cabal
+++ b/shakespeare.cabal
@@ -1,5 +1,5 @@
 name:            shakespeare
-version:         2.0.8.2
+version:         2.0.9
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -147,4 +147,4 @@
 
 source-repository head
   type:     git
-  location: git://github.com/yesodweb/shakespeare.git
+  location: https://github.com/yesodweb/shakespeare.git