diff --git a/makefile b/makefile
index ac70fe3f1b..7524a163c1 100755
--- a/makefile
+++ b/makefile
@@ -1036,7 +1036,7 @@ ifeq ($(continuations),true)
 	asmflags += -DAVIAN_CONTINUATIONS
 endif
 
-bootimage-generator-sources = $(src)/bootimage.cpp
+bootimage-generator-sources = $(src)/tools/bootimage-generator/main.cpp
 ifneq ($(lzma),)
 	bootimage-generator-sources += $(src)/lzma-encode.cpp
 endif
diff --git a/src/bootimage.cpp b/src/tools/bootimage-generator/main.cpp
similarity index 100%
rename from src/bootimage.cpp
rename to src/tools/bootimage-generator/main.cpp