diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 9f85e730b4..0b923d6cb8 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -17,16 +17,16 @@ else
 fi
 
 # Copy template files into a clean build directory (required)
-mkdir root
-cp -R DEBIAN root
-cp -R $rootdir/usr root
+mkdir root$ARCH
+cp -R DEBIAN root$ARCH
+cp -R $rootdir/usr root$ARCH
 
 # Create the control and changelog files from templates
-sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" | sed "s/{ARCH}/$ARCH/" > root/DEBIAN/control
-sed "s/{VERSION}/$VERSION/" DEBIAN/changelog > root/DEBIAN/changelog
+sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" | sed "s/{ARCH}/$ARCH/" > root$ARCH/DEBIAN/control
+sed "s/{VERSION}/$VERSION/" DEBIAN/changelog > root$ARCH/DEBIAN/changelog
 
 # Build it in the temp directory, but place the finished deb in our starting directory
-pushd root
+pushd root$ARCH
 
 # Calculate md5sums and clean up the /usr/ part of them
 md5sum `find . -type f | grep -v '^[.]/DEBIAN/'` | sed 's/\.\/usr\//usr\//g' > DEBIAN/md5sums
@@ -36,5 +36,5 @@ dpkg-deb -b . $3/openra-$VERSION-$ARCH.deb
 
 # Clean up
 popd
-rm -rf root
+rm -rf root$ARCH
 
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index b644c9af13..52265485d7 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -28,7 +28,7 @@ find . -path "*.mdb" -delete
 # they are now installed to the game directory instead of placed in the gac
 FILES="OpenRA.Launcher.exe OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.Renderer.Cg.dll \
 OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf \
-cg glsl mods/ra mods/cnc COPYING HACKING INSTALL gtklaunch"
+cg glsl mods/ra mods/cnc COPYING HACKING INSTALL gtklaunch gtklaunch32"
 
 echo "Copying files..."
 for i in $FILES; do
@@ -76,11 +76,11 @@ echo "Creating packages..."
 
 (
     cd linux
-    sh buildpackage.sh "$VERSION" "$BUILTDIR" "$OUTPUTDIR" "x86" &> package.log
+    sh buildpackage.sh "$VERSION" "$BUILTDIR" "$OUTPUTDIR" "x86" &> package32.log
     if [ $? -ne 0 ]; then
         echo "linux package build failed, refer to linux/package.log."
     fi
-    sh buildpackage.sh "$VERSION" "$BUILTDIR" "$OUTPUTDIR" "x64" &> package.log
+    sh buildpackage.sh "$VERSION" "$BUILTDIR" "$OUTPUTDIR" "x64" &> package64.log
     if [ $? -ne 0 ]; then
         echo "linux package build failed, refer to linux/package.log."
     fi