diff --git a/Makefile b/Makefile
index 6656a01523..6692fba35f 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,10 @@ prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 datadir ?= $(datarootdir)
 bindir ?= $(prefix)/bin
+libexecdir ?= $(prefix)/lib
 BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
-DATA_INSTALL_DIR = $(DESTDIR)$(datadir)/openra
+# TODO: separate data and binaries properly
+DATA_INSTALL_DIR = $(DESTDIR)$(libexecdir)/openra
 
 # install tools
 RM = rm
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index 51caaeb5f7..3aa9fe6afe 100644
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -20,7 +20,7 @@ cd ../..
 make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
 # Launch scripts (executed by Desura)
-cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/share/openra/" || exit 3
+cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3
 
 # Icons and .desktop files
 make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index b640d3fdde..b5e88ee430 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -13,7 +13,7 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec
 rootdir=`readlink -f $2`
 sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec
 
-for x in `find $rootdir/usr/share/openra -type d`
+for x in `find $rootdir/usr/lib/openra -type d`
 do
     y="${x#$rootdir}"
     sed -i "/%files/ a ${y}" openra.spec