diff --git a/run-debug.sh b/run-debug.sh
new file mode 100755
index 00000000..7552f6aa
--- /dev/null
+++ b/run-debug.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Q3Rally (debug) Unix Launcher
+
+PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g'`
+ARCH=`uname -m | sed -e s/i.86/i386/`
+BUILD=debug
+
+BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
+
+if [ ! -f $BIN ]; then
+	echo "Game binary '$BIN' not found!"
+	echo "Run 'make -C engine $BUILD' to build it."
+	exit 1
+fi
+
+# Run the game
+./$BIN +set fs_basepath "." +set vm_game 0 +set vm_cgame 0 +set vm_ui 0 $@
+
diff --git a/run.sh b/run.sh
index 5810d4c5..8f802d29 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,22 @@
 #!/bin/sh
-./engine/build/release-linux-i386/q3rally.i386 +set fs_basepath "." +set vm_game 0 +set vm_cgame 0 +set vm_ui 0
+# Q3Rally Unix Launcher
+
+PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g'`
+ARCH=`uname -m | sed -e s/i.86/i386/`
+BUILD=release
+
+BIN=q3rally.$ARCH
+
+if [ ! -f $BIN ]; then
+BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
+fi
+
+if [ ! -f $BIN ]; then
+	echo "Game binary '$BIN' not found!"
+	echo "Run 'make -C engine' to build it."
+	exit 1
+fi
+
+# Run the game
+./$BIN +set fs_basepath "." +set vm_game 0 +set vm_cgame 0 +set vm_ui 0 $@