diff --git a/emul/Makefile b/emul/Makefile
index 6269ab0..3da8522 100644
--- a/emul/Makefile
+++ b/emul/Makefile
@@ -15,20 +15,20 @@ $(BIN2C): $(BLKPACK)
 $(BLKUNPACK): $(BLKPACK)
 
 # not dependent on forth.bin to avoid circular deps.
-forth-bin.h: $(BIN2C)
+forth-bin.h: $(BIN2C) forth.bin
 	$(BIN2C) KERNEL < forth.bin > $@
 
-stage: stage.c $(OBJS) forth-bin.h blkfs-bin.h
+stage: stage.c $(OBJS)
 	$(CC) stage.c $(OBJS) -o $@
 
-blkfs: $(BLKPACK)
+blkfs: $(BLKPACK) $(shell find ../blk -type f)
 	$(BLKPACK) ../blk > $@
 
 blkfs-bin.h: blkfs $(BIN2C)
 	$(BIN2C) BLKFS < blkfs > $@
 
 forth: forth.c $(OBJS) forth-bin.h blkfs-bin.h
-	$(CC) forth.c $(OBJS) -o $@
+	$(CC) -g forth.c $(OBJS) -o $@
 
 libz80/libz80.o: libz80/z80.c
 	$(MAKE) -C libz80/codegen opcodes
@@ -42,6 +42,9 @@ emul.o: emul.c
 updatebootstrap: stage xcomp.fs
 	./stage < xcomp.fs > forth.bin
 
+forth.bin: stage xcomp.fs $(shell find ../blk -type f)
+	./stage < xcomp.fs > forth.bin
+
 .PHONY: pack
 pack:
 	rm blkfs && $(MAKE) blkfs