diff --git a/Makefile b/Makefile
index 27df84035..eb2e60148 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,12 @@ crystal11_obj := $(crystal_obj:.o=11.o)
 roms := pokecrystal.gbc pokecrystal11.gbc
 
 all: crystal
-crystal: pokecrystal.gbc
-crystal11: pokecrystal11.gbc
+crystal: tools pokecrystal.gbc
+crystal11: tools pokecrystal11.gbc
 
 clean:
 	rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
+	make clean -C tools/
 
 compare: $(roms)
 	@$(MD5) roms.md5
diff --git a/tools/Makefile b/tools/Makefile
index 4a04027fc..66e9be8a5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,13 +1,18 @@
-.PHONY: all
+.PHONY: all clean
 
-all: \
+tools := \
 	lzcomp \
 	png_dimensions \
 	scan_includes \
 	palette \
 	pokemon_animation \
 	pokemon_animation_graphics
+
+all: $(tools)
 	@:
 
+clean:
+	rm -f $(tools)
+
 %: %.c
 	$(CC) -o $@ $<