diff --git a/.gitignore b/.gitignore
index 3dc1304..04d3991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ dist
 build
 eggs
 parts
-bin
 var
 sdist
 develop-eggs
@@ -26,7 +25,7 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
-cover
+htmlcov
 
 # Translations
 *.mo
diff --git a/falcon/bin/__init__.py b/falcon/bin/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/falcon/bin/bench.py b/falcon/bin/bench.py
new file mode 100644
index 0000000..9d91b37
--- /dev/null
+++ b/falcon/bin/bench.py
@@ -0,0 +1,38 @@
+"""Benchmark runner.
+
+Copyright 2013 by Rackspace Hosting, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+
+import sys
+
+from falcon import bench
+
+
+def fail(returncode, e):
+    sys.stderr.write('\nERROR: %s\n\n' % e)
+    sys.exit(returncode)
+
+
+def run():
+    try:
+        bench.run()
+    except KeyboardInterrupt:
+        fail(1, 'Interrupted, terminating benchmark')
+    except RuntimeError as e:
+        fail(1, e)
+
+if __name__ == '__main__':
+    run()
\ No newline at end of file