diff --git a/.gitignore b/.gitignore
index c7b3c4f5c3fc9e1162b3c8ee9ac824149096b457..b0252d0de45488097f358650699773138b833b4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,7 @@ coverage.xml
 UML.png
 *.log
 MySU/settings/local.py
-manage.py
+#manage.py
 MySU/static/*
 MySU/media/*
 */fixtures/generated/*.*
diff --git a/manage.py b/manage.py
new file mode 100644
index 0000000000000000000000000000000000000000..37cf449be48c05c82f003d1641d57797c13bd082
--- /dev/null
+++ b/manage.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+import os
+import socket
+import sys
+
+if __name__ == "__main__":
+    hostname = socket.gethostname()
+    if hostname.startswith("runner"):
+        os.environ.setdefault("DJANGO_SETTINGS_MODULE", "MySU.settings.test")
+    elif hostname in ('sun.snt.utwente.nl', 'venus'):
+        os.environ.setdefault("DJANGO_SETTINGS_MODULE", "MySU.settings.develop")
+    elif hostname in ('linux401', 'mars'):
+        if "api" in os.path.dirname(os.path.realpath(__file__)):
+            os.environ.setdefault("DJANGO_SETTINGS_MODULE", "MySU.settings.production")
+        else:
+            os.environ.setdefault("DJANGO_SETTINGS_MODULE", "MySU.settings.pilot")
+    else:
+        os.environ.setdefault("DJANGO_SETTINGS_MODULE", "MySU.settings.local")
+
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError:
+        # The above import may fail for some other reason. Ensure that the
+        # issue is really that Django is missing to avoid masking other
+        # exceptions on Python 2.
+        try:
+            import django
+        except ImportError:
+            raise ImportError(
+                "Couldn't import Django. Are you sure it's installed and "
+                "available on your PYTHONPATH environment variable? Did you "
+                "forget to activate a virtual environment?"
+            )
+        raise
+    execute_from_command_line(sys.argv)