diff --git a/packaging/linux/pkgbuild/PKGBUILD b/packaging/linux/pkgbuild/PKGBUILD
index c42c0da715..a0315f93fa 100644
--- a/packaging/linux/pkgbuild/PKGBUILD
+++ b/packaging/linux/pkgbuild/PKGBUILD
@@ -7,7 +7,7 @@ arch=(any)
 url="http://open-ra.org"
 license=('GPL3')
 groups=()
-depends=('mono' 'mono-addins' 'openal' 'mesa' 'nvidia-cg-toolkit' 'freetype2' 'sdl')
+depends=('mono' 'openal' 'mesa' 'nvidia-cg-toolkit' 'freetype2' 'sdl')
 makedepends=('git' 'unzip' 'wget')
 optdepends=()
 provides=()
@@ -20,9 +20,9 @@ source=()
 noextract=()
 md5sums=()
 
-_gitroot="git://github.com/beedee/OpenRA.git"
+_gitroot="git://github.com/chrisforbes/OpenRA.git"
 _gitname="OpenRA"
-_gittag="pkgtest-$pkgver"
+_gittag="playtest-$pkgver"
 
 build() {
   cd "$srcdir"
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
new file mode 100644
index 0000000000..54c759ee9b
--- /dev/null
+++ b/packaging/linux/rpm/openra.spec
@@ -0,0 +1,86 @@
+%define name openra
+%define version 20100505
+%define commit fee35e3
+Name: %{name}
+Version: %{version}
+Release: 1
+Summary: Open Source rebuild of the Red Alert game engine using Mono/OpenGL.
+License: GPL3
+URL: http://open-ra.org
+Group: Amusements/Games
+Packager: Matthew Bowra-Dean <matthew@ijw.co.nz>
+Requires: mono-core mono-devel SDL freetype2 openal Mesa cg
+Prefix: /usr
+Source: %{name}-%{version}.tar.gz
+Buildroot: /tmp/openra
+
+%description
+A multiplayer reimplementation of the Command & Conquer: Red Alert game 
+engine in .NET/Mono, OpenGL, OpenAL and SDL. Has extensive modding support
+and includes Command & Conquer as an official mod.
+
+%prep
+%setup -n chrisforbes-OpenRA-%{commit}
+
+%build
+make prefix="$RPM_BUILD_ROOT/usr"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make prefix="$RPM_BUILD_ROOT/usr" install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+cd /tmp
+while true 
+do
+    read -s -n1 -p "Download and install RA packages? [Y/n]"
+    case $REPLY in
+        y|Y|"") 
+            wget http://open-ra.org/packages/ra-packages.zip
+            mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages
+            unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages
+            break;;
+        n|N) break;;
+        *) echo "Please enter y or n.";;
+    esac
+done
+
+while true 
+do
+    read -s -n1 -p "Download and install C&C packages? [Y/n]"
+    case $REPLY in
+        y|Y|"") 
+            wget http://open-ra.org/packages/cnc-packages.zip
+            mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages
+            unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages
+            break;;
+        n|N) break;;
+        *) echo "Please enter y or n.";;
+    esac
+done
+
+gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.Cg.dll
+gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.FreeType.dll
+gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll
+gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll
+gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll
+
+echo "#!/bin/sh" > openra
+echo "cd $RPM_BUILD_ROOT/usr/share/openra" >> openra
+echo "mono $RPM_BUILD_ROOT/usr/share/openra/OpenRA.Game.exe" >> openra
+install -m +rx openra $RPM_BUILD_ROOT/usr/bin/
+
+%files
+/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/
+
+%postun
+rm $(RPM_BUILD_ROOT)/usr/bin/openra