diff --git a/repo2docker/__main__.py b/repo2docker/__main__.py
new file mode 100644
index 00000000..c2fa78c9
--- /dev/null
+++ b/repo2docker/__main__.py
@@ -0,0 +1,5 @@
+from .app import Repo2Docker
+
+if __name__ == '__main__':
+    f = Repo2Docker()
+    f.run()
diff --git a/repo2docker/app.py b/repo2docker/app.py
index 6580d22b..865bc505 100644
--- a/repo2docker/app.py
+++ b/repo2docker/app.py
@@ -186,7 +186,3 @@ class Repo2Docker(Application):
             shutil.rmtree(checkout_path)
 
 
-if __name__ == '__main__':
-    f = Repo2Docker()
-    f.initialize()
-    f.run()
diff --git a/setup.py b/setup.py
index 7daf5818..f4800ab3 100644
--- a/setup.py
+++ b/setup.py
@@ -12,4 +12,9 @@ setup(
     author_email='yuvipanda@gmail.com',
     license='BSD',
     packages=find_packages(),
+    entry_points={
+        'console_scripts': [
+            'jupyter-repo2docker = repo2docker.__main__:main'
+        ]
+    },
 )