diff --git a/makebuildserver b/makebuildserver
index 69eea7b6..eb41a211 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -13,6 +13,11 @@ from clint.textui import progress
 from optparse import OptionParser
 
 
+if not os.path.exists('makebuildserver') and not os.path.exists('buildserver'):
+    print('This must be run as ./makebuildserver in fdroidserver.git!')
+    sys.exit(1)
+
+
 def vagrant(params, cwd=None, printout=False):
     """Run vagrant.
 
@@ -87,10 +92,6 @@ elif os.path.exists('makebs.config.py'):
 if '__builtins__' in config:
     del(config['__builtins__'])  # added by compile/exec
 
-if not os.path.exists('makebuildserver') or not os.path.exists(serverdir):
-    print('This must be run from the correct directory!')
-    sys.exit(1)
-
 if os.path.exists(boxfile):
     os.remove(boxfile)