diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp
index 17ba1c55ae06..d84743cf1d86 100644
--- a/content/base/src/nsDOMAttribute.cpp
+++ b/content/base/src/nsDOMAttribute.cpp
@@ -178,12 +178,33 @@ nsDOMAttribute::GetName(nsAString& aName)
   return NS_OK;
 }
 
+already_AddRefed<nsIAtom>
+nsDOMAttribute::GetNameAtom(nsIContent* aContent)
+{
+  nsIAtom* result = nsnull;
+  if (mNodeInfo->NamespaceID() == kNameSpaceID_None &&
+      aContent->IsInHTMLDocument() &&
+      aContent->IsHTML()) {
+    nsAutoString name;
+    mNodeInfo->NameAtom()->ToString(name);
+    nsAutoString lower;
+    ToLowerCase(name, lower);
+    nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(lower);
+    nameAtom.swap(result);
+  } else {
+    nsCOMPtr<nsIAtom> nameAtom = mNodeInfo->NameAtom();
+    nameAtom.swap(result);
+  }
+  return result;
+}
+
 NS_IMETHODIMP
 nsDOMAttribute::GetValue(nsAString& aValue)
 {
   nsIContent* content = GetContentInternal();
   if (content) {
-    content->GetAttr(mNodeInfo->NamespaceID(), mNodeInfo->NameAtom(), aValue);
+    nsCOMPtr<nsIAtom> nameAtom = GetNameAtom(content);
+    content->GetAttr(mNodeInfo->NamespaceID(), nameAtom, aValue);
   }
   else {
     aValue = mValue;
@@ -198,8 +219,9 @@ nsDOMAttribute::SetValue(const nsAString& aValue)
   nsresult rv = NS_OK;
   nsIContent* content = GetContentInternal();
   if (content) {
+    nsCOMPtr<nsIAtom> nameAtom = GetNameAtom(content);
     rv = content->SetAttr(mNodeInfo->NamespaceID(),
-                          mNodeInfo->NameAtom(),
+                          nameAtom,
                           mNodeInfo->GetPrefixAtom(),
                           aValue,
                           PR_TRUE);
@@ -441,14 +463,14 @@ nsDOMAttribute::SetPrefix(const nsAString& aPrefix)
 
   nsIContent* content = GetContentInternal();
   if (content) {
-    nsIAtom *name = mNodeInfo->NameAtom();
+    nsCOMPtr<nsIAtom> name = GetNameAtom(content);
     PRInt32 nameSpaceID = mNodeInfo->NamespaceID();
 
     nsAutoString tmpValue;
     if (content->GetAttr(nameSpaceID, name, tmpValue)) {
       content->UnsetAttr(nameSpaceID, name, PR_TRUE);
 
-      content->SetAttr(newNodeInfo->NamespaceID(), newNodeInfo->NameAtom(),
+      content->SetAttr(newNodeInfo->NamespaceID(), name,
                        newNodeInfo->GetPrefixAtom(), tmpValue, PR_TRUE);
     }
   }
diff --git a/content/base/src/nsDOMAttribute.h b/content/base/src/nsDOMAttribute.h
index 3e254cae8aa0..b5f8c9ee30a6 100644
--- a/content/base/src/nsDOMAttribute.h
+++ b/content/base/src/nsDOMAttribute.h
@@ -126,6 +126,8 @@ protected:
   static PRBool sInitialized;
 
 private:
+  already_AddRefed<nsIAtom> GetNameAtom(nsIContent* aContent);
+
   nsresult EnsureChildState(PRBool aSetText, PRBool &aHasChild) const;
 
   PRUint32 GetChildCount(PRBool aSetText) const
diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp
index f38e3b50a5fa..2df085e5e304 100644
--- a/content/base/src/nsDOMAttributeMap.cpp
+++ b/content/base/src/nsDOMAttributeMap.cpp
@@ -51,6 +51,7 @@
 #include "nsContentUtils.h"
 #include "nsNodeInfoManager.h"
 #include "nsAttrName.h"
+#include "nsUnicharUtils.h"
 
 //----------------------------------------------------------------------
 
@@ -336,6 +337,13 @@ nsDOMAttributeMap::SetNamedItemInternal(nsIDOMNode *aNode,
         NS_ENSURE_SUCCESS(rv, rv);
       }
       else {
+        if (mContent->IsInHTMLDocument() &&
+            mContent->IsHTML()) {
+          nsAutoString lower;
+          ToLowerCase(name, lower);
+          name = lower;
+        }
+
         rv = mContent->NodeInfo()->NodeInfoManager()->
           GetNodeInfo(name, nsnull, kNameSpaceID_None, getter_AddRefs(ni));
         NS_ENSURE_SUCCESS(rv, rv);
@@ -353,19 +361,8 @@ nsDOMAttributeMap::SetNamedItemInternal(nsIDOMNode *aNode,
     NS_ENSURE_SUCCESS(rv, rv);
     iAttribute->SetMap(this);
 
-    if (!aWithNS && ni->NamespaceID() == kNameSpaceID_None &&
-        mContent->IsHTML()) {
-      // Set via setAttribute(), which may do normalization on the
-      // attribute name for HTML
-      nsCOMPtr<nsIDOMElement> ourElement(do_QueryInterface(mContent));
-      NS_ASSERTION(ourElement, "HTML content that's not an element?");
-      rv = ourElement->SetAttribute(name, value);
-    }
-    else {
-      // It's OK to just use SetAttr
-      rv = mContent->SetAttr(ni->NamespaceID(), ni->NameAtom(),
-                             ni->GetPrefixAtom(), value, PR_TRUE);
-    }
+    rv = mContent->SetAttr(ni->NamespaceID(), ni->NameAtom(),
+                           ni->GetPrefixAtom(), value, PR_TRUE);
     if (NS_FAILED(rv)) {
       DropAttribute(ni->NamespaceID(), ni->NameAtom());
     }
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 4ea4ebe781cb..b6c8195cd09c 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -266,6 +266,7 @@ _TEST_FILES = 	test_bug5141.html \
 		test_bug513194.html \
 		test_bug461735.html \
 		test_bug380418.html \
+		test_bug469304.html \
 		test_bug465767.html \
 		test_bug380418.html^headers^ \
 		test_bug422403-1.html \
diff --git a/content/base/test/test_bug469304.html b/content/base/test/test_bug469304.html
new file mode 100644
index 000000000000..1a6091514502
--- /dev/null
+++ b/content/base/test/test_bug469304.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=469304
+-->
+<head>
+  <title>Test for Bug 469304</title>
+  <script type="application/javascript" src="/MochiKit/MochiKit.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=469304">Mozilla Bug 469304</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 469304 **/
+function testGetAttribute() {
+  var a1 = document.createAttribute("aa");
+  a1.nodeValue = "lowercase";
+  var a2 = document.createAttribute("AA");
+  a2.nodeValue = "UPPERCASE";
+  document.body.setAttributeNode(a1);
+  document.body.setAttributeNode(a2);
+  var log = document.getElementById("log");
+  is(document.body.getAttribute('aa'), "UPPERCASE", "Wrong value (1)");
+  is(document.body.getAttribute('AA'), "UPPERCASE", "Wrong value (2)");
+
+  var s = "";
+  for (var i = 0; i < document.body.attributes.length; ++i) {
+    s += document.body.attributes[i].nodeName + "=" +
+         document.body.attributes[i].nodeValue;
+  }
+  is(s, "AA=UPPERCASE", "Wrong attribute!");
+
+  is(document.body.getAttributeNode("aa"), document.body.getAttributeNode("AA"),
+     "Wrong node!");
+
+  document.body.getAttributeNode("AA").nodeValue = "FOO";
+  is(document.body.getAttribute("AA"), "FOO", "Wrong value!");
+
+  document.body.removeAttributeNode(document.body.getAttributeNode("AA"));
+  ok(!document.body.hasAttribute("AA"), "Should not have attribute!");
+  ok(!document.body.getAttributeNode("AA"), "Should not have attribute node!");
+  ok(!document.body.hasAttribute("aa"), "Should not have attribute!");
+  ok(!document.body.getAttributeNode("aa"), "Should not have attribute node!");
+
+  is(a2.nodeValue, "FOO", "Wrong value!");
+  a2.nodeValue = "UPPERCASE";
+  is(a2.nodeValue, "UPPERCASE", "Wrong value!");
+
+  document.body.setAttributeNode(a2);
+  is(document.body.getAttribute("AA"), "UPPERCASE", "wrong value!");
+  ok(document.body.getAttributeNode("AA"), "Should have attribute node!");
+  is(document.body.getAttribute("aa"), "UPPERCASE", "wrong value!");
+  ok(document.body.getAttributeNode("aa"), "Should have attribute node!");
+}
+testGetAttribute();
+
+// A bit modified testcases from WebKit.
+function testGetAttributeCaseInsensitive() {
+  var div = document.createElement('div');
+  div.setAttribute("mixedCaseAttrib", "x");
+  // Do original case lookup, and lowercase lookup.
+  return div.getAttribute("mixedcaseattrib");
+}
+is(testGetAttributeCaseInsensitive(), "x", "(1)");
+
+function testGetAttributeNodeMixedCase() {
+  var div = document.createElement('div');
+  var a = div.ownerDocument.createAttribute("mixedCaseAttrib");
+  a.nodeValue = "x";
+  div.setAttributeNode(a);
+  return div.getAttribute("mixedCaseAttrib");
+}
+is(testGetAttributeNodeMixedCase(), "x", "(2)");
+
+function testGetAttributeNodeLowerCase(div) {
+  var div = document.createElement('div');
+  var a = div.ownerDocument.createAttribute("lowercaseattrib");
+  a.nodeValue = "x";
+  div.setAttributeNode(a);
+  return div.getAttribute("lowerCaseAttrib");
+}
+is(testGetAttributeNodeLowerCase(), "x", "(3)");
+
+function testSetAttributeNodeKeepsRef(div) {
+  var div = document.createElement('div');
+  var a = div.ownerDocument.createAttribute("attrib_name");
+  a.nodeValue = "0";
+  div.setAttributeNode(a);
+  // Mutate the attribute node.
+  a.nodeValue = "1";
+  return div.getAttribute("attrib_name");
+}
+is(testSetAttributeNodeKeepsRef(), "1", "(4)");
+
+function testAttribNodeNamePreservesCase() {
+  var div = document.createElement('div');
+  var a = div.ownerDocument.createAttribute("A");
+  a.nodeValue = "x";
+  div.setAttributeNode(a);
+  var result = [ a.name, a.nodeName ];
+  return result.join(",");
+}
+is(testAttribNodeNamePreservesCase(), "A,A", "(5)");
+
+function testAttribNodeNamePreservesCaseGetNode() {
+  var body = document.body;
+  var a = body.ownerDocument.createAttribute("A");
+  a.nodeValue = "x";
+  body.setAttributeNode(a);
+  a = document.body.getAttributeNode("A");
+  if (!a)
+      return "FAIL";
+  var result = [ a.name, a.nodeName ];
+  return result.join(",");
+}
+is(testAttribNodeNamePreservesCaseGetNode(), "A,A", "(6)");
+
+function testAttribNodeNamePreservesCaseGetNode2() {
+  var body = document.body;
+  var a = body.ownerDocument.createAttribute("B");
+  a.nodeValue = "x";
+  body.setAttributeNode(a);
+  a = document.body.getAttributeNode("B");
+  if (!a)
+      return "FAIL";
+  // Now create node second time
+  a = body.ownerDocument.createAttribute("B");
+  a.nodeValue = "x";
+  body.setAttributeNode(a);
+  a = document.body.getAttributeNode("B");
+  var result = [ a.name, a.nodeName ];
+  return result.join(",");
+}
+is(testAttribNodeNamePreservesCaseGetNode2(), "B,B", "(7)");
+
+function testAttribNodeNameGetMutate() {
+  var body = document.body;
+  var a = body.ownerDocument.createAttribute("c");
+  a.nodeValue = "0";
+  body.setAttributeNode(a);
+  a = document.body.getAttributeNode("c");
+  a.value = "1";
+  a = document.body.getAttributeNode("c");
+  return a.nodeValue;
+}
+is(testAttribNodeNameGetMutate(), "1", "(8)");
+
+var node = document.createElement("div");
+var attrib = document.createAttribute("myAttrib");
+attrib.nodeValue = "XXX";
+node.setAttributeNode(attrib);
+// Note, this is different to what WebKit does
+is((new XMLSerializer).serializeToString(node),
+   "<div xmlns=\"http://www.w3.org/1999/xhtml\" myattrib=\"XXX\"></div>", "(9)");
+is(node.getAttributeNode('myAttrib').name, "myAttrib", "(10)");
+is(node.getAttributeNode('myattrib').name, "myAttrib", "(11)");
+is(attrib.name, "myAttrib", "(12)");
+
+</script>
+</pre>
+</body>
+</html>