diff --git a/components/date_picker/index.jsx b/components/date_picker/index.jsx
index 028976c88..1490edeec 100644
--- a/components/date_picker/index.jsx
+++ b/components/date_picker/index.jsx
@@ -10,9 +10,14 @@ class DatePicker extends React.Component {
     maxDate: React.PropTypes.object,
     minDate: React.PropTypes.object,
     onChange: React.PropTypes.func,
+    placeholder: React.PropTypes.string,
     value: React.PropTypes.object
   };
 
+  static defaultProps = {
+    placeholder: 'Choose a date'
+  };
+
   state = {
     active: false
   };
@@ -40,7 +45,7 @@ class DatePicker extends React.Component {
         <Input
           className={style.input}
           onMouseDown={this.handleInputMouseDown}
-          placeholder='Pick up date'
+          placeholder={this.props.placeholder}
           readOnly={true}
           type='text'
           value={date}
diff --git a/components/date_picker/readme.md b/components/date_picker/readme.md
index b56d9a02f..e8acc2af1 100644
--- a/components/date_picker/readme.md
+++ b/components/date_picker/readme.md
@@ -40,4 +40,5 @@ class DatePickerTest extends React.Component {
 | `maxDate`         | `Date`    |                 | Date object with the maximum selectable date. |
 | `minDate`         | `Date`    |                 | Date object with the minimum selectable date. |
 | `onChange`       | `Function`       |                | Callback called when the picker value is changed.|
+| `placeholder`     | `String`        |             | The text string to use like a input placeholder.|
 | `value`         | `Date`    |                 | Date object with the currently selected date. |
diff --git a/package.json b/package.json
index 0dffab5ef..6a6a59785 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-toolbox",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "homepage": "www.react-toolbox.com",
   "description": "A set of React components implementing Google's Material Design specification with the power of CSS Modules.",
   "author": "React Toolbox Team (http://github.com/react-toolbox)",