diff --git a/build.img b/build.img
index abb14417..625edf1d 100644
--- a/build.img
+++ b/build.img
@@ -500,7 +500,11 @@ for dir in $(find build/ -mindepth 1 -maxdepth 1 -type d | sort); do
     export config_platform_branch=$opt_arch
     export config_branch=${opt_arch##*-}
 
-    export IMGNAME=${config_img_name}_$(date +%Y.%m.%d)_$(basename $dir).img
+    case ${config_distro_arch} in
+        arm64) export config_arch="${config_distro_arch}_" ;;
+        *)     export config_arch='' ;;
+    esac
+    export IMGNAME=${config_img_name}_$(date +%Y.%m.%d)_${config_arch}$(basename $dir | sed "s/-64//g").img
 
     touch $XBIANPKGDIR/build.~lock
     trap "kill_gitbuilder; sync; clean_tmp; clean_all; clean_loopd; rm -f $XBIANPKGDIR/build.~lock" EXIT TERM
diff --git a/xbian-build-img/hooks.d/post-img.d/xbian-files4noobs b/xbian-build-img/hooks.d/post-img.d/xbian-files4noobs
index d736c30d..6220d6e3 100644
--- a/xbian-build-img/hooks.d/post-img.d/xbian-files4noobs
+++ b/xbian-build-img/hooks.d/post-img.d/xbian-files4noobs
@@ -16,8 +16,8 @@ if [ -n $config_fstype_boot ] && ! echo $IMGNAME | grep -qE "devel|staging|test|
 
     (
         cd ..
-        dd if=/dev/mapper/${loopd}p2 | xz --threads=0 -z > xbianroot-$config_platform.xz
-        sha512sum xbianroot-$config_platform.xz > xbianroot-$config_platform.xz.sha512
+        dd if=/dev/mapper/${loopd}p2 | xz --threads=0 -z > xbianroot-${config_arch}${config_platform}.xz
+        sha512sum xbianroot-${config_arch}${config_platform}.xz > xbianroot-${config_arch}${config_platform}.xz.sha512
     )
 
     mkdir -p ./boot
@@ -25,9 +25,9 @@ if [ -n $config_fstype_boot ] && ! echo $IMGNAME | grep -qE "devel|staging|test|
 
     (
         cd ./boot
-        tar -cJf ../../xbianboot-$config_platform.tar.xz *
+        tar -cJf ../../xbianboot-${config_arch}${config_platform}.tar.xz *
         cd ../..
-        sha512sum xbianboot-$config_platform.tar.xz > xbianboot-$config_platform.tar.xz.sha512
+        sha512sum xbianboot-${config_arch}${config_platform}.tar.xz > xbianboot-${config_arch}${config_platform}.tar.xz.sha512
     )
 
     umount ./boot