diff --git a/agent/build-package.sh b/agent/build-package.sh
index 38b6a0a7a33d70361c3404b7d564077d20d1bb8c..6aae86a98d249bef39585ab3044d08162f086d41 100755
--- a/agent/build-package.sh
+++ b/agent/build-package.sh
@@ -86,7 +86,7 @@ parse_options() {
 output=
 version=
 input=
-bootstrap="bootstrap/bootstrap-install"
+bootstrap="bootstrap/install"
 
 # parse command line options into the global variables above
 parse_options "$@"
@@ -111,7 +111,15 @@ mkdir -p $tempdir/data
 tempfile=$(mktemp /tmp/datasid.XXXXXXXX)
 tar --directory "$tempdir" -czf "$tempfile" .
 
-rm -rf "$tempdir"
+if test $bootstrap = "bootstrap/install"; then
+    mkdir -p "$(dirname $0)/agent-files/"
+    cp "$(dirname $0)/$bootstrap" "$(dirname $0)/agent-files/"
+    mv $tempdir "$(dirname $0)/agent-files/"
+    rm -rf "$(dirname $0)/agent-files/datasid"
+    mv "$(dirname $0)/agent-files/$(basename $tempdir)" "$(dirname $0)/agent-files/datasid"
+else
+    rm -rf $tempdir
+fi
 
 pkgmd5=$(md5sum "$tempfile" | cut -d' ' -f1)
 pkgline=$(( $(wc -l "$bootstrap" | cut -d' ' -f1) + 1 ))