diff --git a/Makefrag b/Makefrag
index 5139bdde..c63c650c 100644
--- a/Makefrag
+++ b/Makefrag
@@ -28,7 +28,8 @@ endif
 
 src_path = src/main/scala
 default_submodules = . junctions uncore hardfloat rocket groundtest context-dependent-environments
-chisel_srcs = $(addprefix $(base_dir)/,$(addsuffix /$(src_path)/*.scala,$(default_submodules) $(ROCKETCHIP_ADDONS)))
+chisel_srcs = $(foreach submodule,$(default_submodules) $(ROCKETCHIP_ADDONS),$(wildcard $(base_dir)/$(submodule)/$(src_path)/*.scala))
+chisel_srcs += $(foreach submodule,$(default_submodules) $(ROCKETCHIP_ADDONS),$(wildcard $(base_dir)/$(submodule)/$(src_path)/*/*.scala))
 
 disasm := 2>
 which_disasm := $(shell which spike-dasm 2> /dev/null)