diff --git a/tools/build b/tools/build
index b848a6f..8d371eb 100755
--- a/tools/build
+++ b/tools/build
@@ -85,13 +85,15 @@ elif [ "$1" = "cleanall" ]; then
 elif [ "$1" = "tar" ]; then
   dist
   ver=$(get_ver)
-  tar -cvzf argtable-$ver-amalgamation.tar.gz ../dist
+  tar -cvzf argtable-$ver-amalgamation.tar.gz -C .. dist
   exit 0
 elif [ "$1" = "zip" ]; then
   dist
   ver=$(get_ver)
   find ../dist -name '*' | xargs unix2dos
-  zip -r argtable-$ver-amalgamation.zip ../dist
+  pushd ..
+  zip -r tools/argtable-$ver-amalgamation.zip dist
+  popd
   exit 0
 elif [ "$1" = "help" ]; then
   echo "Argtable Amalgamation Package Build Script"
diff --git a/tools/build.bat b/tools/build.bat
index 08a0c9f..dd02262 100644
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -118,14 +118,16 @@ goto :EOF
 call:dist
 call:get_ver
 for /R ..\dist %%G in (*) do dos2unix "%%G"
-tar -cvzf argtable-%ARGTABLE_VER%-amalgamation.tar.gz ..\dist
+tar -cvzf argtable-%ARGTABLE_VER%-amalgamation.tar.gz -C .. dist
 goto :EOF
 
 
 :build_zip
 call:dist
 call:get_ver
-zip -r argtable-%ARGTABLE_VER%-amalgamation.zip ..\dist
+pushd ..
+zip -r tools\argtable-%ARGTABLE_VER%-amalgamation.zip dist
+popd
 goto :EOF