diff --git a/benchmarks/riscv-coremark/Makefile b/benchmarks/riscv-coremark/Makefile
index a6c819592..a5b472394 100644
--- a/benchmarks/riscv-coremark/Makefile
+++ b/benchmarks/riscv-coremark/Makefile
@@ -1,14 +1,21 @@
+#cmbase=../../addins/coremark
+PORT_DIR = $(CURDIR)/riscv64-baremetal
+cmbase=coremark
+sources=$(cmbase)/core_main.c $(cmbase)/core_list_join.c $(cmbase)/coremark.h  \
+        $(cmbase)/core_matrix.c $(cmbase)/core_state.c $(cmbase)/core_util.c \
+		$(PORT_DIR)/core_portme.h $(PORT_DIR)/core_portme.c $(PORT_DIR)/core_portme.mak \
+		$(PORT_DIR)/crt.S $(PORT_DIR)/encoding.h $(PORT_DIR)/util.h $(PORT_DIR)/syscalls.c
+
 work/coremark.bare.riscv.memfile: work/coremark.bare.riscv.objdump
 	exe2memfile.pl work/coremark.bare.riscv
 
 work/coremark.bare.riscv.objdump: work/coremark.bare.riscv
 	riscv64-unknown-elf-objdump -D work/coremark.bare.riscv > work/coremark.bare.riscv.objdump 
 
-work/coremark.bare.riscv:
-	make -C coremark PORT_DIR=/home/harris/riscv-wally/benchmarks/riscv-coremark/riscv64-baremetal compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64im"
-	mv coremark/coremark.bare.riscv work
-	#make -C ../../addins/coremark PORT_DIR=/home/harris/riscv-wally/benchmarks/riscv-coremark/riscv64-baremetal compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64im"
-	#mv ../../addins/coremark/coremark.bare.riscv work
+work/coremark.bare.riscv: $(sources)
+#	make -C $(cmbase) PORT_DIR=/home/harris/riscv-wally/benchmarks/riscv-coremark/riscv64-baremetal compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64g"
+	make -C $(cmbase) PORT_DIR=$(PORT_DIR) compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64im"
+	mv $(cmbase)/coremark.bare.riscv work
 
 .PHONY: clean
 
diff --git a/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.mak b/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.mak
index 8600ce0a0..4bae943dc 100755
--- a/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.mak
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.mak
@@ -27,7 +27,9 @@ RISCVTYPE=riscv64-unknown-elf
 OUTFLAG= -o
 # Flag: CC
 #	Use this flag to define compiler to use
-CC = $(RISCVTOOLS)/bin/$(RISCVTYPE)-gcc
+# david_harris@hmc.edu 20 Nov 2021 removed full path; require
+CC = $(RISCVTOOLS)/bin/$(RISCVTYPE)-gcc 
+#CC = $(RISCVTYPE)-gcc
 # Flag: CFLAGS
 #	Use this flag to define compiler options. Note, you can add compiler options from the command line using XCFLAGS="other flags"
 #PORT_CFLAGS = -O2 -static -std=gnu99