diff --git a/src/Select.js b/src/Select.js
index d647fda3e5..10a2d2db95 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -59,7 +59,9 @@ const Select = React.createClass({
 		optionComponent: React.PropTypes.func,      // option component to render in dropdown
 		optionRenderer: React.PropTypes.func,       // optionRenderer: function (option) {}
 		options: React.PropTypes.array,             // array of options
-		placeholder: React.PropTypes.string,        // field placeholder, displayed when there's no value
+		placeholder: React.PropTypes.oneOfType([    // field placeholder, displayed when there's no value
+			React.PropTypes.string,
+			React.PropTypes.object]),
 		searchable: React.PropTypes.bool,           // whether to enable searching feature or not
 		simpleValue: React.PropTypes.bool,          // pass the value to onChange as a simple value (legacy pre 1.0 mode), defaults to false
 		style: React.PropTypes.object,              // optional style to apply to the control