diff --git a/app-arch/bzip2/bzip2-1.0.5.sh b/app-arch/bzip2/bzip2-1.0.5.sh
index 38e6b8bb6..f14d9bbcf 100755
--- a/app-arch/bzip2/bzip2-1.0.5.sh
+++ b/app-arch/bzip2/bzip2-1.0.5.sh
@@ -1,28 +1,33 @@
 #!/bin/sh
 
-PACKAGE="app-arch/bzip2"
-VERSION="1.0.5"
 HOMEPAGE="http://www.bzip.org/"
+PACKAGE="app-arch/bzip2/"
+VERSION="1.0.5"
 URL="http://www.bzip.org/1.0.5/"
 FILE="bzip2-1.0.5.tar.gz"
 
-PFX=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
+# ------- This should not be edited ------- 
+PFX=/boot/common/
+HAIKUPORTS="http://ports.haiku-files.org/wiki/"
+CWD=`pwd`/
+if [ ! -d ${PACKAGE}${VERSION} ] ; then
+	mkdir -p ${PACKAGE}${VERSION}
 fi
-
 if [ ! -e ${FILE} ] ; then
 	wget ${URL}${FILE}
 fi
-cd ${PACKAGE}/${VERSION}
-tar xvf ${CWD}/${FILE}
+cd ${PACKAGE}${VERSION}
+if [ ${FILE:(-7)} = "tar.bz2" ] ; then
+	tar -jxvf ${CWD}${FILE}
+elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
+	tar xvf ${CWD}${FILE}
+fi
+# ------- Begin Instructions ------- 
 cd bzip2-1.0.5
-
 make PREFIX=${PFX} && make install PREFIX=${PFX} && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
 
 
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
+echo "  For more information, see:"
+echo "    ${HAIKUPORTS}${PACKAGE}"
+echo "    ${HOMEPAGE}"
 echo
diff --git a/app-arch/fastjar/fastjar-0.97.sh b/app-arch/fastjar/fastjar-0.97.sh
index 3d1851928..bfa0b84b4 100755
--- a/app-arch/fastjar/fastjar-0.97.sh
+++ b/app-arch/fastjar/fastjar-0.97.sh
@@ -1,23 +1,28 @@
 #!/bin/sh
 
-PACKAGE="app-arch/fastjar"
+HOMEPAGE="https://savannah.nongnu.org/projects/fastjar/"
+PACKAGE="app-arch/fastjar/"
 VERSION="0.97"
-HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
 URL="http://mirror.its.uidaho.edu/pub/savannah/fastjar/"
 FILE="fastjar-0.97.tar.gz"
 
-PREFIX=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
+# ------- This should not be edited ------- 
+PFX=/boot/common/
+HAIKUPORTS="http://ports.haiku-files.org/wiki/"
+CWD=`pwd`/
+if [ ! -d ${PACKAGE}${VERSION} ] ; then
+	mkdir -p ${PACKAGE}${VERSION}
 fi
 if [ ! -e ${FILE} ] ; then
 	wget ${URL}${FILE}
 fi
-cd ${PACKAGE}/${VERSION}
-tar xvf ${CWD}/${FILE}
+cd ${PACKAGE}${VERSION}
+if [ ${FILE:(-7)} = "tar.bz2" ] ; then
+	tar -jxvf ${CWD}${FILE}
+elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
+	tar xvf ${CWD}${FILE}
+fi
+# ------- Begin Instructions ------- 
 cd fastjar-0.97
 libtoolize --force --install
 aclocal --force 
@@ -26,5 +31,8 @@ autoconf --force
 configure --prefix=${PREFIX} 
 make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
 
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
+echo "  For more information, see:"
+echo "    ${HAIKUPORTS}${PACKAGE}"
+echo "    ${HOMEPAGE}"
 echo
+
diff --git a/app-arch/gzip/gzip-1.3.12.sh b/app-arch/gzip/gzip-1.3.12.sh
index 1b40f1d1e..13285332d 100755
--- a/app-arch/gzip/gzip-1.3.12.sh
+++ b/app-arch/gzip/gzip-1.3.12.sh
@@ -1,31 +1,39 @@
 #!/bin/sh
 
-PACKAGE="app-arch/gzip"
-VERSION="1.3.12"
 HOMEPAGE="http://www.gnu.org/software/gzip/"
+PACKAGE="app-arch/gzip/"
+VERSION="1.3.12"
 URL="http://ftp.gnu.org/gnu/gzip/"
 FILE="gzip-1.3.12.tar.gz"
 PATCH_URL="http://ports.haiku-files.org/svn/haikuports/trunk/"
 PATCH_FILE="gzip-1.3.12-downstream.patch"
 
-PREFIX=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
+# ------- This should not be edited ------- 
+PFX=/boot/common/
+HAIKUPORTS="http://ports.haiku-files.org/wiki/"
+CWD=`pwd`/
+if [ ! -d ${PACKAGE}${VERSION} ] ; then
+	mkdir -p ${PACKAGE}${VERSION}
 fi
 if [ ! -e ${FILE} ] ; then
 	wget ${URL}${FILE}
 fi
