diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..c460143
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import setuptools
+
+setuptools.setup(
+    name='speedtest-cli',
+    version='0.2',
+    description=('Command line interface for testing internet bandwidth using '
+                 'speedtest.net'),
+    author='Matt Martz',
+    author_email='matt@sivel.net',
+    url='https://github.com/sivel/speedtest-cli',
+    license='Apache License, Version 2.0',
+    py_modules=['speedtest_cli'],
+    entry_points={
+        'console_scripts': [
+            'speedtest=speedtest_cli:main',
+            'speedtest-cli=speedtest_cli:main'
+        ]
+    }
+)
diff --git a/speedtest-cli b/speedtest_cli.py
similarity index 99%
rename from speedtest-cli
rename to speedtest_cli.py
index 559898a..0043851 100755
--- a/speedtest-cli
+++ b/speedtest_cli.py
@@ -517,10 +517,14 @@ def speedtest():
         print_('Share results: http://www.speedtest.net/result/%s.png' %
                resultid[0])
 
-if __name__ == '__main__':
+
+def main():
     try:
         speedtest()
     except KeyboardInterrupt:
         print_('\nCancelling...')
 
+if __name__ == '__main__':
+    main()
+
 # vim:ts=4:sw=4:expandtab