diff --git a/CHANGELOG.md b/CHANGELOG.md
index 322bd48..eb824bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## unreleased [☰](https://github.com/activeadmin/arbre/compare/v2.1.0...master)
+
+* Add some missing HTML5 elements [#655][] by [@tagliala][]
+
 ## 2.1.0 [☰](https://github.com/activeadmin/arbre/compare/v2.0.2...v2.1.0)
 
 * Add support for ViewComponent. [#644][] by [@budu][]
@@ -154,6 +158,7 @@ Initial release and extraction from Active Admin
 [#617]: https://github.com/activeadmin/arbre/pull/617
 [#622]: https://github.com/activeadmin/arbre/pull/622
 [#644]: https://github.com/activeadmin/arbre/pull/644
+[#655]: https://github.com/activeadmin/arbre/pull/655
 
 [@aramvisser]: https://github.com/aramvisser
 [@LTe]: https://github.com/LTe
diff --git a/lib/arbre/html/html5_elements.rb b/lib/arbre/html/html5_elements.rb
index e32078c..3434a8d 100644
--- a/lib/arbre/html/html5_elements.rb
+++ b/lib/arbre/html/html5_elements.rb
@@ -2,17 +2,124 @@
 module Arbre
   module HTML
 
-    AUTO_BUILD_ELEMENTS = [ :a, :abbr, :address, :area, :article, :aside, :audio, :b, :base,
-                       :bdo, :blockquote, :body, :br, :button, :canvas, :caption, :cite,
-                       :code, :col, :colgroup, :command, :datalist, :dd, :del, :details,
-                       :dfn, :div, :dl, :dt, :em, :embed, :fieldset, :figcaption, :figure,
-                       :footer, :form, :h1, :h2, :h3, :h4, :h5, :h6, :head, :header, :hgroup,
-                       :hr, :html, :i, :iframe, :img, :input, :ins, :keygen, :kbd, :label,
-                       :legend, :li, :link, :main, :map, :mark, :menu, :menuitem, :meta, :meter, :nav, :noscript,
-                       :object, :ol, :optgroup, :option, :output, :param, :pre, :progress, :q,
-                       :s, :samp, :script, :section, :select, :small, :source, :span,
-                       :strong, :style, :sub, :summary, :sup, :svg, :table, :tbody, :td,
-                       :textarea, :tfoot, :th, :thead, :time, :title, :tr, :track, :ul, :var, :video, :wbr ]
+    AUTO_BUILD_ELEMENTS = [
+      :a,
+      :abbr,
+      :address,
+      :area,
+      :article,
+      :aside,
+      :audio,
+      :b,
+      :base,
+      :bdi,
+      :bdo,
+      :blockquote,
+      :body,
+      :br,
+      :button,
+      :canvas,
+      :caption,
+      :cite,
+      :code,
+      :col,
+      :colgroup,
+      :command,
+      :data,
+      :datalist,
+      :dd,
+      :del,
+      :details,
+      :dfn,
+      :dialog,
+      :div,
+      :dl,
+      :dt,
+      :em,
+      :embed,
+      :fieldset,
+      :figcaption,
+      :figure,
+      :footer,
+      :form,
+      :h1,
+      :h2,
+      :h3,
+      :h4,
+      :h5,
+      :h6,
+      :head,
+      :header,
+      :hgroup,
+      :hr,
+      :html,
+      :i,
+      :iframe,
+      :img,
+      :input,
+      :ins,
+      :kbd,
+      :keygen,
+      :label,
+      :legend,
+      :li,
+      :link,
+      :main,
+      :map,
+      :mark,
+      :menu,
+      :menuitem,
+      :meta,
+      :meter,
+      :nav,
+      :noscript,
+      :object,
+      :ol,
+      :optgroup,
+      :option,
+      :output,
+      :param,
+      :picture,
+      :pre,
+      :progress,
+      :q,
+      :rp,
+      :rt,
+      :ruby,
+      :s,
+      :samp,
+      :script,
+      :search,
+      :section,
+      :select,
+      :slot,
+      :small,
+      :source,
+      :span,
+      :strong,
+      :style,
+      :sub,
+      :summary,
+      :sup,
+      :svg,
+      :table,
+      :tbody,
+      :td,
+      :template,
+      :textarea,
+      :tfoot,
+      :th,
+      :thead,
+      :time,
+      :title,
+      :tr,
+      :track,
+      :u,
+      :ul,
+      :var,
+      :video,
+      :wbr
+    ]
 
     HTML5_ELEMENTS = [ :p ] + AUTO_BUILD_ELEMENTS