diff --git a/Makefrag b/Makefrag
index 9f535e12..4ce1ab76 100644
--- a/Makefrag
+++ b/Makefrag
@@ -1,5 +1,6 @@
 # UCB use only
--include $(base_dir)/Makefrag-refchip
+-include $(base_dir)/Makefrag-boomchip
+-include $(base_dir)/Makefrag-hwachachip
 
 # check RISCV environment variable
 ifndef RISCV
diff --git a/emulator/Makefile b/emulator/Makefile
index 539abcd1..d578fc31 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -95,7 +95,8 @@ run-mt-tests-debug: $(addprefix $(output_dir)/, $(addsuffix .vpd, $(mt_bmarks)))
 	@echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' $(patsubst %.vpd,%.out,$^); echo;
 
 # UCB use only
--include Makefrag-refchip
+-include Makefrag-boomchip
+-include Makefrag-hwachachip
 
 run: run-asm-tests run-bmarks-test
 run-debug: run-asm-tests-debug run-bmarks-test-debug