diff --git a/components/button/button.jsx b/components/button/button.jsx
index 99a9788668..2e7247678d 100644
--- a/components/button/button.jsx
+++ b/components/button/button.jsx
@@ -57,6 +57,17 @@ export default class Button extends React.Component {
     </button>;
   }
 }
+
+Button.propTypes = {
+  type: React.PropTypes.string,
+  shape: React.PropTypes.string,
+  size: React.PropTypes.string,
+  htmlType: React.PropTypes.string,
+  onClick: React.PropTypes.func,
+  loading: React.PropTypes.bool,
+  className: React.PropTypes.string,
+};
+
 Button.defaultProps = {
   onClick() {},
 };
diff --git a/components/button/demo/loading.md b/components/button/demo/loading.md
index 711fe4c008..8586cb5092 100644
--- a/components/button/demo/loading.md
+++ b/components/button/demo/loading.md
@@ -22,13 +22,13 @@ var App = React.createClass({
   },
   render() {
     return <div>
-      <Button type="primary" size="large" loading>
+      <Button type="primary" size="large" loading={true}>
         加载中
       </Button>
-      <Button type="primary" loading="true">
+      <Button type="primary" loading={true}>
         加载中
       </Button>
-      <Button type="primary" size="small" loading>
+      <Button type="primary" size="small" loading={true}>
         加载中
       </Button>
       <br />