diff --git a/packs/libpak/libpak-0.9.4.bep b/packs/libpak/libpak-0.9.4.bep
index f12ed4a74..d2b204491 100644
--- a/packs/libpak/libpak-0.9.4.bep
+++ b/packs/libpak/libpak-0.9.4.bep
@@ -27,121 +27,215 @@ BUILD {
 	setgcc gcc2
 	haikuporter -y -d -i readline-6.1
 	mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z readline-6.1
+	mv ${HPLOC}/sys-libs/readline/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i lua-5.1.4
 	mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i fribidi-0.19.2
 	mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z fribidi-0.19.2
+	mv ${HPLOC}/dev-libs/fribidi/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i libpaper-1.1.24
 	mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips
-	haikuporter -y -d -i flac-1.2.1
+	haikuporter -y -z libpaper-1.1.24
+	mv ${HPLOC}/app-text/libpaper/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
+	haikuporter -y -c -d -i flac-1.2.1
 	mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips
-	haikuporter -y -d -i speex-1.2-git
+	haikuporter -y -z flac-1.2.1
+	mv ${HPLOC}/media-libs/flac/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
+	haikuporter -y -c -d -i speex-1.2-git
 	mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i libmng-1.0.10
 	mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i libart_lgpl-2.3.21
 	mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z libart_lgpl-2.3.21
+	mv ${HPLOC}/media-libs/libart_lgpl/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i lcms-2.0a
 	mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i libmad-0.15.1
 	mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z libmad-0.15.1
+	mv ${HPLOC}/media-libs/libmad/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i libao-1.0.0
 	mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z libao-1.0.0
+	mv ${HPLOC}/media-libs/libao/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i libmodplug-0.8.7
 	mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i libmikmod-3.1.11
 	mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z libmikmod-3.1.11
+	mv ${HPLOC}/media-libs/libmikmod/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i libogg-1.2.0
 	mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i libvorbis-1.3.1
 	mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips		
+	
 	haikuporter -y -d -i vorbis-tools-1.4.0
 	mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i physfs-2.0.1
 	mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i libevent-1.4.13
 	mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i libsdl-1.2-hg
 	mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z libsdl-1.2-hg
+	mv ${HPLOC}/media-libs/libsdl/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i sdl-gfx-2.0.20
 	mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips
-	haikuporter -y -d -i sdl-ttf-2.0.10
-	mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z sdl-gfx-2.0.20
+	mv ${HPLOC}/media-libs/sdl-gfx/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
+#	haikuporter -y -d -i sdl-ttf-2.0.10
+#	mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z sdl-ttf-2.0.10
+	mv ${HPLOC}/media-libs/sdl-ttf/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i sdl-image-1.2.10
 	mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z sdl-image-1.2.10
+	mv ${HPLOC}/media-libs/sdl-image/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i sge-030809
 	mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z sge-030809
+	mv ${HPLOC}/media-libs/sge/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i smjpeg-0.2.1
 	mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z smjpeg-0.2.1
+	mv ${HPLOC}/media-libs/smjpeg/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i smpeg-0.4.5
 	mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z smpeg-0.4.5
+	mv ${HPLOC}/media-libs/smpeg/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i guilib-1.2.1
 	mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z guilib-1.2.1
+	mv ${HPLOC}/media-libs/guilib/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i sdl-net-1.2.7
 	mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z sdl-net-1.2.7
+	mv ${HPLOC}/media-libs/sdl-net/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i sdl-mixer-1.2.11
 	mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z sdl-mixer-1.2.11
+	mv ${HPLOC}/media-libs/sdl-mixer/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i sdl-sound-1.0.3
 	mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips
+	haikuporter -y -z sdl-sound-1.0.3
+	mv ${HPLOC}/media-libs/sdl-sound/*.xz ${HPLOC}/packs/optionalpackages/sources
+	
 	haikuporter -y -d -i allegro-4.4.1.1
 	mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i dumb-0.9.3
 	mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips	
+	
 	haikuporter -y -d -i jgmod-0.99
 	mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips	
 
 	setgcc gcc4
 	haikuporter -y -d -i readline-6.0
 	mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i lua-5.1.4
 	mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -y -d -i physfs-2.0.1
 	mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips	
+	
 	haikuporter -c -y -d -i fribidi-0.19.2
 	mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libpaper-1.1.24
 	mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips
+	
 ## Flac fails to build on gcc4 currently
 ##	haikuporter -c -y -d -i flac-1.2.1
 ##	mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips
+
 	haikuporter -c -y -d -i speex-1.2-git
 	mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libmng-1.0.10
 	mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libart_lgpl-2.3.21
 	mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i lcms-2.0a
 	mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libmad-0.15.1
 	mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libao-1.0.0
 	mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libmodplug-0.8.7
 	mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libmikmod-3.1.11
 	mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libevent-1.4.13
 	mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i libsdl-1.2-hg
 	mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i sdl-gfx-2.0.20
 	mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips
-	haikuporter -c -y -d -i sdl-ttf-2.0.10
-	mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips
+	
+#	haikuporter -c -y -d -i sdl-ttf-2.0.10
+#	mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i sdl-image-1.2.10
 	mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i smjpeg-0.2.1
 	mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i smpeg-0.4.5
 	mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i guilib-1.2.1
 	mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i sdl-net-1.2.7
 	mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i sdl-mixer-1.2.11
 	mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i sdl-sound-1.0.3
 	mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips
+	
 	haikuporter -c -y -d -i box2d-2.1.2
 	mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips