diff --git a/Tools/CPUInfo/Makefile b/Tools/CPUInfo/Makefile
index eb4da6c4e6..0ac058446d 100644
--- a/Tools/CPUInfo/Makefile
+++ b/Tools/CPUInfo/Makefile
@@ -1,4 +1,12 @@
-#
-# Trivial makefile for building APM
-#
-include ../../mk/apm.mk
+# this is meant to make existing build instructions work with waf
+
+all:
+	@cd ../../ && modules/waf/waf-light configure --board linux --debug
+	@cd ../../ && modules/waf/waf-light tools
+	@cp ../../build/linux-debug/tools/CPUInfo CPUInfo.elf
+	@echo Built CPUInfo.elf
+
+clean:
+	@cd ../../ && modules/waf/waf-light configure --board linux clean
+
+linux-debug: all