diff --git a/lib/capybara/node/simple.rb b/lib/capybara/node/simple.rb
index 5049893d..7bf09373 100644
--- a/lib/capybara/node/simple.rb
+++ b/lib/capybara/node/simple.rb
@@ -108,6 +108,15 @@ module Capybara
         native[:checked]
       end
 
+      ##
+      #
+      # Whether or not the element is disabled.
+      #
+      # @return [Boolean]     Whether the element is disabled
+      def disabled?
+        native[:disabled]
+      end
+
       ##
       #
       # Whether or not the element is selected.
diff --git a/spec/basic_node_spec.rb b/spec/basic_node_spec.rb
index 0897326c..6832ba96 100644
--- a/spec/basic_node_spec.rb
+++ b/spec/basic_node_spec.rb
@@ -10,6 +10,11 @@ describe Capybara do
             <p>Yes it is</p>
           </div>
 
+          <form>
+            <input type="text" name="bleh" disabled="disabled"/>
+            <input type="text" name="meh"/>
+          </form>
+
           <div id="footer" style="display: none">
             <p>c2010</p>
             <p>Jonas Nicklas</p>
@@ -77,13 +82,18 @@ describe Capybara do
     end
 
     it "allows finding elements and extracting the path" do
-      string.find('//input').value.should == 'bar'
+      string.find('//div/input').value.should == 'bar'
       string.find('//select').value.should == 'Capybara'
     end
 
     it "allows finding elements and checking if they are visible" do
       string.find('//h1').should be_visible
-      string.find('//input').should_not be_visible
+      string.find('//div/input').should_not be_visible
+    end
+
+    it "allows finding elements and checking if they are disabled" do
+      string.find('//form/input[@name="bleh"]').should be_disabled
+      string.find('//form/input[@name="meh"]').should_not be_disabled
     end
   end
 end