diff --git a/Makefile b/Makefile
index 658382be61..2b6d5443e2 100644
--- a/Makefile
+++ b/Makefile
@@ -102,15 +102,17 @@ install: all
 	@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
 	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
+	@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
 	
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
 	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/extras $(INSTALL_DIR)/mods/ra
+	@cp -r mods/ra/chrome $(INSTALL_DIR)/mods/ra
 	
 	@cp -r shaders $(INSTALL_DIR)
 	@cp *.ttf $(INSTALL_DIR)
-	@-cp *.ini $(INSTALL_DIR)
 	@cp -r thirdparty $(INSTALL_DIR)
 	
 	@echo "#!/bin/sh" > openra
diff --git a/packaging/linux/pkgbuild/openra.install b/packaging/linux/pkgbuild/openra.install
index f2317d173c..e26bc78272 100644
--- a/packaging/linux/pkgbuild/openra.install
+++ b/packaging/linux/pkgbuild/openra.install
@@ -19,8 +19,10 @@ post_install() {
     do
         read -s -n1 -p "Download and install RA packages? [Y/n]"
         case $REPLY in
-            y|Y|"") 
+            y|Y|"")
+                pushd /tmp/ 
                 install_ra_packages
+                popd
                 break;;
             n|N) break;;
             *) echo "Please enter y or n.";;
@@ -32,7 +34,9 @@ post_install() {
         read -s -n1 -p "Download and install C&C packages? [Y/n]"
         case $REPLY in
             y|Y|"") 
+                pushd /tmp/
                 install_cnc_packages
+                popd
                 break;;
             n|N) break;;
             *) echo "Please enter y or n.";;
@@ -40,8 +44,8 @@ post_install() {
     done
     
     gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.Cg.dll
-	gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.FreeType.dll
-	gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll
-	gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll
-	gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll
+    gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.FreeType.dll
+    gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.OpenAl.dll
+    gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.OpenGl.dll
+    gacutil -i $pkgdir/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll
 }
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
index 49361c5270..05145edd18 100644
--- a/packaging/linux/rpm/openra.spec
+++ b/packaging/linux/rpm/openra.spec
@@ -39,10 +39,12 @@ do
     read -s -n1 -p "Download and install RA packages? [Y/n]"
     case $REPLY in
         y|Y|"") 
+            pushd /tmp/
             wget http://open-ra.org/packages/ra-packages.zip
             mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages
             unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/ra/packages
             rm ra-packages.zip
+            popd
             break;;
         n|N) break;;
         *) echo "Please enter y or n.";;
@@ -54,10 +56,12 @@ do
     read -s -n1 -p "Download and install C&C packages? [Y/n]"
     case $REPLY in
         y|Y|"") 
+            pushd /tmp/
             wget http://open-ra.org/packages/cnc-packages.zip
             mkdir -p $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages
             unzip ra-packages.zip -d $RPM_BUILD_ROOT/usr/share/openra/mods/cnc/packages
             rm ra-packages.zip
+            popd
             break;;
         n|N) break;;
         *) echo "Please enter y or n.";;