diff --git a/html/dom/elements-forms.js b/html/dom/elements-forms.js
index 051bc2087f3155..448a72f5ed6070 100644
--- a/html/dom/elements-forms.js
+++ b/html/dom/elements-forms.js
@@ -27,7 +27,6 @@ var formElements = {
     accept: "string",
     alt: "string",
     autocomplete: {type: "string", customGetter: true},
-    autofocus: "boolean",
     defaultChecked: {type: "boolean", domAttrName: "checked"},
     dirName: "string",
     disabled: "boolean",
@@ -65,7 +64,6 @@ var formElements = {
     useMap: "string",
   },
   button: {
-    autofocus: "boolean",
     disabled: "boolean",
     // "formAction" has magic hard-coded in reflection.js
     formAction: "url",
@@ -79,7 +77,6 @@ var formElements = {
   },
   select: {
     autocomplete: {type: "string", customGetter: true},
-    autofocus: "boolean",
     disabled: "boolean",
     multiple: "boolean",
     name: "string",
@@ -99,7 +96,6 @@ var formElements = {
   },
   textarea: {
     autocomplete: {type: "string", customGetter: true},
-    autofocus: "boolean",
     cols: {type: "limited unsigned long with fallback", defaultVal: 20},
     dirName: "string",
     disabled: "boolean",
diff --git a/html/dom/reflection.js b/html/dom/reflection.js
index 5209762660bb46..fca9e43f245a97 100644
--- a/html/dom/reflection.js
+++ b/html/dom/reflection.js
@@ -900,6 +900,7 @@ for (var element in elements) {
     ReflectionTests.reflects({type: "enum", keywords: ["ltr", "rtl", "auto"]}, "dir", element);
     ReflectionTests.reflects("string", "className", element, "class");
     ReflectionTests.reflects("tokenlist", "classList", element, "class");
+    ReflectionTests.reflects("boolean", "autofocus", element);
     ReflectionTests.reflects("boolean", "hidden", element);
     ReflectionTests.reflects("string", "accessKey", element);
     // Don't try to test the defaultVal -- it should be either 0 or -1, but the