diff --git a/manage.py b/manage.py
deleted file mode 100644
index a567619..0000000
--- a/manage.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from realms.cli import main
-
-if __name__ == '__main__':
-    main()
diff --git a/realms/cli.py b/realms-wiki
old mode 100644
new mode 100755
similarity index 98%
rename from realms/cli.py
rename to realms-wiki
index e3ba12a..58eb349
--- a/realms/cli.py
+++ b/realms-wiki
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from gevent import wsgi
 from realms import config, app, cli, db
 from realms.lib.util import random_string
@@ -139,6 +141,5 @@ def drop_db():
     click.echo("Dropping all tables")
     db.drop_all()
 
-
-def main():
+if __name__ == '__main__':
     cli()
\ No newline at end of file
diff --git a/setup.py b/setup.py
index f028533..2746f86 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ with open('README.md') as f:
 with open('requirements.txt') as f:
     required = f.read().splitlines()
 
-VERSION = '0.1.4'
+VERSION = '0.1.8'
 
 CLASSIFIERS = [
     'Intended Audience :: Developers',
@@ -21,6 +21,7 @@ setup(name='realms-wiki',
       version=VERSION,
       packages=find_packages(),
       install_requires=required,
+      scripts=['realms-wiki'],
       author='Matthew Scragg',
       author_email='scragg@gmail.com',
       maintainer='Matthew Scragg',
@@ -31,8 +32,4 @@ setup(name='realms-wiki',
       description=DESCRIPTION,
       long_description=LONG_DESCRIPTION,
       platforms=['any'],
-      classifiers=CLASSIFIERS,
-      entry_points='''
-        [console_scripts]
-        realms-wiki=realms.cli:main
-      ''')
\ No newline at end of file
+      classifiers=CLASSIFIERS)
\ No newline at end of file