diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index 841609175c..0335080c09 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -10,6 +10,13 @@ PKGVERSION=`echo $1 | sed "s/-/\\./g"`
 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`
+do
+    y="/${x#$rootdir}"
+    sed -i "/%files/ a $y" openra.spec
+done
+
 cp openra.spec "$3/SPECS/"
 
 cd "$3"
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
index 01c45d1499..005d31ee80 100644
--- a/packaging/linux/rpm/openra.spec
+++ b/packaging/linux/rpm/openra.spec
@@ -61,24 +61,3 @@ do
 done
 
 %files
-/usr/bin/openra
-/usr/share/openra/*.exe
-/usr/share/openra/*.ttf
-/usr/share/openra/*.dll
-/usr/share/openra/*.dll.config
-/usr/share/openra/OpenRA.ico
-/usr/share/openra/VERSION
-/usr/share/openra/COPYING
-/usr/share/openra/HACKING
-/usr/share/openra/INSTALL
-/usr/share/openra/shaders/
-/usr/share/openra/mods/
-/usr/share/applications/openra*
-/usr/share/menu/openra*
-/usr/share/pixmaps/openra.32.xpm
-/usr/share/icons/hicolor/16x16/apps/openra.png
-/usr/share/icons/hicolor/32x32/apps/openra.png
-/usr/share/icons/hicolor/48x48/apps/openra.png
-/usr/share/icons/hicolor/64x64/apps/openra.png
-/usr/share/icons/hicolor/128x128/apps/openra.png
-
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 6af5224762..f58e7ea388 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -25,7 +25,8 @@ find . -path "*.mdb" -delete
 # 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.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc VERSION COPYING HACKING INSTALL"
+FILES="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 shaders mods/ra mods/cnc VERSION COPYING HACKING INSTALL"
 
 for i in $FILES; do
 	cp -R "$i" "packaging/built/$i" || exit 3
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 88523a54fc..c4d8bc1499 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -76,8 +76,11 @@ SectionEnd
 Section "Client" Client
 	SetOutPath "$INSTDIR"
 	File "${SRCDIR}\OpenRA.Game.exe"
+	File "${SRCDIR}\OpenRA.Utility.exe"
 	File "${SRCDIR}\OpenRA.FileFormats.dll"
-	File "${SRCDIR}\OpenRA.Gl.dll"
+	File "${SRCDIR}\OpenRA.Renderers.Gl.dll"
+	File "${SRCDIR}\OpenRA.Renderers.Cg.dll"
+	File "${SRCDIR}\OpenRA.Renderers.Null.dll"
 	File "${SRCDIR}\COPYING"
 	File "${SRCDIR}\HACKING"
 	File "${SRCDIR}\INSTALL"
@@ -270,9 +273,12 @@ Function ${UN}Clean
 	RMDir /r $INSTDIR\maps
 	RMDir /r $INSTDIR\shaders
 	Delete $INSTDIR\OpenRA.Game.exe
+	Delete $INSTDIR\OpenRA.Utility.exe
 	Delete $INSTDIR\OpenRA.Editor.exe
 	Delete $INSTDIR\OpenRA.FileFormats.dll
-	Delete $INSTDIR\OpenRA.Gl.dll
+	Delete $INSTDIR\OpenRA.Renderer.Gl.dll
+	Delete $INSTDIR\OpenRA.Renderer.Cg.dll
+	Delete $INSTDIR\OpenRA.Renderer.Null.dll
 	Delete $INSTDIR\Tao.*.dll
 	Delete $INSTDIR\COPYING
 	Delete $INSTDIR\HACKING