diff --git a/pywb/apps/cdx_server.py b/pywb/apps/cdx_server.py
index a16df1fe..396d5490 100644
--- a/pywb/apps/cdx_server.py
+++ b/pywb/apps/cdx_server.py
@@ -13,5 +13,8 @@ application = init_app(create_cdx_server_app,
                        load_yaml=True,
                        config_file=DEFAULT_CONFIG)
 
+def main():
+    start_wsgi_server(application, 'CDX Server')
+
 if __name__ == "__main__":
-    start_wsgi_server(application)
+    main()
diff --git a/pywb/apps/wayback.py b/pywb/apps/wayback.py
index 0cda072b..82a3ca19 100644
--- a/pywb/apps/wayback.py
+++ b/pywb/apps/wayback.py
@@ -6,5 +6,8 @@ from pywb.core.pywb_init import create_wb_router
 #=================================================================
 application = init_app(create_wb_router, load_yaml=True)
 
+def main():
+    start_wsgi_server(application, 'Wayback')
+
 if __name__ == "__main__":
-    start_wsgi_server(application)
+    main()
diff --git a/pywb/framework/wsgi_wrappers.py b/pywb/framework/wsgi_wrappers.py
index f7b97e4f..17f2cd7f 100644
--- a/pywb/framework/wsgi_wrappers.py
+++ b/pywb/framework/wsgi_wrappers.py
@@ -114,7 +114,7 @@ DEFAULT_CONFIG_FILE = 'config.yaml'
 def init_app(init_func, load_yaml=True, config_file=None):
     logging.basicConfig(format='%(asctime)s: [%(levelname)s]: %(message)s',
                         level=logging.DEBUG)
-    logging.info('')
+    logging.debug('')
 
     if load_yaml:
         if not config_file:
@@ -135,13 +135,13 @@ def init_app(init_func, load_yaml=True, config_file=None):
         raise
     else:
         msg = '*** pywb app inited with config from "%s"!\n'
-        logging.info(msg, init_func.__name__)
+        logging.debug(msg, init_func.__name__)
 
     return WSGIApp(wb_router)
 
 
 #=================================================================
-def start_wsgi_server(the_app):  # pragma: no cover
+def start_wsgi_server(the_app, name):  # pragma: no cover
     from wsgiref.simple_server import make_server
     from optparse import OptionParser
 
@@ -158,7 +158,7 @@ def start_wsgi_server(the_app):  # pragma: no cover
     if not port:
         port = DEFAULT_PORT
 
-    logging.debug('Starting CDX Server on port %s', port)
+    logging.info('Starting %s on port %s', name, port)
 
     try:
         httpd = make_server('', port, the_app)
@@ -166,4 +166,4 @@ def start_wsgi_server(the_app):  # pragma: no cover
     except KeyboardInterrupt as ex:
         pass
     finally:
-        logging.debug('Stopping CDX Server')
+        logging.info('Stopping %s', name)
diff --git a/setup.py b/setup.py
index 8ed33dc7..7b52ec45 100755
--- a/setup.py
+++ b/setup.py
@@ -76,4 +76,9 @@ setup(
        ],
     cmdclass={'test': PyTest},
     test_suite='',
+    entry_points="""
+        [console_scripts]
+        wayback = pywb.apps.wayback:main
+        cdx-server = pywb.apps.cdx_server:main
+        """
     )