diff --git a/tools/jsii-build-tools/bin/package-js b/tools/jsii-build-tools/bin/package-js
index e61361e7fc..23558db0b3 100755
--- a/tools/jsii-build-tools/bin/package-js
+++ b/tools/jsii-build-tools/bin/package-js
@@ -1,5 +1,11 @@
 #!/bin/bash
 set -euo pipefail
+
 rm -fr dist/js
-mkdir -p dist/js
-mv $(npm pack) dist/js
+
+package_name=$(node -p "require('./package.json').name")
+target_file="dist/js/${package_name/\//-}.tgz"
+
+mkdir -p $(dirname ${target_file})
+
+mv $(npm pack) ${target_file}
diff --git a/tools/jsii-build-tools/bin/package-python b/tools/jsii-build-tools/bin/package-python
index 8ea2d10df6..300e9e1d36 100755
--- a/tools/jsii-build-tools/bin/package-python
+++ b/tools/jsii-build-tools/bin/package-python
@@ -3,5 +3,5 @@ set -euo pipefail
 
 rm -rf dist/python
 mkdir -p dist/python
-mv *.whl dist/python
-mv *.tar.gz dist/python
+cp *.whl dist/python
+cp *.tar.gz dist/python