diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index abaceb196675..c418943312fa 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -688,6 +688,9 @@ nsAccessible::GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState)
 
   PRInt32 intrinsicState = mContent->IntrinsicState();
 
+  if (intrinsicState & NS_EVENT_STATE_INVALID)
+    *aState |= nsIAccessibleStates::STATE_INVALID;
+
   if (intrinsicState & NS_EVENT_STATE_REQUIRED)
     *aState |= nsIAccessibleStates::STATE_REQUIRED;
 
diff --git a/accessible/tests/mochitest/states/test_inputs.html b/accessible/tests/mochitest/states/test_inputs.html
index 92f91a723efd..9f653500ea77 100644
--- a/accessible/tests/mochitest/states/test_inputs.html
+++ b/accessible/tests/mochitest/states/test_inputs.html
@@ -46,6 +46,14 @@
       testStates(invalid[i] + "2", 0, 0, STATE_INVALID);
     }
 
+    // invalid/valid state
+    var invalid = ["maxlength","pattern","email","url"];
+    document.getElementById("maxlength").value = "i am too long";
+    for (i in invalid) {
+      testStates(invalid[i], STATE_INVALID);
+      testStates(invalid[i] + "2", 0, 0, STATE_INVALID);
+    }
+
     SimpleTest.finish();
   }
 
@@ -75,6 +83,11 @@
      title="Expose intrinsic invalid state to accessibility API">
     Mozilla Bug 601205
   </a>
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=601205"
+     title="Expose intrinsic invalid state to accessibility API">
+    Mozilla Bug 601205
+  </a>
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test">
@@ -121,5 +134,15 @@
   <input id="url" type="url" value="foo">
   <input id="url2" type="url" value="http://mozilla.org/">
 
+  <!-- invalid/valid -->
+  <input id="maxlength" maxlength="1">
+  <input id="maxlength2" maxlength="100" value="foo">
+  <input id="pattern" pattern="bar" value="foo">
+  <input id="pattern2" pattern="bar" value="bar">
+  <input id="email" type="email" value="foo">
+  <input id="email2" type="email" value="foo@bar.com">
+  <input id="url" type="url" value="foo">
+  <input id="url2" type="url" value="http://mozilla.org/">
+
   </body>
 </html>