diff --git a/mk/linux/pull.sh b/mk/linux/pull.sh
index 07f641546..65c083316 100755
--- a/mk/linux/pull.sh
+++ b/mk/linux/pull.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 cd ../..
 git pull
-currentDir=$PWD
-cd /usr/share/zetaglest
+cd mk/linux
+mkdir build
+cd build
+mkdir data
+cd data
 git pull
-cd $currentDir
+cd ../..
diff --git a/mk/linux/setup.sh b/mk/linux/setup.sh
index 026b7de4c..f1b354e2b 100755
--- a/mk/linux/setup.sh
+++ b/mk/linux/setup.sh
@@ -4,10 +4,12 @@
 # Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+
 
-currentDir=$PWD
-cd /usr/share
-git clone https://github.com/ZetaGlest/zetaglest-data.git zetaglest
-cd $currentDir
+mkdir build
+cd build
+git clone https://github.com/ZetaGlest/zetaglest-data.git data
+cd ..
 ./pull.sh
 ./build-zg.sh
-chmod -R 777 build/
+if [ `id -u`'x' == '0x' ] || [ "$1" == "--manually" ]; then
+	chmod -R 777 build/
+fi
diff --git a/mk/linux/zetaglest.sh b/mk/linux/zetaglest.sh
index 628e1edaa..7ede0b823 100755
--- a/mk/linux/zetaglest.sh
+++ b/mk/linux/zetaglest.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 export DBUS_FATAL_WARNINGS=0
 unset XMODIFIERS
-./build/zetaglest
+cd build
+./zetaglest
+cd ..
diff --git a/mk/shared/glest-dev.ini b/mk/shared/glest-dev.ini
index ee57531b6..769b66349 100644
--- a/mk/shared/glest-dev.ini
+++ b/mk/shared/glest-dev.ini
@@ -1 +1 @@
-DataPath=/usr/share/zetaglest/
+DataPath=./data/