diff --git a/docs/src/app/components/pages/components/buttons.jsx b/docs/src/app/components/pages/components/buttons.jsx
index eaf3f17abece0c..6bb4e05fa377f0 100644
--- a/docs/src/app/components/pages/components/buttons.jsx
+++ b/docs/src/app/components/pages/components/buttons.jsx
@@ -62,6 +62,12 @@ class ButtonPage extends React.Component {
       {
         name: 'Flat Button',
         infoArray: [
+          {
+            name: 'disabled',
+            type: 'bool',
+            header: 'optional',
+            desc: 'Disables the button if set to true.'
+          },
           {
             name: 'label or children',
             type: 'string (label) or HTML/React elements (children)',
@@ -118,6 +124,12 @@ class ButtonPage extends React.Component {
       {
         name: 'Raised Button',
         infoArray: [
+          {
+            name: 'disabled',
+            type: 'bool',
+            header: 'optional',
+            desc: 'Disables the button if set to true.'
+          },
           {
             name: 'label or children',
             type: 'string (label) or HTML/React elements (children)',
@@ -162,6 +174,12 @@ class ButtonPage extends React.Component {
       {
         name: 'Floating Action Button',
         infoArray: [
+          {
+            name: 'disabled',
+            type: 'bool',
+            header: 'optional',
+            desc: 'Disables the button if set to true.'
+          },
           {
             name: 'iconClassName',
             type: 'string',
diff --git a/src/floating-action-button.jsx b/src/floating-action-button.jsx
index 1e5b3424c0e4f2..9cb4fefc466e5f 100644
--- a/src/floating-action-button.jsx
+++ b/src/floating-action-button.jsx
@@ -23,6 +23,7 @@ var RaisedButton = React.createClass({
   },
 
   propTypes: {
+    disabled: React.PropTypes.bool,
     iconClassName: React.PropTypes.string,
     iconStyle: React.PropTypes.object,
     mini: React.PropTypes.bool,
diff --git a/src/raised-button.jsx b/src/raised-button.jsx
index a0ecdc88edd28e..73df7cf51bddb8 100644
--- a/src/raised-button.jsx
+++ b/src/raised-button.jsx
@@ -16,6 +16,7 @@ var RaisedButton = React.createClass({
 
   propTypes: {
     className: React.PropTypes.string,
+    disabled: React.PropTypes.bool,
     label: function(props, propName, componentName){
       if (!props.children && !props.label) {
         return new Error('Warning: Required prop `label` or `children` was not specified in `'+ componentName + '`.')