diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 183e7a69773..fc57c148343 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -815,6 +815,8 @@ nsHTMLInputElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
       UpdateTypeMismatchValidityState();
     } else if (aName == nsGkAtoms::max) {
       UpdateRangeOverflowValidityState();
+    } else if (aName == nsGkAtoms::min) {
+      UpdateRangeUnderflowValidityState();
     }
 
     UpdateState(aNotify);
@@ -3800,6 +3802,30 @@ nsHTMLInputElement::IsRangeOverflow() const
   return value > max;
 }
 
+bool
+nsHTMLInputElement::IsRangeUnderflow() const
+{
+  nsAutoString minStr;
+  if (!DoesMinMaxApply() ||
+      !GetAttr(kNameSpaceID_None, nsGkAtoms::min, minStr)) {
+    return false;
+  }
+
+  PRInt32 ec;
+  double min = minStr.ToDouble(&ec);
+  if (NS_FAILED(ec)) {
+    return false;
+  }
+
+  double value = GetValueAsDouble();
+  // value can be NaN when value="".
+  if (value != value) {
+    return false;
+  }
+
+  return value < min;
+}
+
 void
 nsHTMLInputElement::UpdateTooLongValidityState()
 {
@@ -3884,6 +3910,12 @@ nsHTMLInputElement::UpdateRangeOverflowValidityState()
   SetValidityState(VALIDITY_STATE_RANGE_OVERFLOW, IsRangeOverflow());
 }
 
