diff --git a/Makefile b/Makefile
index 5909eba..1ff3d33 100644
--- a/Makefile
+++ b/Makefile
@@ -12,23 +12,27 @@ obj_dir = $(build_dir)/obj
 
 sources := $(shell find src/ -name *.cpp -and -not -name *main.cpp)
 
-vc5_sources := $(sources) src/main.cpp
+vm_bin = $(build_dir)/vm
+vm_sources := $(sources) src/vm_main.cpp
+
+asm_bin = $(build_dir)/asm
 asm_sources := $(sources) src/asm_main.cpp
 
-all: $(build_dir)/vc5 $(build_dir)/asm
+all: $(vm_bin) $(asm_bin) $(build_dir)/boot.bin
 
-$(build_dir)/vc5: $(vc5_sources:%.cpp=$(obj_dir)/%.o)
-	@mkdir -p $(dir $@)
+$(vm_bin): $(vm_sources:%.cpp=$(obj_dir)/%.o)
 	g++ $^ -o $@ $(CXXFLAGS) $(LDFLAGS)
 
-$(build_dir)/asm: $(asm_sources:%.cpp=$(obj_dir)/%.o)
-	@mkdir -p $(dir $@)
+$(asm_bin): $(asm_sources:%.cpp=$(obj_dir)/%.o)
 	g++ $^ -o $@ $(CXXFLAGS) $(LDFLAGS)
 
 $(obj_dir)/%.o: %.cpp
 	@mkdir -p $(dir $@)
 	g++ $< -c -o $@ -MMD -MP $(CXXFLAGS)
 
+$(build_dir)/boot.bin: programs/boot.vc5asm $(asm_bin)
+	./$(asm_bin) $< -o $@
+
 .PHONY: clean
 clean:
 	rm -rf $(build_dir)
diff --git a/src/main.cpp b/src/vm_main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/vm_main.cpp