diff --git a/lib/capybara/driver/webkit/node.rb b/lib/capybara/driver/webkit/node.rb
index ffe58d20..ddfcf670 100644
--- a/lib/capybara/driver/webkit/node.rb
+++ b/lib/capybara/driver/webkit/node.rb
@@ -22,11 +22,7 @@ def [](name)
 
     def value
       if multiple_select?
-        self.find(".//option").select do |option|
-          option["selected"] == "selected"
-        end.map do |option|
-          option.value
-        end
+        self.find(".//option").select(&:selected?).map(&:value)
       else
         invoke "value"
       end
diff --git a/src/capybara.js b/src/capybara.js
index 290383db..fd6733be 100644
--- a/src/capybara.js
+++ b/src/capybara.js
@@ -196,13 +196,11 @@ Capybara = {
 
   selectOption: function(index) {
     this.nodes[index].selected = true;
-    this.nodes[index].setAttribute("selected", "selected");
     this.trigger(index, "change");
   },
 
   unselectOption: function(index) {
     this.nodes[index].selected = false;
-    this.nodes[index].removeAttribute("selected");
     this.trigger(index, "change");
   },