diff --git a/Makefile b/Makefile
index 7d0f6e12d5..803b90665f 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,10 @@ winlaunch_EXTRA		= -resource:OpenRA.Launcher.MainForm.resources \
 
 .SUFFIXES:
 .PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex utility winlaunch
-core: game editor utility winlaunch
+core: game editor
+package: game editor utility
+all: game tools
+tools: editor ralint seqed filex tsbuild utility winlaunch
 game: $(fileformats_TARGET) $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
 
 clean: 
@@ -206,9 +209,6 @@ OpenRA.Launcher.InstallPackagesDialog.resources:
 OpenRA.Launcher.ConfigureModsDialog.resources:
 	resgen2 OpenRA.Launcher/ConfigureModsDialog.resx OpenRA.Launcher.ConfigureModsDialog.resources 1> /dev/null
 
-tools: editor ralint seqed filex tsbuild
-all: game tools
-
 fixheader: packaging/fixheader.cs
 	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
 
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index cffa8d6fb9..319029a114 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -17,7 +17,7 @@ cd "$SRCDIR"
 mkdir packaging/built
 mkdir packaging/built/mods
 echo $1 > VERSION
-make game editor
+make package
 
 # Remove the mdb files that are created during `make`
 find . -path "*.mdb" -delete
@@ -28,6 +28,7 @@ find . -path "*.mdb" -delete
 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 cg glsl mods/ra mods/cnc VERSION COPYING HACKING INSTALL"
 
+echo "Copying files..."
 for i in $FILES; do
 	cp -R "$i" "packaging/built/$i" || exit 3
 done
@@ -38,6 +39,9 @@ cp thirdparty/Tao/* packaging/built
 # Copy WindowsBase.dll for linux packages
 cp thirdparty/WindowsBase.dll packaging/built
 
+# SharpZipLib for zip file support
+cp thirdparty/ICSharpCode.SharpZipLib.dll packaging/built
+
 # Copy game icon for windows package
 cp OpenRA.Game/OpenRA.ico packaging/built