diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index 9409c84714..75e1890a5e 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -21,10 +21,11 @@ cp openra.spec openra$ARCH.spec
 sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra$ARCH.spec
 rootdir=`readlink -f $2`
 sed -i "s|{ROOT_DIR}|$rootdir|" openra$ARCH.spec
+sed -i "s/{ARCH}/$ARCH/" openra$ARCH.spec
 
 for x in `find $rootdir -type f`
 do
-    y="/${x#$rootdir}"
+    y="${x#$rootdir}"
     sed -i "/%files/ a $y" openra$ARCH.spec
 done
 
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
index 5217b0e6ab..229969bdec 100644
--- a/packaging/linux/rpm/openra.spec
+++ b/packaging/linux/rpm/openra.spec
@@ -12,7 +12,7 @@ Packager: Matthew Bowra-Dean <matthew@ijw.co.nz>
 Requires: mono-core mono-devel SDL openal mesa-dri-drivers-experimental gtk2 webkitgtk
 Prefix: /usr
 Source: %{name}-%{version}.tar.gz
-Buildroot: /tmp/openra
+Buildroot: /tmp/openra{ARCH}
 
 %description
 A multiplayer reimplementation of the Command & Conquer: Red Alert game 
diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh
index 009321c1c5..67370b60df 100755
--- a/packaging/upload-all.sh
+++ b/packaging/upload-all.sh
@@ -25,10 +25,10 @@ esac
 
 LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"`
 
-./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-i386.deb "deblatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux "$VERSION" $PKGDIR/openra-$VERSION-i386.deb "deblatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
 ./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.i686.rpm "rpmlatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
 ./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-i686.pkg.tar.xz "archlatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
-./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-amd64.deb "deblatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux "$VERSION" $PKGDIR/openra-$VERSION-amd64.deb "deblatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
 ./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.x86_64.rpm "rpmlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
 ./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-x86_64.pkg.tar.xz "archlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"