diff --git a/Lib/hotshot/stones.py b/Lib/hotshot/stones.py
new file mode 100644
index 0000000..5a029d5
--- /dev/null
+++ b/Lib/hotshot/stones.py
@@ -0,0 +1,35 @@
+import errno
+import hotshot
+import hotshot.stats
+import os
+import sys
+import test.pystone
+
+
+if sys.argv[1:]:
+    logfile = sys.argv[1]
+    cleanup = 0
+else:
+    import tempfile
+    logfile = tempfile.mktemp()
+    cleanup = 1
+
+
+p = hotshot.Profile(logfile)
+benchtime, stones = p.runcall(test.pystone.pystones)
+p.close()
+
+print "Pystone(%s) time for %d passes = %g" % \
+      (test.pystone.__version__, test.pystone.LOOPS, benchtime)
+print "This machine benchmarks at %g pystones/second" % stones
+
+stats = hotshot.stats.load(logfile)
+if cleanup:
+    os.unlink(logfile)
+stats.strip_dirs()
+stats.sort_stats('time', 'calls')
+try:
+    stats.print_stats(20)
+except IOError, e:
+    if e.errno != errno.EPIPE:
+        raise