diff --git a/CHANGELOG b/CHANGELOG
index 2737cf5..34b6e12 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Make Element#writeAttribute handle frameborder attribute in IE. Closes #11068. [staaky, Tobie Langel]
+
 * Minor clean-up of selector.js. Closes #10844. [RQuadling]
 
 * Make String#unescapeHTML strip tags in IE. Closes #10173. [kangax]
diff --git a/src/dom.js b/src/dom.js
index a2c3862..8e8029b 100644
--- a/src/dom.js
+++ b/src/dom.js
@@ -850,7 +850,7 @@ else if (Prototype.Browser.IE) {
   Element._attributeTranslations.has = {};
     
   $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
-      'encType maxLength readOnly longDesc').each(function(attr) {
+      'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
     Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
     Element._attributeTranslations.has[attr.toLowerCase()] = attr;
   });
diff --git a/test/unit/dom.html b/test/unit/dom.html
index 9875226..4a9fb83 100644
--- a/test/unit/dom.html
+++ b/test/unit/dom.html
@@ -1384,6 +1384,9 @@
       table.writeAttribute('cellpadding', '3')
       assertEqual('2', table.readAttribute('cellspacing'));
       assertEqual('3', table.readAttribute('cellpadding'));
+
+      var iframe = new Element('iframe', { frameborder: 0 });
+      assertIdentical(0, parseInt(iframe.readAttribute('frameborder')));
     }},
     
     testElementWriteAttributeWithCustom: function() {with(this) {