diff --git a/blaze-html.cabal b/blaze-html.cabal
--- a/blaze-html.cabal
+++ b/blaze-html.cabal
@@ -1,5 +1,5 @@
 Name:         blaze-html
-Version:      0.5.1.3
+Version:      0.6.0.0
 Homepage:     http://jaspervdj.be/blaze
 Bug-Reports:  http://github.com/jaspervdj/blaze-html/issues
 License:      BSD3
diff --git a/src/Text/Blaze/Html5.hs b/src/Text/Blaze/Html5.hs
--- a/src/Text/Blaze/Html5.hs
+++ b/src/Text/Blaze/Html5.hs
@@ -69,6 +69,7 @@
     , map
     , mark
     , menu
+    , menuitem
     , meta
     , meter
     , nav
@@ -108,9 +109,11 @@
     , time
     , title
     , tr
+    , track
     , ul
     , var
     , video
+    , wbr
     ) where
 
 -- WARNING: The next block of code was automatically generated by
@@ -304,21 +307,20 @@
 {-# INLINE b #-}
 
 -- WARNING: The next block of code was automatically generated by
--- src/Util/GenerateHtmlCombinators.hs:199
+-- src/Util/GenerateHtmlCombinators.hs:226
 --
--- | Combinator for the @\<base>@ element.
+-- | Combinator for the @\<base />@ element.
 --
 -- Example:
 --
--- > base $ span $ text "foo"
+-- > base
 --
 -- Result:
 --
--- > <base><span>foo</span></base>
+-- > <base />
 --
-base :: Html  -- ^ Inner HTML.
-     -> Html  -- ^ Resulting HTML.
-base = Parent "base" "<base" "</base>"
+base :: Html  -- ^ Resulting HTML.
+base = Leaf "base" "<base" ">"
 {-# INLINE base #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1108,21 +1110,20 @@
 {-# INLINE kbd #-}
 
 -- WARNING: The next block of code was automatically generated by
--- src/Util/GenerateHtmlCombinators.hs:199
+-- src/Util/GenerateHtmlCombinators.hs:226
 --
--- | Combinator for the @\<keygen>@ element.
+-- | Combinator for the @\<keygen />@ element.
 --
 -- Example:
 --
--- > keygen $ span $ text "foo"
+-- > keygen
 --
 -- Result:
 --
--- > <keygen><span>foo</span></keygen>
+-- > <keygen />
 --
-keygen :: Html  -- ^ Inner HTML.
-       -> Html  -- ^ Resulting HTML.
-keygen = Parent "keygen" "<keygen" "</keygen>"
+keygen :: Html  -- ^ Resulting HTML.
+keygen = Leaf "keygen" "<keygen" ">"
 {-# INLINE keygen #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1253,6 +1254,23 @@
 -- WARNING: The next block of code was automatically generated by
 -- src/Util/GenerateHtmlCombinators.hs:226
 --
+-- | Combinator for the @\<menuitem />@ element.
+--
+-- Example:
+--
+-- > menuitem
+--
+-- Result:
+--
+-- > <menuitem />
+--
+menuitem :: Html  -- ^ Resulting HTML.
+menuitem = Leaf "menuitem" "<menuitem" ">"
+{-# INLINE menuitem #-}
+
+-- WARNING: The next block of code was automatically generated by
+-- src/Util/GenerateHtmlCombinators.hs:226
+--
 -- | Combinator for the @\<meta />@ element.
 --
 -- Example:
@@ -1645,21 +1663,20 @@
 {-# INLINE small #-}
 
 -- WARNING: The next block of code was automatically generated by
--- src/Util/GenerateHtmlCombinators.hs:199
+-- src/Util/GenerateHtmlCombinators.hs:226
 --
--- | Combinator for the @\<source>@ element.
+-- | Combinator for the @\<source />@ element.
 --
 -- Example:
 --
--- > source $ span $ text "foo"
+-- > source
 --
 -- Result:
 --
--- > <source><span>foo</span></source>
+-- > <source />
 --
-source :: Html  -- ^ Inner HTML.
-       -> Html  -- ^ Resulting HTML.
-source = Parent "source" "<source" "</source>"
+source :: Html  -- ^ Resulting HTML.
+source = Leaf "source" "<source" ">"
 {-# INLINE source #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1951,6 +1968,23 @@
 {-# INLINE tr #-}
 
 -- WARNING: The next block of code was automatically generated by
+-- src/Util/GenerateHtmlCombinators.hs:226
+--
+-- | Combinator for the @\<track />@ element.
+--
+-- Example:
+--
+-- > track
+--
+-- Result:
+--
+-- > <track />
+--
+track :: Html  -- ^ Resulting HTML.
+track = Leaf "track" "<track" ">"
+{-# INLINE track #-}
+
+-- WARNING: The next block of code was automatically generated by
 -- src/Util/GenerateHtmlCombinators.hs:199
 --
 -- | Combinator for the @\<ul>@ element.
@@ -2003,3 +2037,20 @@
       -> Html  -- ^ Resulting HTML.
 video = Parent "video" "<video" "</video>"
 {-# INLINE video #-}
+
+-- WARNING: The next block of code was automatically generated by
+-- src/Util/GenerateHtmlCombinators.hs:226
+--
+-- | Combinator for the @\<wbr />@ element.
+--
+-- Example:
+--
+-- > wbr
+--
+-- Result:
+--
+-- > <wbr />
+--
+wbr :: Html  -- ^ Resulting HTML.
+wbr = Leaf "wbr" "<wbr" ">"
+{-# INLINE wbr #-}
diff --git a/src/Text/Blaze/XHtml5.hs b/src/Text/Blaze/XHtml5.hs
--- a/src/Text/Blaze/XHtml5.hs
+++ b/src/Text/Blaze/XHtml5.hs
@@ -69,6 +69,7 @@
     , map
     , mark
     , menu
+    , menuitem
     , meta
     , meter
     , nav
@@ -108,9 +109,11 @@
     , time
     , title
     , tr
+    , track
     , ul
     , var
     , video
+    , wbr
     ) where
 
 -- WARNING: The next block of code was automatically generated by
@@ -304,21 +307,20 @@
 {-# INLINE b #-}
 
 -- WARNING: The next block of code was automatically generated by
--- src/Util/GenerateHtmlCombinators.hs:199
+-- src/Util/GenerateHtmlCombinators.hs:226
 --
--- | Combinator for the @\<base>@ element.
+-- | Combinator for the @\<base />@ element.
 --
 -- Example:
 --
--- > base $ span $ text "foo"
+-- > base
 --
 -- Result:
 --
--- > <base><span>foo</span></base>
+-- > <base />
 --
-base :: Html  -- ^ Inner HTML.
-     -> Html  -- ^ Resulting HTML.
-base = Parent "base" "<base" "</base>"
+base :: Html  -- ^ Resulting HTML.
+base = Leaf "base" "<base" " />"
 {-# INLINE base #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1108,21 +1110,20 @@
 {-# INLINE kbd #-}
 
 -- WARNING: The next block of code was automatically generated by
--- src/Util/GenerateHtmlCombinators.hs:199
+-- src/Util/GenerateHtmlCombinators.hs:226
 --
--- | Combinator for the @\<keygen>@ element.
+-- | Combinator for the @\<keygen />@ element.
 --
 -- Example:
 --
--- > keygen $ span $ text "foo"
+-- > keygen
 --
 -- Result:
 --
--- > <keygen><span>foo</span></keygen>
+-- > <keygen />
 --
-keygen :: Html  -- ^ Inner HTML.
-       -> Html  -- ^ Resulting HTML.
-keygen = Parent "keygen" "<keygen" "</keygen>"
+keygen :: Html  -- ^ Resulting HTML.
+keygen = Leaf "keygen" "<keygen" " />"
 {-# INLINE keygen #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1253,6 +1254,23 @@
 -- WARNING: The next block of code was automatically generated by
 -- src/Util/GenerateHtmlCombinators.hs:226
 --
+-- | Combinator for the @\<menuitem />@ element.
+--
+-- Example:
+--
+-- > menuitem
+--
+-- Result:
+--
+-- > <menuitem />
+--
+menuitem :: Html  -- ^ Resulting HTML.
+menuitem = Leaf "menuitem" "<menuitem" " />"
+{-# INLINE menuitem #-}
+
+-- WARNING: The next block of code was automatically generated by
+-- src/Util/GenerateHtmlCombinators.hs:226
+--
 -- | Combinator for the @\<meta />@ element.
 --
 -- Example:
@@ -1645,21 +1663,20 @@
 {-# INLINE small #-}
 
 -- WARNING: The next block of code was automatically generated by
--- src/Util/GenerateHtmlCombinators.hs:199
+-- src/Util/GenerateHtmlCombinators.hs:226
 --
--- | Combinator for the @\<source>@ element.
+-- | Combinator for the @\<source />@ element.
 --
 -- Example:
 --
--- > source $ span $ text "foo"
+-- > source
 --
 -- Result:
 --
--- > <source><span>foo</span></source>
+-- > <source />
 --
-source :: Html  -- ^ Inner HTML.
-       -> Html  -- ^ Resulting HTML.
-source = Parent "source" "<source" "</source>"
+source :: Html  -- ^ Resulting HTML.
+source = Leaf "source" "<source" " />"
 {-# INLINE source #-}
 
 -- WARNING: The next block of code was automatically generated by
@@ -1951,6 +1968,23 @@
 {-# INLINE tr #-}
 
 -- WARNING: The next block of code was automatically generated by
+-- src/Util/GenerateHtmlCombinators.hs:226
+--
+-- | Combinator for the @\<track />@ element.
+--
+-- Example:
+--
+-- > track
+--
+-- Result:
+--
+-- > <track />
+--
+track :: Html  -- ^ Resulting HTML.
+track = Leaf "track" "<track" " />"
+{-# INLINE track #-}
+
+-- WARNING: The next block of code was automatically generated by
 -- src/Util/GenerateHtmlCombinators.hs:199
 --
 -- | Combinator for the @\<ul>@ element.
@@ -2003,3 +2037,20 @@
       -> Html  -- ^ Resulting HTML.
 video = Parent "video" "<video" "</video>"
 {-# INLINE video #-}
+
+-- WARNING: The next block of code was automatically generated by
+-- src/Util/GenerateHtmlCombinators.hs:226
+--
+-- | Combinator for the @\<wbr />@ element.
+--
+-- Example:
+--
+-- > wbr
+--
+-- Result:
+--
+-- > <wbr />
+--
+wbr :: Html  -- ^ Resulting HTML.
+wbr = Leaf "wbr" "<wbr" " />"
+{-# INLINE wbr #-}
diff --git a/src/Util/GenerateHtmlCombinators.hs b/src/Util/GenerateHtmlCombinators.hs
--- a/src/Util/GenerateHtmlCombinators.hs
+++ b/src/Util/GenerateHtmlCombinators.hs
@@ -401,22 +401,23 @@
     { version = ["Html5"]
     , docType = ["<!DOCTYPE HTML>"]
     , parents =
-        [ "a", "abbr", "address", "article", "aside", "audio", "b", "base"
+        [ "a", "abbr", "address", "article", "aside", "audio", "b"
         , "bdo", "blockquote", "body", "button", "canvas", "caption", "cite"
         , "code", "colgroup", "command", "datalist", "dd", "del", "details"
         , "dfn", "div", "dl", "dt", "em", "fieldset", "figcaption", "figure"
         , "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "head", "header"
-        , "hgroup", "html", "i", "iframe", "ins", "keygen", "kbd", "label"
+        , "hgroup", "html", "i", "iframe", "ins", "kbd", "label"
         , "legend", "li", "map", "mark", "menu", "meter", "nav", "noscript"
         , "object", "ol", "optgroup", "option", "output", "p", "pre", "progress"
         , "q", "rp", "rt", "ruby", "samp", "script", "section", "select"
-        , "small", "source", "span", "strong", "style", "sub", "summary", "sup"
+        , "small", "span", "strong", "style", "sub", "summary", "sup"
         , "table", "tbody", "td", "textarea", "tfoot", "th", "thead", "time"
         , "title", "tr", "ul", "var", "video"
         ]
     , leafs =
-        [ "area", "br", "col", "embed", "hr", "img", "input", "meta", "link"
-        , "param"
+        -- http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#void-elements
+        [ "area", "base", "br", "col", "embed", "hr", "img", "input", "keygen"
+        , "link", "menuitem", "meta", "param", "source", "track", "wbr"
         ]
     , attributes =
         [ "accept", "accept-charset", "accesskey", "action", "alt", "async"