diff --git a/Makefile b/Makefile
index 547065c7dd..be7f481b95 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ install: all
 	
 	@echo "#!/bin/sh" > openra
 	@echo "cd "$(datadir)"/openra" >> openra
-	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe" >> openra
+	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=.openra" >> openra
 	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
 		
diff --git a/packaging/linux/pkgbuild/PKGBUILD b/packaging/linux/pkgbuild/PKGBUILD
index d267e4153e..0df1f4086c 100644
--- a/packaging/linux/pkgbuild/PKGBUILD
+++ b/packaging/linux/pkgbuild/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Matthew Bowra-Dean <matthew@ijw.co.nz>
 pkgname=openra-git
-pkgver=20100511
+pkgver=20100801.2
 pkgrel=1
 pkgdesc="Open Source rebuild of the Red Alert game engine using Mono/OpenGL."
 arch=(any)
@@ -41,7 +41,8 @@ build() {
   rm -rf "$srcdir/$_gitname-build"
   git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
-  git checkout $_gittag
+  _fixedgittag=`echo $_gittag | sed "s/\\./-/g"`
+  git checkout $_fixedgittag
 
   #
   # BUILD HERE
diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh
index beee09e03a..23b35edfc5 100644
--- a/packaging/linux/pkgbuild/buildpackage.sh
+++ b/packaging/linux/pkgbuild/buildpackage.sh
@@ -8,11 +8,12 @@ then
     exit $E_BADARGS
 fi
 
-sed -i "s/pkgver=[0-9]\+/pkgver=$5/" PKGBUILD
+PKGVERSION=`echo $5 | sed "s/-/\\./g"`
+sed -i "s/pkgver=[0-9\\.]\+/pkgver=$PKGVERSION/" PKGBUILD
 
 makepkg --holdver
 
-PACKAGEFILE="openra-git-$5-1-any.pkg.tar.xz"
+PACKAGEFILE="openra-git-$PKGVERSION-1-any.pkg.tar.xz"
 
 size=`stat -c "%s" $PACKAGEFILE`
 
diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index 3cf18f950a..a23cebe30a 100644
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -8,20 +8,21 @@ then
     exit $E_BADARGS
 fi
 
-sed -i "s/%define version [0-9]\+/%define version $5/" openra.spec
+PKGVERSION=`echo $5 | sed "s/-/\\./g"`
+sed -i "s/%define version [0-9\\.]\+/%define version $PKGVERSION/" openra.spec
 cp openra.spec $6/SPECS/
 
 cd $6
-wget http://github.com/chrisforbes/OpenRA/tarball/playtest-$5 -O SOURCES/openra-$5.tar.gz
+wget http://github.com/chrisforbes/OpenRA/tarball/playtest-$5 -O SOURCES/openra-$PKGVERSION.tar.gz
 
-folder=`tar -ztf SOURCES/openra-$5.tar.gz | head -n 1 | grep -o -E [[:alnum:]-]+`
+folder=`tar -ztf SOURCES/openra-$PKGVERSION.tar.gz | head -n 1 | grep -o -E [[:alnum:]-]+`
 
 sed -i "s/%define folder [[:alnum:]-]\+/%define folder $folder/" SPECS/openra.spec
 
 rpmbuild --target noarch -bb SPECS/openra.spec
 
 cd RPMS/noarch/
-PACKAGEFILE=openra-$5-1.noarch.rpm
+PACKAGEFILE=openra-$PKGVERSION-1.noarch.rpm
 size=`stat -c "%s" $PACKAGEFILE`
 
 echo "$5,$size,$PACKAGEFILE" > /tmp/rpmlatest.txt
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
index 05666b2fba..49361c5270 100644
--- a/packaging/linux/rpm/openra.spec
+++ b/packaging/linux/rpm/openra.spec
@@ -1,5 +1,5 @@
 %define name openra
-%define version 20100511
+%define version 20100801.2
 %define folder chrisforbes-openra-51b83e0
 Name: %{name}
 Version: %{version}
@@ -75,7 +75,6 @@ gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll
 /usr/share/openra/*.exe
 /usr/share/openra/*.ttf
 /usr/share/openra/*.dll
-/usr/share/openra/*.ini
 /usr/share/openra/shaders/
 /usr/share/openra/mods/
 /usr/share/openra/thirdparty/