diff --git a/packs/libpak/libpak-1.0.bep b/packs/libpak/libpak-0.9.1.bep
similarity index 71%
rename from packs/libpak/libpak-1.0.bep
rename to packs/libpak/libpak-0.9.1.bep
index 4ada3107f..a71ef6ef9 100644
--- a/packs/libpak/libpak-1.0.bep
+++ b/packs/libpak/libpak-0.9.1.bep
@@ -1,19 +1,23 @@
 DESCRIPTION="Libpak is a set of commonly used libraries." 
 HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" 
-SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-1.0.tar.bz2"
+SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.1.zip"
 REVISION="1"
-STATUS_HAIKU="broken"
+STATUS_HAIKU="stable"
 DEPEND="dev-libs/mercurial >= 1.6
 	dev-libs/libedit >= 20100424"
-CHECKSUM_MD5="e7722aa4f25dc59f8c9b7727bf5cd032"
+CHECKSUM_MD5="16c697819a60958a4aaaef772a46c726"
 BUILD {
 	HPLOC=`haikuporter -t`
-	cd libpak-1.0
+	cd libpak-0.9.1
 
 ##	these are needed for building package in the libpak
 	haikuporter -i cmake-2.8.1
-	haikuporter -i dos2unix
-	haikuporter -i pkgconfig-0.25
+	haikuporter -i -d -y dos2unix
+	mv ${HPLOC}/app-text/dos2unix/*.zip .
+	haikuporter -i -d -y pkgconfig-0.25
+	mv ${HPLOC}/dev-util/pkgconfig/*.zip .
+	haikuporter -i -d -y gperf-3.0.4
+	mv ${HPLOC}/dev-util/gperf/*.zip .
 ##
 	haikuporter -y -d -i readline-6.0
 	mv ${HPLOC}/sys-libs/readline/*.zip .
@@ -23,6 +27,14 @@ BUILD {
 	mv ${HPLOC}/sys-devel/gettext/*.zip .
 	haikuporter -y -d -i libiconv-1.13.1
 	mv ${HPLOC}/dev-libs/libiconv/*.zip .
+	haikuporter -y -d -i fribidi-0.19.2
+	mv ${HPLOC}/dev-libs/fribidi/*.zip .
+	haikuporter -y -d -i libpaper-1.1.24
+	mv ${HPLOC}/app-text/libpaper/*.zip .
+	haikuporter -y -d -i flac-1.2.1
+	mv ${HPLOC}/media-libs/flac/*.zip .
+	haikuporter -y -d -i speex-1.2-git
+	mv ${HPLOC}/media-libs/speex/*.zip .
 	haikuporter -y -d -i jpeg-7
 	mv ${HPLOC}/media-libs/jpeg/*.zip .
 	haikuporter -y -d -i libpng-1.2.44
@@ -76,34 +88,27 @@ BUILD {
 		haikuporter -y -d -i libmad-0.15.1
 		mv ${HPLOC}/media-libs/libmad/*.zip .
 		haikuporter -y -d -i allegro-4.4.1.1
-		mv ${HPLOC}/media-libs/allegro/*.zip
+		mv ${HPLOC}/media-libs/allegro/*.zip .
+		haikuporter -y -d -i dumb-0.9.3
+		mv ${HPLOC}/media-libs/dumb/*.zip .
+		haikuporter -y -d -i jgmod-0.99
+		mv ${HPLOC}/media-libs/jgmod/*.zip .
 	fi
 ## these don't build correctly yet
-##	haikuporter -y -d -i freetype-2.4.2
-##	mv ${HPLOC}/media-libs/freetype/*.zip .
-##	haikuporter -y -d -i fribidi-0.19.2
-##	mv ${HPLOC}/dev-libs/fribidi/*.zip .
-##	haikuporter -y -d -i flac-1.2.1
-##	mv ${HPLOC}/media-libs/flac/*.zip .
-##	haikuporter -y -d -i speex-1.2rc1
-##	mv ${HPLOC}/media-libs/speex/*.zip .
-##	haikuporter -y -d -i jgmod-0.99
-##	mv ${HPLOC}/media-libs/jgmod/*.zip .
-##	haikuporter -y -d -i dumb-0.9.3
-##	mv ${HPLOC}/media-libs/dumb/*.zip .
 ##	haikuporter -y -d -i fblend-0.4
 ##	mv ${HPLOC}/media-libs/fblend/*.zip .
 }
 
 INSTALL {
-	cd libpak-1.0
-	echo "" > .opd
-	for z in *.zip:
-		do unzip $z -d ../../../distro/
-		cat .optionalpackagedescription >> .opd
-		echo " \n" >> .opd
+	cd libpak-0.9.1
+	mkdir -p ${DESTDIR}/boot
+	echo "" > ${DESTDIR}/boot/.opd
+	for z in *.zip;
+		do unzip -o $z -d ${DESTDIR}/boot
+		echo -e "\n" >> ${DESTDIR}/boot/.opd
+		cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd
 	done
-	cp .opd ../../../distro/.optionalpackagesdescription
+	cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/.OptionalPackageDescription
 }
 
 #LICENSE=""
diff --git a/packs/libpak/libpak-0.9.bep b/packs/libpak/libpak-0.9.bep
index 21506d84a..5c15c47b1 100644
--- a/packs/libpak/libpak-0.9.bep
+++ b/packs/libpak/libpak-0.9.bep
@@ -9,15 +9,10 @@ CHECKSUM_MD5="59bc51118c6be6ef40f4fe681ef783a0"
 BUILD {
 	HPLOC=`haikuporter -t`
 	cd libpak-0.9
-
 ##	these are needed for building package in the libpak
 	haikuporter -i cmake-2.8.1
-	haikuporter -i -d -y dos2unix
-	mv ${HPLOC}/app-text/dos2unix/*.zip .
-	haikuporter -i -d -y pkgconfig-0.25
-	mv ${HPLOC}/dev-util/pkgconfig/*.zip .
-	haikuporter -i -d -y gperf-3.0.4
-	mv ${HPLOC}/dev-util/gperf/*.zip .
+	haikuporter -i dos2unix
+	haikuporter -i pkgconfig-0.25
 ##
 	haikuporter -y -d -i readline-6.0
 	mv ${HPLOC}/sys-libs/readline/*.zip .
@@ -27,14 +22,6 @@ BUILD {
 	mv ${HPLOC}/sys-devel/gettext/*.zip .
 	haikuporter -y -d -i libiconv-1.13.1
 	mv ${HPLOC}/dev-libs/libiconv/*.zip .
-	haikuporter -y -d -i fribidi-0.19.2
-	mv ${HPLOC}/dev-libs/fribidi/*.zip .
-	haikuporter -y -d -i libpaper-1.1.24
-	mv ${HPLOC}/app-text/libpaper/*.zip .
-	haikuporter -y -d -i flac-1.2.1
-	mv ${HPLOC}/media-libs/flac/*.zip .
-	haikuporter -y -d -i speex-1.2-git
-	mv ${HPLOC}/media-libs/speex/*.zip .
 	haikuporter -y -d -i jpeg-7
 	mv ${HPLOC}/media-libs/jpeg/*.zip .
 	haikuporter -y -d -i libpng-1.2.44
@@ -89,26 +76,34 @@ BUILD {
 		mv ${HPLOC}/media-libs/libmad/*.zip .
 		haikuporter -y -d -i allegro-4.4.1.1
 		mv ${HPLOC}/media-libs/allegro/*.zip .
-		haikuporter -y -d -i dumb-0.9.3
-		mv ${HPLOC}/media-libs/dumb/*.zip .
-		haikuporter -y -d -i jgmod-0.99
-		mv ${HPLOC}/media-libs/jgmod/*.zip .
 	fi
 ## these don't build correctly yet
+##	haikuporter -y -d -i freetype-2.4.2
+##	mv ${HPLOC}/media-libs/freetype/*.zip .
+##	haikuporter -y -d -i fribidi-0.19.2
+##	mv ${HPLOC}/dev-libs/fribidi/*.zip .
+##	haikuporter -y -d -i flac-1.2.1
+##	mv ${HPLOC}/media-libs/flac/*.zip .
+##	haikuporter -y -d -i speex-1.2rc1
+##	mv ${HPLOC}/media-libs/speex/*.zip .
+##	haikuporter -y -d -i jgmod-0.99
+##	mv ${HPLOC}/media-libs/jgmod/*.zip .
+##	haikuporter -y -d -i dumb-0.9.3
+##	mv ${HPLOC}/media-libs/dumb/*.zip .
 ##	haikuporter -y -d -i fblend-0.4
 ##	mv ${HPLOC}/media-libs/fblend/*.zip .
 }
 
 INSTALL {
 	cd libpak-0.9
-	mkdir -p ${DESTDIR}/boot
-	echo "" > ${DESTDIR}/boot/.opd
+	mkdir -p ${DESTDIR}
+	echo "" > ${DESTDIR}/.opd
 	for z in *.zip;
-		do unzip -o $z -d ${DESTDIR}/boot
-		echo -e "\n" >> ${DESTDIR}/boot/.opd
-		cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd
+		do unzip -o $z -d ${DESTDIR}
+		echo -e "\n" >> ${DESTDIR}/.opd
+		cat ${DESTDIR}/.OptionalPackageDescription >> ${DESTDIR}/.opd
 	done
-	cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/.OptionalPackageDescription
+	cp ${DESTDIR}/.opd ${DESTDIR}/.OptionalPackageDescription
 }
 
 #LICENSE=""