diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index aba3e26d69975cf2bec8a9634962fc15dc7e7cc6..81df93cc224e2e4a9227ca13433b819eb47d6f73 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -34,7 +34,11 @@ SUITE ?= stretch
 SOURCE ?= false
 
 # yes no
-BUILD = $(MACHINE)-$(ARCHITECTURE)
+if [ $$MACHINE = all ]; then
+	BUILD = $(ARCHITECTURE)
+else
+	BUILD = $(MACHINE)-$(ARCHITECTURE)
+fi
 NAME = build/$(PROJECT_NAME)-$(IMAGE_NAME)-$(BUILD)
 IMAGE = $(NAME).img
 ARCHIVE = $(IMAGE).xz