diff --git a/app/admin.py b/app/admin.py
index b6776fb..a18e048 100644
--- a/app/admin.py
+++ b/app/admin.py
@@ -1,6 +1,6 @@
-from flask.ext.admin import Admin
-from flask.ext.admin.contrib.sqla import ModelView
-from flask.ext import login
+from flask_admin import Admin
+from flask_admin.contrib.sqla import ModelView
+import flask_login as login
 
 
 from app import app, db
diff --git a/app/app.py b/app/app.py
index c4a37c5..4765a7c 100644
--- a/app/app.py
+++ b/app/app.py
@@ -1,8 +1,8 @@
 import logging
 from logging.handlers import TimedRotatingFileHandler
 from flask import Flask
-from flask.ext.bootstrap import Bootstrap, StaticCDN
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_bootstrap import Bootstrap, StaticCDN
+from flask_sqlalchemy import SQLAlchemy
 from flask_debugtoolbar import DebugToolbarExtension
 
 from airbrake import Airbrake, AirbrakeHandler
diff --git a/app/config.example.py b/app/config.example.py
index 4031e8e..b402a50 100644
--- a/app/config.example.py
+++ b/app/config.example.py
@@ -2,6 +2,7 @@
 
 class Configuration(object):
     SQLALCHEMY_DATABASE_URI = 'sqlite:///haldis.db'
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
     DEBUG = True
     SECRET_KEY = '<change>'
     SLACK_WEBHOOK = '<add url>'
diff --git a/app/forms.py b/app/forms.py
index ca6a047..a10ba66 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -1,8 +1,10 @@
 from datetime import datetime, timedelta
 from flask import session
-from flask.ext.login import current_user
-from flask_wtf import Form
+from flask_login import current_user
+from flask_wtf import FlaskForm as Form
 from wtforms import SelectField, DateTimeField, validators, SubmitField, StringField
+
+
 from models import User, Location
 from utils import euro
 
diff --git a/app/haldis.py b/app/haldis.py
index fd0f6cc..272d516 100644
--- a/app/haldis.py
+++ b/app/haldis.py
@@ -8,8 +8,8 @@ from models import *
 from forms import *
 from utils import *
 from views import *
-from flask.ext.migrate import Migrate, MigrateCommand
-from flask.ext.script import Manager
+from flask_migrate import Migrate, MigrateCommand
+from flask_script import Manager
 
 if __name__ == '__main__':
     # do it here, because make accessing db changes only possible when executing the program directly
diff --git a/app/login.py b/app/login.py
index 275766f..0c96825 100644
--- a/app/login.py
+++ b/app/login.py
@@ -1,5 +1,5 @@
 from flask import redirect, abort, session, url_for
-from flask.ext.login import LoginManager, current_user, logout_user
+from flask_login import LoginManager, current_user, logout_user
 
 
 from app import app
diff --git a/app/views/__init__.py b/app/views/__init__.py
index 01f9a67..63a34e6 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 
 from flask import url_for, render_template, abort
-from flask.ext.login import login_required
+from flask_login import login_required
 
 from app import app
 from models import Order, Location
diff --git a/app/views/order.py b/app/views/order.py
index 2d66241..d007d09 100644
--- a/app/views/order.py
+++ b/app/views/order.py
@@ -3,7 +3,7 @@ import json
 from threading import Thread
 import requests
 from flask import url_for, render_template, abort, redirect, Blueprint, flash, session, request
-from flask.ext.login import current_user, login_required
+from flask_login import current_user, login_required
 import random
 from datetime import datetime
 
diff --git a/app/zeus.py b/app/zeus.py
index 2421a1b..1caaab7 100644
--- a/app/zeus.py
+++ b/app/zeus.py
@@ -1,5 +1,5 @@
 from flask import redirect, url_for, session, jsonify, flash, request
-from flask.ext.login import login_user
+from flask_login import login_user
 from flask_oauthlib.client import OAuth, OAuthException
 import json
 import requests