diff --git a/bin/build-all.sh b/bin/build-all.sh
index 2c3f1dd9..90215931 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -14,6 +14,8 @@ ARCHIVEDIR=release/archive
 
 rm -f $OUTDIR/firmware*
 
+mkdir -p $OUTDIR/bins $OUTDIR/elfs
+
 # build the named environment and copy the bins to the release directory
 function do_build {
     ENV_NAME=$1
@@ -22,8 +24,8 @@ function do_build {
     SRCELF=.pio/build/$ENV_NAME/firmware.elf
     rm -f $SRCBIN 
     pio run --environment $ENV_NAME # -v
-    cp $SRCBIN $OUTDIR/firmware-$ENV_NAME-$COUNTRY-$VERSION.bin
-    cp $SRCELF $OUTDIR/firmware-$ENV_NAME-$COUNTRY-$VERSION.elf
+    cp $SRCBIN $OUTDIR/bins/firmware-$ENV_NAME-$COUNTRY-$VERSION.bin
+    cp $SRCELF $OUTDIR/elfs/firmware-$ENV_NAME-$COUNTRY-$VERSION.elf
 }
 
 for COUNTRY in $COUNTRIES; do 
@@ -56,6 +58,6 @@ Generated by bin/buildall.sh -->
 XML
 
 rm -f $ARCHIVEDIR/firmware-$VERSION.zip
-zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $OUTDIR/firmware-*-$VERSION.* images/system-info.bin bin/device-install.sh
+zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $OUTDIR/bins/firmware-*-$VERSION.* images/system-info.bin bin/device-install.sh
 
 echo BUILT ALL
\ No newline at end of file