diff --git a/README.md b/README.md
index 72a3ade6..b69f1b46 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,12 @@ Type: `String`
 
 Placeholder text for the typeahead input.
 
+#### props.textarea
+
+Type: `Boolean`
+
+Set to `true` to use a `<textarea>` element rather than an `<input>` element
+
 #### props.inputProps
 
 Type: `Object`
diff --git a/src/typeahead/index.js b/src/typeahead/index.js
index 4ae3572c..edcfcf84 100644
--- a/src/typeahead/index.js
+++ b/src/typeahead/index.js
@@ -28,6 +28,7 @@ var Typeahead = React.createClass({
     allowCustomValues: React.PropTypes.number,
     defaultValue: React.PropTypes.string,
     placeholder: React.PropTypes.string,
+    textarea: React.PropTypes.bool,
     inputProps: React.PropTypes.object,
     onOptionSelected: React.PropTypes.func,
     onChange: React.PropTypes.func,
@@ -56,6 +57,7 @@ var Typeahead = React.createClass({
       allowCustomValues: 0,
       defaultValue: "",
       placeholder: "",
+      textarea: false,
       inputProps: {},
       onOptionSelected: function(option) {},
       onChange: function(event) {},
@@ -249,10 +251,12 @@ var Typeahead = React.createClass({
     classes[this.props.className] = !!this.props.className;
     var classList = classNames(classes);
 
+    var InputElement = this.props.textarea ? 'textarea' : 'input';
+
     return (
       <div className={classList}>
         { this._renderHiddenInput() }
-        <input ref="entry" type="text"
+        <InputElement ref="entry" type="text"
           {...this.props.inputProps}
           placeholder={this.props.placeholder}
           className={inputClassList}
diff --git a/test/typeahead-test.js b/test/typeahead-test.js
index 7ae3ad54..d38d3b79 100644
--- a/test/typeahead-test.js
+++ b/test/typeahead-test.js
@@ -443,5 +443,26 @@ describe('Typeahead Component', function() {
         });
       });
     });
+
+    context('textarea', function() {
+      it('should render a <textarea> input', function() {
+        var component = TestUtils.renderIntoDocument(<Typeahead
+          options={ BEATLES }
+          textarea={ true }
+        />);
+
+        var input = component.refs.entry.getDOMNode();
+        assert.equal(input.tagName.toLowerCase(), 'textarea');
+      });
+
+      it('should render a <input> input', function() {
+        var component = TestUtils.renderIntoDocument(<Typeahead
+          options={ BEATLES }
+        />);
+
+        var input = component.refs.entry.getDOMNode();
+        assert.equal(input.tagName.toLowerCase(), 'input');
+      });
+    })
   });
 });