diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index e6263cf882..9fb62de211 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -13,10 +13,10 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec
 rootdir=`readlink -f $2`
 sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec
 
-for x in `find $rootdir -type f`
+for x in `find $rootdir -type d`
 do
     y="${x#$rootdir}"
-    sed -i "/%files/ a $y" openra.spec
+    sed -i "/%files/ a ${y}" openra.spec
 done
 
 cp openra.spec "$3/SPECS/"
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
index d23dc7f836..4167a08faa 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
 Prefix: /usr
 Source: %{name}-%{version}.tar.gz
-Buildroot: /tmp/openra
+BuildRoot: /tmp/openra
 
 %description
 A multiplayer reimplementation of the Command & Conquer: Red Alert game
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index b46543bda6..93c62b66b1 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -28,14 +28,17 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html
 # List of files that are packaged on all platforms
 # Note that the Tao dlls are shipped on all platforms except osx and that
 # they are now installed to the game directory instead of placed in the gac
-FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.FileFormats.dll \
-OpenRA.Renderer.SdlCommon.dll OpenRA.Renderer.Cg.dll OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll \
-FreeSans.ttf FreeSansBold.ttf titles.ttf Dune2k.ttf cg glsl mods/ra mods/cnc mods/d2k \
-README.html CONTRIBUTING.html DOCUMENTATION.html COPYING HACKING INSTALL CHANGELOG"
+FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \
+'OpenRA.FileFormats.dll' 'OpenRA.Renderer.SdlCommon.dll' 'OpenRA.Renderer.Cg.dll' 'OpenRA.Renderer.Gl.dll' 'OpenRA.Renderer.Null.dll' \
+'FreeSans.ttf' 'FreeSansBold.ttf' 'titles.ttf' 'Dune2k.ttf' \
+'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \
+'AUTHORS' 'COPYING' 'HACKING' 'INSTALL' 'CHANGELOG' \
+'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \
+'global mix database.dat')
 
 echo "Copying files..."
-for i in $FILES; do
-	cp -R "$i" "packaging/built/$i" || exit 3
+for i in "${FILES[@]}"; do
+	cp -R "${i}" "packaging/built/${i}" || exit 3
 done
 
 # Copy Tao
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index f368f628d2..43755c768b 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -85,6 +85,7 @@ Section "Client" Client
 	File "${SRCDIR}\ICSharpCode.SharpZipLib.dll"
 	File "${SRCDIR}\FuzzyLogicLibrary.dll"
 	File "${SRCDIR}\Mono.Nat.dll"
+	File "${SRCDIR}\AUTHORS"
 	File "${SRCDIR}\COPYING"
 	File "${SRCDIR}\HACKING"
 	File "${SRCDIR}\INSTALL"
@@ -92,6 +93,7 @@ Section "Client" Client
 	File "${SRCDIR}\OpenRA.ico"
 	File "${SRCDIR}\Tao.*.dll"
 	File "${SRCDIR}\SharpFont.dll"
+	File "${SRCDIR}\global mix database.dat"
 
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 		CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
@@ -266,6 +268,7 @@ Function ${UN}Clean
 	Delete $INSTDIR\Mono.Nat.dll
 	Delete $INSTDIR\Tao.*.dll
 	Delete $INSTDIR\SharpFont.dll
+	Delete $INSTDIR\AUTHORS
 	Delete $INSTDIR\COPYING
 	Delete $INSTDIR\HACKING
 	Delete $INSTDIR\INSTALL
@@ -276,6 +279,7 @@ Function ${UN}Clean
 	Delete $INSTDIR\cg.dll
 	Delete $INSTDIR\cgGL.dll
 	Delete $INSTDIR\zlib1.dll
+	Delete "$INSTDIR\global mix database.dat"
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA"
 	Delete $INSTDIR\uninstaller.exe
 	RMDir $INSTDIR