diff --git a/senpy/__main__.py b/senpy/__main__.py
index 6ed8552..0c239ea 100644
--- a/senpy/__main__.py
+++ b/senpy/__main__.py
@@ -31,7 +31,7 @@ import argparse
 
 patch_all(thread=False)
 
-if __name__ == '__main__':
+def main():
     parser = argparse.ArgumentParser(description='Run a Senpy server')
     parser.add_argument('--level',
                         "-l",
@@ -47,7 +47,7 @@ if __name__ == '__main__':
     parser.add_argument('--default-plugins',
                         action='store_true',
                         default=False,
-                        help='Run the application in debug mode')
+                        help='Load the default plugins')
     parser.add_argument('--host',
                         type=str,
                         default="127.0.0.1",
@@ -68,7 +68,6 @@ if __name__ == '__main__':
     app.debug = args.debug
     sp = Senpy(app, args.plugins_folder, default_plugins=args.default_plugins)
     sp.activate_all()
-    import logging
     http_server = WSGIServer((args.host, args.port), app)
     try:
         print("Server running on port %s:%d. Ctrl+C to quit" % (args.host,
@@ -77,3 +76,6 @@ if __name__ == '__main__':
     except KeyboardInterrupt:
         http_server.stop()
         print("Bye!")
+
+if __name__ == '__main__':
+    main()
diff --git a/setup.py b/setup.py
index c5a3831..ed83f3d 100644
--- a/setup.py
+++ b/setup.py
@@ -36,4 +36,9 @@ extendable, so new algorithms and sources can be used.
     tests_require=test_reqs,
     test_suite="nose.collector",
     include_package_data=True,
+    entry_points={
+        'console_scripts': [
+            'senpy = senpy.__main__:main'
+            ]
+        }
 )