diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index a23cebe30a..6e5b93b65b 100644
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -10,23 +10,21 @@ fi
 
 PKGVERSION=`echo $5 | sed "s/-/\\./g"`
 sed -i "s/%define version [0-9\\.]\+/%define version $PKGVERSION/" openra.spec
-cp openra.spec $6/SPECS/
+cp openra.spec "$6/SPECS/"
 
-cd $6
-wget http://github.com/chrisforbes/OpenRA/tarball/playtest-$5 -O SOURCES/openra-$PKGVERSION.tar.gz
-
-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
+pushd "$6"
 
 rpmbuild --target noarch -bb SPECS/openra.spec
 
-cd RPMS/noarch/
+pushd RPMS/noarch/
 PACKAGEFILE=openra-$PKGVERSION-1.noarch.rpm
 size=`stat -c "%s" $PACKAGEFILE`
+popd
 
 echo "$5,$size,$PACKAGEFILE" > /tmp/rpmlatest.txt
 
 wput $PACKAGEFILE "ftp://$3:$4@$1/$2/"
-cd /tmp
+pushd /tmp
 wput -u rpmlatest.txt "ftp://$3:$4@$1/$2/"
+popd
+popd
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
index 1ceb22b6f6..5ac0396112 100644
--- a/packaging/linux/rpm/openra.spec
+++ b/packaging/linux/rpm/openra.spec
@@ -1,6 +1,5 @@
 %define name openra
 %define version 20100801.2
-%define folder chrisforbes-openra-51b83e0
 Name: %{name}
 Version: %{version}
 Release: 1
@@ -19,14 +18,11 @@ 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 %{folder}
-
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cp -r ~/openra-package/built/usr/ $RPM_BUILD_ROOT 
+cp -r ~/openra-package/built/ $RPM_BUILD_ROOT 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index b17d3b5ddf..03d4e43025 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -38,7 +38,7 @@ sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSI
 popd
 
 pushd linux/rpm/
-sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" "~/rpmbuild"
+sh buildpackage.sh "ftp.open-ra.org" "httpdocs/releases/linux" "$2" "$3" "$VERSION" ~/rpmbuild
 popd
 
 pushd osx/