diff --git a/run_flaschengeist b/run_flaschengeist
index 1636efd..b48c5c8 100644
--- a/run_flaschengeist
+++ b/run_flaschengeist
@@ -9,10 +9,18 @@ if __name__ == '__main__':
     parser.add_argument("--host", help="set hostname to listen on", default="127.0.0.1")
     parser.add_argument("--port", help="set port to listen on", type=int, default=5000)
     parser.add_argument("--debug", help="run in debug mode", action="store_true")
+    parser.add_argument("--install", help="installer", action="store_true")
     args = parser.parse_args()
 
     app = create_app()
-    if args.debug:
-        app.run(args.host, args.port, debug=True)
+    if args.install:
+        with app.app_context():
+            from flaschengeist.system.models import *
+            from flaschengeist.system.database import db
+            db.create_all()
+            db.session.commit()
     else:
-        bjoern.run(app, args.host, args.port, reuse_port=True)
+        if args.debug:
+            app.run(args.host, args.port, debug=True)
+        else:
+            bjoern.run(app, args.host, args.port, reuse_port=True)