-cd ${PACKAGE}/${VERSION}
-tar xvf ${CWD}/${FILE}
+cd ${PACKAGE}${VERSION}
+if [ ${FILE:(-7)} = "tar.bz2" ] ; then
+	tar -jxvf ${CWD}${FILE}
+elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
+	tar xvf ${CWD}${FILE}
+fi
+# ------- Begin Instructions ------- 
 cd gzip-1.3.12
-svn export ${PATCH_URL}${PACKAGE}/${PATCH_FILE}
+wget ${PATCH_URL}${PACKAGE}/${PATCH_FILE}
 patch -p1 -i ${PATCH_FILE}
 libtoolize --force --install
-configure --prefix=${PREFIX}
+configure --prefix=${PFX}
 make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
 
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
+echo "  For more information, see:"
+echo "    ${HAIKUPORTS}${PACKAGE}"
+echo "    ${HOMEPAGE}"
 echo
+
diff --git a/app-arch/p7zip/p7zip-4.65.sh b/app-arch/p7zip/p7zip-4.65.sh
index 876af7551..50303a06b 100755
--- a/app-arch/p7zip/p7zip-4.65.sh
+++ b/app-arch/p7zip/p7zip-4.65.sh
@@ -1,26 +1,34 @@
 #!/bin/sh
 
-PACKAGE="app-arch/p7zip"
-VERSION="4.65"
 HOMEPAGE="http://p7zip.sourceforge.net/"
+PACKAGE="app-arch/p7zip/"
+VERSION="4.65"
 URL="http://voxel.dl.sourceforge.net/sourceforge/p7zip/"
 FILE="p7zip_4.65_src_all.tar.bz2"
 
-PREFIX=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
+# ------- This should not be edited ------- 
+PFX=/boot/common/
+HAIKUPORTS="http://ports.haiku-files.org/wiki/"
+CWD=`pwd`/
+if [ ! -d ${PACKAGE}${VERSION} ] ; then
+	mkdir -p ${PACKAGE}${VERSION}
 fi
 if [ ! -e ${FILE} ] ; then
 	wget ${URL}${FILE}
 fi
-cd ${PACKAGE}/${VERSION}
-tar -jxvf ${CWD}/${FILE}
+cd ${PACKAGE}${VERSION}
+if [ ${FILE:(-7)} = "tar.bz2" ] ; then
+	tar -jxvf ${CWD}${FILE}
+elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
+	tar xvf ${CWD}${FILE}
+fi
+# ------- Begin Instructions ------- 
 cd p7zip_4.65
 cp makefile.beos makefile.machine
-make && make install DEST_HOME=${PREFIX} && echo "  Installation complete." || echo "  Installation FAILED !"
+make && make install DEST_HOME=${PFX} && echo "  Installation complete." || echo "  Installation FAILED !"
 
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
+echo "  For more information, see:"
+echo "    ${HAIKUPORTS}${PACKAGE}"
+echo "    ${HOMEPAGE}"
 echo
+
diff --git a/app-arch/sharutils/sharutils-4.6.3.sh b/app-arch/sharutils/sharutils-4.6.3.sh
index d5fcc7ac0..6a756432b 100755
--- a/app-arch/sharutils/sharutils-4.6.3.sh
+++ b/app-arch/sharutils/sharutils-4.6.3.sh
@@ -1,34 +1,42 @@
 #!/bin/sh
 
-PACKAGE="app-arch/sharutils"
-VERSION="4.6.3"
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
+PACKAGE="app-arch/sharutils/"
+VERSION="4.6.3"
 URL="ftp://ftp.gnu.org/gnu/sharutils/REL-4.6.3/"
 FILE="sharutils-4.6.3.tar.bz2"
 PATCH_URL="http://ports.haiku-files.org/svn/haikuports/trunk/"
 PATCH_FILE="sharutils-4.6.3-downstream.patch"
 
-PREFIX=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
+# ------- This should not be edited ------- 
+PFX=/boot/common/
+HAIKUPORTS="http://ports.haiku-files.org/wiki/"
+CWD=`pwd`/
+if [ ! -d ${PACKAGE}${VERSION} ] ; then
+	mkdir -p ${PACKAGE}${VERSION}
 fi
 if [ ! -e ${FILE} ] ; then
 	wget ${URL}${FILE}
 fi
-cd ${PACKAGE}/${VERSION}
-tar -jxvf ${CWD}/${FILE}
+cd ${PACKAGE}${VERSION}
+if [ ${FILE:(-7)} = "tar.bz2" ] ; then
+	tar -jxvf ${CWD}${FILE}
+elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
+	tar xvf ${CWD}${FILE}
+fi
+# ------- Begin Instructions ------- 
 cd sharutils-4.6.3
-svn export ${PATCH_URL}${PACKAGE}/${PATCH_FILE}
+wget ${PATCH_URL}${PACKAGE}${PATCH_FILE}
 patch -p1 -i ${PATCH_FILE}
 libtoolize --force --install
-configure --prefix=${PREFIX}
+configure --prefix=${PFX}
 aclocal --force -I m4
 automake --force-missing --gnits
 autoconf --force
-make && make install DEST_HOME=${PREFIX} && echo "  Installation complete." || echo "  Installation FAILED !"
+make && make install DEST_HOME=${PFX} && echo "  Installation complete." || echo "  Installation FAILED !"
 
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
+echo "  For more information, see:"
+echo "    ${HAIKUPORTS}${PACKAGE}"
+echo "    ${HOMEPAGE}"
 echo
+