diff --git a/Makefile b/Makefile
index 678ef430f9..60685d8690 100644
--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,7 @@ install-core: default
 	@echo "#!/bin/sh" 				>  openra
 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra
 	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' 	>> openra
-	@echo 'DATADIR="$${ROOTDIR}/'"$(datadir)"'"'	>> openra
+	@echo 'DATADIR="$${ROOTDIR}'"$(datadir)"'"'	>> openra
 	@echo 'cd "$${DATADIR}/openra"' 		>> openra
 	@echo 'exec mono OpenRA.Game.exe "$$@"' 	>> openra
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 81d9343cba..7475e4fb7d 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -21,6 +21,10 @@ cp -R $rootdir/usr root
 
 # Binaries go in /usr/games
 mv root/usr/bin/ root/usr/games/
+sed "s/\/usr\/bin\//\/usr\/games\//" root/usr/games/openra > temp
+mv temp root/usr/games/openra
+sed "s/\/usr\/bin\//\/usr\/games\//" root/usr/games/openra-editor > temp
+mv temp root/usr/games/openra-editor
 
 # Put the copyright and changelog in /usr/share/doc/openra/
 mkdir -p root/usr/share/doc/openra/