diff --git a/dump-lfs-scripts.xsl b/dump-lfs-scripts.xsl
index 658cffc..428fcba 100644
--- a/dump-lfs-scripts.xsl
+++ b/dump-lfs-scripts.xsl
@@ -99,7 +99,7 @@
       <!-- Estandarized package formats -->
       <xsl:when test="contains(string(),'tar.gz')">
         <xsl:value-of select="substring-before(string(),'tar.gz')"/>
-        <xsl:text>tar.bz2</xsl:text>
+        <xsl:text>tar.*</xsl:text>
         <xsl:value-of select="substring-after(string(),'tar.gz')"/>
         <xsl:text>&#xA;</xsl:text>
       </xsl:when>
diff --git a/functions b/functions
index f0628a1..ca0b531 100644
--- a/functions
+++ b/functions
@@ -13,7 +13,15 @@ define echo_message
 endef
 
 define unpack
-        @cd $(LFS)$(SRC) ; tar -xvjf $(1) > /tmp/unpacked
+  @if [ -f $(LFS)$(SRC)/$(1).bz2 ] ; then \
+    cd $(LFS)$(SRC) ; tar -xvjf $(1).bz2 > /tmp/unpacked ; \
+  else \
+    cd $(LFS)$(SRC) ; tar -xvzf $(1).gz > /tmp/unpacked ; \
+  fi ;
+endef
+
+define unpack2
+  @cd $(LFS)$(SRC) ; /tools/bin/tar -xvf $(1) > /tmp/unpacked
 endef
 
 define echo_finished
diff --git a/jhalfs b/jhalfs
index f2ee9e7..6e890c7 100755
--- a/jhalfs
+++ b/jhalfs
@@ -359,9 +359,9 @@ EOF
     # If $vrs isn't empty, we've got a package...
     if [ "$vrs" != "" ] ; then
       if [ "$name" = "tcl" ] ; then
-        FILE="$name$vrs-src.tar.bz2"
+        FILE="$name$vrs-src.tar"
       else
-        FILE="$name-$vrs.tar.bz2"
+        FILE="$name-$vrs.tar"
       fi
 
       # Insert instructions for unpacking the package and to set
@@ -511,10 +511,10 @@ EOF
     # If $vrs isn't empty, we've got a package...
     # Insert instructions for unpacking the package and changing directories
     if [ "$vrs" != "" ] ; then
-      FILE="$name-$vrs.tar.bz2"
+      FILE="$name-$vrs.tar.*"
 (
     cat  << EOF
-	@\$(call unpack,$FILE)
+	@\$(call unpack2,$FILE)
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\
 	echo "export PKGDIR" >> envars
@@ -647,14 +647,14 @@ EOF
     if [[ `_IS_ $i bootscripts` ]] || [[ `_IS_ $i kernel` ]] ; then
       if [[ `_IS_ $i bootscripts` ]] ; then
         vrs=`grep "^lfs-bootscripts-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-        FILE="lfs-bootscripts-$vrs.tar.bz2"
+        FILE="lfs-bootscripts-$vrs.tar.*"
       elif [[ `_IS_ $i kernel` ]] ; then
         vrs=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-        FILE="linux-$vrs.tar.bz2"
+        FILE="linux-$vrs.tar.*"
       fi
 (
     cat  << EOF
-	@\$(call unpack,$FILE)
+	@\$(call unpack2,$FILE)
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
 	echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\
 	echo "export PKGDIR" >> envars