diff --git a/.gitignore b/.gitignore
index 6952079765..2ca4a65ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ nailgun.log
 lock
 
 .idea
+
+Nailgun.egg-info
diff --git a/nailgun/MANIFEST.in b/nailgun/MANIFEST.in
index 3dbcd16697..8fa4462b8c 100644
--- a/nailgun/MANIFEST.in
+++ b/nailgun/MANIFEST.in
@@ -1,2 +1,3 @@
+include manage.py
 recursive-include nailgun *
-recursive-include static *
\ No newline at end of file
+recursive-include static *
diff --git a/nailgun/nailgun/manage.py b/nailgun/manage.py
similarity index 96%
rename from nailgun/nailgun/manage.py
rename to nailgun/manage.py
index ea789a7eb7..b028287942 100755
--- a/nailgun/nailgun/manage.py
+++ b/nailgun/manage.py
@@ -16,12 +16,11 @@ from nailgun.db import load_db_driver, syncdb
 from nailgun.unit_test import TestRunner
 from nailgun.urls import urls
 from nailgun.logger import Log
+from nailgun.wsgi import app
+
 
 logging.basicConfig(level="DEBUG")
 
-app = web.application(urls, locals())
-app.add_processor(load_db_driver)
-app.add_processor(check_client_content_type)
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
diff --git a/nailgun/nailgun/db.py b/nailgun/nailgun/db.py
index d1ff31621b..3b3d1d3847 100644
--- a/nailgun/nailgun/db.py
+++ b/nailgun/nailgun/db.py
@@ -37,17 +37,17 @@ def load_db_driver(handler):
 
 
 def syncdb():
-    from api.models import Base
+    from nailgun.api.models import Base
     Base.metadata.create_all(engine)
 
 
 def dropdb():
-    from api.models import Base
+    from nailgun.api.models import Base
     Base.metadata.drop_all(engine)
 
 
 def flush():
-    from api.models import Base
+    from nailgun.api.models import Base
     session = scoped_session(sessionmaker(bind=engine))
     for table in reversed(Base.metadata.sorted_tables):
         session.execute(table.delete())
diff --git a/nailgun/nailgun/test/base.py b/nailgun/nailgun/test/base.py
index f956db3206..c233c19a6e 100644
--- a/nailgun/nailgun/test/base.py
+++ b/nailgun/nailgun/test/base.py
@@ -17,7 +17,7 @@ from nailgun.api.models import Release
 from nailgun.api.models import Cluster
 
 from nailgun.api.urls import urls
-from nailgun.manage import app
+from nailgun.wsgi import app
 from nailgun.db import dropdb, syncdb, flush
 from nailgun.fixtures.fixman import upload_fixture
 
diff --git a/nailgun/nailgun/test/test_db_refresh.py b/nailgun/nailgun/test/test_db_refresh.py
index 4d61be9b80..8be430da12 100644
--- a/nailgun/nailgun/test/test_db_refresh.py
+++ b/nailgun/nailgun/test/test_db_refresh.py
@@ -7,7 +7,7 @@ from sqlalchemy.orm.events import orm
 
 from nailgun.api.models import engine, Node
 from nailgun.db import dropdb, syncdb, flush, Query
-from nailgun.manage import app
+from nailgun.wsgi import app
 
 
 class TestDBRefresh(TestCase):
diff --git a/nailgun/setup.py b/nailgun/setup.py
index 6e07b5eadf..b84b3e808b 100644
--- a/nailgun/setup.py
+++ b/nailgun/setup.py
@@ -55,6 +55,7 @@ if __name__ == "__main__":
           zip_safe=False,
           install_requires=requires,
           include_package_data=True,
+          scripts=['manage.py'],
           entry_points={
               'console_scripts': [
                   'nailgun_syncdb = nailgun.db:syncdb',