diff --git a/mk.sh b/mk.sh
index 2aaa86f..6c7ffb7 100755
--- a/mk.sh
+++ b/mk.sh
@@ -10,7 +10,7 @@ fi
 PRODUCT="$1"
 
 ################################ basic setup ################################
-BUILDROOT=$(pwd)
+BUILDROOT="$(pwd)/$PRODUCT"
 SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 NUMJOBS=$(grep -e "^processor" /proc/cpuinfo | wc -l)
 
@@ -21,15 +21,15 @@ if [ ! -f "$LAYERCONF" ]; then
 	exit 1
 fi
 
-PKGSRCDIR="$BUILDROOT/src"
-PKGDOWNLOADDIR="$BUILDROOT/download"
-PKGBUILDDIR="$BUILDROOT/$PRODUCT/build"
-PKGDEPLOYDIR="$BUILDROOT/$PRODUCT/deploy"
-PKGLOGDIR="$BUILDROOT/$PRODUCT/log"
-PACKAGELIST="$BUILDROOT/$PRODUCT/pkglist"
-REPODIR="$BUILDROOT/$PRODUCT/repo"
-DEPENDSLIST="$BUILDROOT/$PRODUCT/depends"
-PROVIDESLIST="$BUILDROOT/$PRODUCT/provides"
+PKGSRCDIR="$(pwd)/src"
+PKGDOWNLOADDIR="$(pwd)/download"
+PKGBUILDDIR="$BUILDROOT/build"
+PKGDEPLOYDIR="$BUILDROOT/deploy"
+PKGLOGDIR="$BUILDROOT/log"
+PACKAGELIST="$BUILDROOT/pkglist"
+REPODIR="$BUILDROOT/repo"
+DEPENDSLIST="$BUILDROOT/depends"
+PROVIDESLIST="$BUILDROOT/provides"
 
 mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
 mkdir -p "$REPODIR"
@@ -50,7 +50,7 @@ source "$SCRIPTDIR/util/autotools.sh"
 include_merge "TOOLCHAIN"
 
 HOSTTUPLE=$($SCRIPTDIR/util/config.guess)
-TCDIR="$BUILDROOT/$PRODUCT/toolchain"
+TCDIR="$BUILDROOT/toolchain"
 
 export PATH="$TCDIR/bin:$PATH"
 
diff --git a/pkg/release-alix/build b/pkg/release-alix/build
index 5d79c72..3068b0b 100755
--- a/pkg/release-alix/build
+++ b/pkg/release-alix/build
@@ -19,7 +19,7 @@ build() {
 }
 
 deploy() {
-	tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
+	tar czf "$BUILDROOT/$PKGNAME.tar.gz" *
 
 	touch "$PKGDEPLOYDIR/$PKGNAME.files"
 	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
diff --git a/pkg/release-qemu/build b/pkg/release-qemu/build
index 18cecf0..8b82989 100755
--- a/pkg/release-qemu/build
+++ b/pkg/release-qemu/build
@@ -23,7 +23,7 @@ build() {
 }
 
 deploy() {
-	tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
+	tar czf "$BUILDROOT/$PKGNAME.tar.gz" *
 
 	touch "$PKGDEPLOYDIR/$PKGNAME.files"
 	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build
index 6a6e6fc..77a12df 100755
--- a/pkg/release-rpi3/build
+++ b/pkg/release-rpi3/build
@@ -21,7 +21,7 @@ build() {
 }
 
 deploy() {
-	tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
+	tar czf "$BUILDROOT/$PKGNAME.tar.gz" *
 
 	touch "$PKGDEPLOYDIR/$PKGNAME.files"
 	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF