diff --git a/content/handlers/javascript/duktape/HTMLFrameSetElement.bnd b/content/handlers/javascript/duktape/HTMLFrameSetElement.bnd
index cc66e93d8..e72c17749 100644
--- a/content/handlers/javascript/duktape/HTMLFrameSetElement.bnd
+++ b/content/handlers/javascript/duktape/HTMLFrameSetElement.bnd
@@ -8,6 +8,13 @@
  *         http://www.opensource.org/licenses/mit-license
  */
 
+prologue HTMLFrameSetElement()
+%{
+#include "utils/corestrings.h"
+
+#define HANDLER_MAGIC MAGIC(HANDLER_MAP)
+%}
+
 init HTMLFrameSetElement(struct dom_html_element *html_frame_set_element::html_element);
 
 getter HTMLFrameSetElement::cols();
@@ -15,3 +22,30 @@ setter HTMLFrameSetElement::cols();
 
 getter HTMLFrameSetElement::rows();
 setter HTMLFrameSetElement::rows();
+
+getter HTMLFrameSetElement::onafterprint();
+setter HTMLFrameSetElement::onafterprint();
+getter HTMLFrameSetElement::onbeforeprint();
+setter HTMLFrameSetElement::onbeforeprint();
+getter HTMLFrameSetElement::onbeforeunload();
+setter HTMLFrameSetElement::onbeforeunload();
+getter HTMLFrameSetElement::onhashchange();
+setter HTMLFrameSetElement::onhashchange();
+getter HTMLFrameSetElement::onlanguagechange();
+setter HTMLFrameSetElement::onlanguagechange();
+getter HTMLFrameSetElement::onmessage();
+setter HTMLFrameSetElement::onmessage();
+getter HTMLFrameSetElement::onoffline();
+setter HTMLFrameSetElement::onoffline();
+getter HTMLFrameSetElement::ononline();
+setter HTMLFrameSetElement::ononline();
+getter HTMLFrameSetElement::onpagehide();
+setter HTMLFrameSetElement::onpagehide();
+getter HTMLFrameSetElement::onpageshow();
+setter HTMLFrameSetElement::onpageshow();
+getter HTMLFrameSetElement::onpopstate();
+setter HTMLFrameSetElement::onpopstate();
+getter HTMLFrameSetElement::onstorage();
+setter HTMLFrameSetElement::onstorage();
+getter HTMLFrameSetElement::onunload();
+setter HTMLFrameSetElement::onunload();
diff --git a/docs/UnimplementedJavascript.txt b/docs/UnimplementedJavascript.txt
index 630941039..af0228530 100644
--- a/docs/UnimplementedJavascript.txt
+++ b/docs/UnimplementedJavascript.txt
@@ -646,32 +646,6 @@ method HTMLFormElement::reset();
 method HTMLFormElement::submit();
 getter HTMLFrameElement::contentDocument(user);
 getter HTMLFrameElement::contentWindow(user);
-getter HTMLFrameSetElement::onafterprint(user);
-setter HTMLFrameSetElement::onafterprint(user);
-getter HTMLFrameSetElement::onbeforeprint(user);
-setter HTMLFrameSetElement::onbeforeprint(user);
-getter HTMLFrameSetElement::onbeforeunload(user);
-setter HTMLFrameSetElement::onbeforeunload(user);
-getter HTMLFrameSetElement::onhashchange(user);
-setter HTMLFrameSetElement::onhashchange(user);
-getter HTMLFrameSetElement::onlanguagechange(user);
-setter HTMLFrameSetElement::onlanguagechange(user);
-getter HTMLFrameSetElement::onmessage(user);
-setter HTMLFrameSetElement::onmessage(user);
-getter HTMLFrameSetElement::onoffline(user);
-setter HTMLFrameSetElement::onoffline(user);
-getter HTMLFrameSetElement::ononline(user);
-setter HTMLFrameSetElement::ononline(user);
-getter HTMLFrameSetElement::onpagehide(user);
-setter HTMLFrameSetElement::onpagehide(user);
-getter HTMLFrameSetElement::onpageshow(user);
-setter HTMLFrameSetElement::onpageshow(user);
-getter HTMLFrameSetElement::onpopstate(user);
-setter HTMLFrameSetElement::onpopstate(user);
-getter HTMLFrameSetElement::onstorage(user);
-setter HTMLFrameSetElement::onstorage(user);
-getter HTMLFrameSetElement::onunload(user);
-setter HTMLFrameSetElement::onunload(user);
 getter HTMLHRElement::color(string);
 setter HTMLHRElement::color(string);
 getter HTMLIFrameElement::allowFullscreen(boolean);