+void
+nsHTMLInputElement::UpdateRangeUnderflowValidityState()
+{
+  SetValidityState(VALIDITY_STATE_RANGE_UNDERFLOW, IsRangeUnderflow());
+}
+
 void
 nsHTMLInputElement::UpdateAllValidityStates(bool aNotify)
 {
@@ -3893,6 +3925,7 @@ nsHTMLInputElement::UpdateAllValidityStates(bool aNotify)
   UpdateTypeMismatchValidityState();
   UpdatePatternMismatchValidityState();
   UpdateRangeOverflowValidityState();
+  UpdateRangeUnderflowValidityState();
 
   if (validBefore != IsValid()) {
     UpdateState(aNotify);
@@ -4020,6 +4053,26 @@ nsHTMLInputElement::GetValidationMessage(nsAString& aValidationMessage,
       aValidationMessage = message;
       break;
     }
+    case VALIDITY_STATE_RANGE_UNDERFLOW:
+    {
+      nsXPIDLString message;
+      nsAutoString minStr;
+      GetAttr(kNameSpaceID_None, nsGkAtoms::min, minStr);
+
+      // We want to show the double as parsed so we parse it and change minStr.
+      PRInt32 ec;
+      double min = minStr.ToDouble(&ec);
+      NS_ASSERTION(NS_SUCCEEDED(ec), "min must be a number at this point!");
+      minStr.Truncate();
+      minStr.AppendFloat(min);
+
+      const PRUnichar* params[] = { minStr.get() };
+      rv = nsContentUtils::FormatLocalizedString(nsContentUtils::eDOM_PROPERTIES,
+                                                 "FormValidationRangeUnderflow",
+                                                 params, message);
+      aValidationMessage = message;
+      break;
+    }
     default:
       rv = nsIConstraintValidation::GetValidationMessage(aValidationMessage, aType);
   }
diff --git a/content/html/content/src/nsHTMLInputElement.h b/content/html/content/src/nsHTMLInputElement.h
index 015ef1110f0..3981803d490 100644
--- a/content/html/content/src/nsHTMLInputElement.h
+++ b/content/html/content/src/nsHTMLInputElement.h
@@ -217,11 +217,13 @@ public:
   bool     HasTypeMismatch() const;
   bool     HasPatternMismatch() const;
   bool     IsRangeOverflow() const;
+  bool     IsRangeUnderflow() const;
   void     UpdateTooLongValidityState();
   void     UpdateValueMissingValidityState();
   void     UpdateTypeMismatchValidityState();
   void     UpdatePatternMismatchValidityState();
   void     UpdateRangeOverflowValidityState();
+  void     UpdateRangeUnderflowValidityState();
   void     UpdateAllValidityStates(bool aNotify);
   void     UpdateBarredFromConstraintValidation();
   nsresult GetValidationMessage(nsAString& aValidationMessage,
diff --git a/content/html/content/src/nsIConstraintValidation.cpp b/content/html/content/src/nsIConstraintValidation.cpp
index 1a377ccc480..24919a626df 100644
--- a/content/html/content/src/nsIConstraintValidation.cpp
+++ b/content/html/content/src/nsIConstraintValidation.cpp
@@ -74,6 +74,8 @@ nsIConstraintValidation::GetValidationMessage(nsAString& aValidationMessage)
       GetValidationMessage(aValidationMessage, VALIDITY_STATE_PATTERN_MISMATCH);
     } else if (GetValidityState(VALIDITY_STATE_RANGE_OVERFLOW)) {
       GetValidationMessage(aValidationMessage, VALIDITY_STATE_RANGE_OVERFLOW);
+    } else if (GetValidityState(VALIDITY_STATE_RANGE_UNDERFLOW)) {
+      GetValidationMessage(aValidationMessage, VALIDITY_STATE_RANGE_UNDERFLOW);
     } else {
       // TODO: The other messages have not been written
       // because related constraint validation are not implemented yet.
diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in
index 9e455ff4d2e..81a71feadb7 100644
--- a/content/html/content/test/forms/Makefile.in
+++ b/content/html/content/test/forms/Makefile.in
@@ -43,6 +43,7 @@ _TEST_FILES = \
 		test_meter_element.html \
 		test_meter_pseudo-classes.html \
 		test_max_attribute.html \
+		test_min_attribute.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/forms/test_min_attribute.html b/content/html/content/test/forms/test_min_attribute.html
new file mode 100644
index 00000000000..7e0af0bf58e
--- /dev/null
+++ b/content/html/content/test/forms/test_min_attribute.html
@@ -0,0 +1,152 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=635553
+-->
+<head>
+  <title>Test for Bug 635553</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=635499">Mozilla Bug 635499</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 635553 **/
+
+var types = [
+  [ 'hidden',         false ],
+  [ 'text',           false ],
+  [ 'search',         false ],
+  [ 'tel',            false ],
+  [ 'url',            false ],
+  [ 'email',          false ],
+  [ 'password',       false ],
+  [ 'datetime',       true,  true ],
+  [ 'date',           true,  true ],
+  [ 'month',          true,  true ],
+  [ 'week',           true,  true ],
+  [ 'time',           true,  true ],
+  [ 'datetime-local', true,  true ],
+  [ 'number',         true ],
+  [ 'range',          true,  true ],
+  [ 'color',          false, true ],
+  [ 'checkbox',       false ],
+  [ 'radio',          false ],
+  [ 'file',           false ],
+  [ 'submit',         false ],
+  [ 'image',          false ],
+  [ 'reset',          false ],
+  [ 'button',         false ],
+];
+
+var input = document.createElement("input");
+document.getElementById('content').appendChild(input);
+
+function checkValidity(aElement, aValidity)
+{
+  is(aElement.validity.valid, aValidity,
+     "element validity should be " + aValidity);
+  is(aElement.validity.rangeUnderflow, !aValidity,
+     "element underflow status should be " + !aValidity);
+  is(aElement.validationMessage, aValidity
+       ? "" : "Please select a value that is higher than " + aElement.min + ".",
+     "validation message");
+
+  is(aElement.mozMatchesSelector(":valid"), aElement.willValidate && aValidity,
+     (aElement.willValidate && aValidity) ? ":valid should apply" : "valid shouldn't apply");
+  is(aElement.mozMatchesSelector(":invalid"), aElement.willValidate && !aValidity,
+     (aElement.wil && aValidity) ? ":invalid shouldn't apply" : "valid should apply");
+
+  // TODO: Add tests for out-of-range / in-range selectors, see bug 635554.
+}
+
+for each (var data in types) {
+  input.type = data[0];
+  var apply = data[1];
+
+  if (data[2]) {
+    todo_is(input.type, data[0], data[0] + " isn't implemented yet");
+    continue;
+  }
+
+  checkValidity(input, true);
+
+  input.min = '0';
+  checkValidity(input, true);
+
+  if (input.type == 'url') {
+    input.value = 'http://mozilla.org';
+    checkValidity(input, true);
+  } else if (input.type == 'email') {
+    input.value = 'foo@bar.com';
+    checkValidity(input, true);
+  } else if (input.type == 'file') {
+    // Need privileges to set a filename with .value.
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+    var dirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
+                           .getService(Components.interfaces.nsIProperties);
+    var file = dirSvc.get("ProfD", Components.interfaces.nsIFile);
+    file.append('635499_file');
+    var outStream = Components.
+                    classes["@mozilla.org/network/file-output-stream;1"].
+                    createInstance(Components.interfaces.nsIFileOutputStream);
+    outStream.init(file, 0x02 | 0x08 | 0x20, // write, create, truncate
+                   0666, 0);
+    outStream.write("foo", 3);
+    outStream.close();
+
+    input.value = file.path;
+    checkValidity(input, true);
+
+    file.remove(false);
+  } else {
+    input.value = '1';
+    checkValidity(input, true);
+
+    input.value = '0';
+    checkValidity(input, true);
+
+    input.value = 'foo';
+    checkValidity(input, true);
+
+    input.value = '-0.1';
+    checkValidity(input, !apply);
+
+    input.min = '-1';
+    checkValidity(input, true);
+
+    input.value = '-42';
+    checkValidity(input, !apply);
+  }
+
+  input.min = '';
+  checkValidity(input, true);
+
+  input.min = 'foo';
+  checkValidity(input, true);
+
+  // Check that we correctly convert input.min to a double in validationMessage.
+  if (input.type == 'number') {
+    input.min = "4.333333333333333333333333333333333331";
+    input.value = "2";
+    is(input.validationMessage,
+       "Please select a value that is higher than 4.33333333333333.",
+       "validation message");
+  }
+
+  // Cleaning up,
+  input.removeAttribute('min');
+  input.value = '';
+}
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties
index de292d08965..77db8becfb4 100644
--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -42,6 +42,8 @@ FormValidationPatternMismatch=Please match the requested format.
 FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
 # LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number or a date.
 FormValidationRangeOverflow=Please select a value that is lower than %S.
+# LOCALIZATION NOTE (FormValidationRangeUnderflow): %S can be a number or a date.
+FormValidationRangeUnderflow=Please select a value that is higher than %S.
 GetAttributeNodeWarning=Use of getAttributeNode() is deprecated. Use getAttribute() instead.
 SetAttributeNodeWarning=Use of setAttributeNode() is deprecated. Use setAttribute() instead.
 GetAttributeNodeNSWarning=Use of getAttributeNodeNS() is deprecated. Use getAttributeNS() instead.