diff --git a/Dockerfile.isar b/Dockerfile.isar
index 0119720..ea644b4 100644
--- a/Dockerfile.isar
+++ b/Dockerfile.isar
@@ -10,7 +10,7 @@ RUN apt-get update && \
     apt-get install -y -f --no-install-recommends --target-release jessie \
             autoconf automake gdisk libtool bash-completion \
             sudo grub2 grub-efi-amd64-bin grub-efi-ia32-bin qemu-user-static \
-            reprepro python3 && \
+            reprepro python3 binfmt-support && \
     apt-get install -y -f --no-install-recommends --target-release jessie-backports \
             e2fsprogs && \
     apt-get install -y -f --no-install-recommends --target-release stretch \
@@ -20,3 +20,5 @@ RUN apt-get update && \
 
 RUN echo "builder ALL=NOPASSWD: ALL" > /etc/sudoers.d/builder-nopasswd && \
     chmod 660 /etc/sudoers.d/builder-nopasswd
+
+RUN sed -i "s|#!/bin/bash|\0\n\nupdate-binfmts --enable|" /kas/docker-entrypoint