diff --git a/src/components/script/dom/htmlheadingelement.rs b/src/components/script/dom/htmlheadingelement.rs
index e9f470f7e8a..13370230c8b 100644
--- a/src/components/script/dom/htmlheadingelement.rs
+++ b/src/components/script/dom/htmlheadingelement.rs
@@ -2,8 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use dom::bindings::codegen::HTMLHeadingElementBinding;
 use dom::bindings::utils::DOMString;
+use dom::document::AbstractDocument;
+use dom::element::HTMLHeadingElementTypeId;
 use dom::htmlelement::HTMLElement;
+use dom::node::{AbstractNode, Node, ScriptView};
 
 pub enum HeadingLevel {
     Heading1,
@@ -19,6 +23,20 @@ pub struct HTMLHeadingElement {
     level: HeadingLevel,
 }
 
+impl HTMLHeadingElement {
+    pub fn new_inherited(localName: ~str, document: AbstractDocument, level: HeadingLevel) -> HTMLHeadingElement {
+        HTMLHeadingElement {
+            htmlelement: HTMLElement::new(HTMLHeadingElementTypeId, localName, document),
+            level: level,
+        }
+    }
+
+    pub fn new(localName: ~str, document: AbstractDocument, level: HeadingLevel) -> AbstractNode<ScriptView> {
+        let element = HTMLHeadingElement::new_inherited(localName, document, level);
+        Node::reflect_node(@mut element, document, HTMLHeadingElementBinding::Wrap)
+    }
+}
+
 impl HTMLHeadingElement {
     pub fn Align(&self) -> DOMString {
         None
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 57053657185..7d8553b6099 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -273,14 +273,6 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum
     handle_element!(cx, document, tag, "img", HTMLImageElementTypeId, HTMLImageElement, [(image: None)]);
     handle_element!(cx, document, tag, "iframe",  HTMLIframeElementTypeId, HTMLIFrameElement, [(frame: None), (size: None), (sandbox: None)]);
 
-    handle_element!(cx, document, tag, "h1", HTMLHeadingElementTypeId, HTMLHeadingElement, [(level: Heading1)]);
-    handle_element!(cx, document, tag, "h2", HTMLHeadingElementTypeId, HTMLHeadingElement, [(level: Heading2)]);
-    handle_element!(cx, document, tag, "h3", HTMLHeadingElementTypeId, HTMLHeadingElement, [(level: Heading3)]);
-    handle_element!(cx, document, tag, "h4", HTMLHeadingElementTypeId, HTMLHeadingElement, [(level: Heading4)]);
-    handle_element!(cx, document, tag, "h5", HTMLHeadingElementTypeId, HTMLHeadingElement, [(level: Heading5)]);
-    handle_element!(cx, document, tag, "h6", HTMLHeadingElementTypeId, HTMLHeadingElement, [(level: Heading6)]);
-
-
     handle_htmlelement!(cx, document, tag, "aside",   HTMLElementTypeId, HTMLElement);
     handle_htmlelement!(cx, document, tag, "b",       HTMLElementTypeId, HTMLElement);
     handle_htmlelement!(cx, document, tag, "i",       HTMLElementTypeId, HTMLElement);
@@ -288,6 +280,12 @@ pub fn build_element_from_tag(cx: *JSContext, tag: &str, document: AbstractDocum
     handle_htmlelement!(cx, document, tag, "small",   HTMLElementTypeId, HTMLElement);
 
     handle_newable_element!(document, tag, "audio",     HTMLAudioElement);
+    handle_newable_element!(document, tag, "h1",        HTMLHeadingElement, Heading1);
+    handle_newable_element!(document, tag, "h2",        HTMLHeadingElement, Heading2);
+    handle_newable_element!(document, tag, "h3",        HTMLHeadingElement, Heading3);
+    handle_newable_element!(document, tag, "h4",        HTMLHeadingElement, Heading4);
+    handle_newable_element!(document, tag, "h5",        HTMLHeadingElement, Heading5);
+    handle_newable_element!(document, tag, "h6",        HTMLHeadingElement, Heading6);
     handle_newable_element!(document, tag, "td",        HTMLTableDataCellElement);
     handle_newable_element!(document, tag, "th",        HTMLTableHeaderCellElement);
     handle_newable_element!(document, tag, "video",     HTMLVideoElement);