diff --git a/Makefile b/Makefile
index 6ac87a37e..3e22feec5 100644
--- a/Makefile
+++ b/Makefile
@@ -90,10 +90,8 @@ $(HEADS_MAKE): $(build)/$(make_dir)/.configured
 		$(VERBOSE_REDIRECT)
 
 # Once we have a proper Make, we can just pass arguments into it
-all linux cpio run: $(HEADS_MAKE)
-        LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $(MAKE_JOBS) $@
-%.clean %.vol %.menuconfig: $(HEADS_MAKE)
-        LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $@
+all linux cpio run: | $(HEADS_MAKE)
+%.clean %.vol %.menuconfig: | $(HEADS_MAKE)
 
 bootstrap: $(HEADS_MAKE)
 endif
@@ -135,10 +133,10 @@ $(HEADS_GAWK): $(build)/$(gawk_dir)/.configured
 		$(VERBOSE_REDIRECT)
 
 # Once we have a suitable version of gawk, we can rerun make
-all linux cpio run: $(HEADS_GAWK)
-	LANG=C HEADS_GAWK=$(HEADS_GAWK) $(MAKE) $(MAKE_JOBS) $@
-%.clean %.vol %.menuconfig: $(HEADS_GAWK)
-	LANG=C HEADS_GAWK=$(HEADS_GAWK) $(MAKE) $@
+all linux cpio run: | $(HEADS_MAKE) $(HEADS_GAWK)
+	LANG=C HEADS_GAWK=$(HEADS_GAWK) $(MAKE) $(MAKE_JOBS)
+%.clean %.vol %.menuconfig: | $(HEADS_MAKE) $(HEADS_GAWK)
+	LANG=C HEADS_GAWK=$(HEADS_GAWK) $(MAKE)
 
 bootstrap: $(HEADS_GAWK)
 endif
diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config
index d951b94c3..a4517a025 100644
--- a/boards/x230-maximized/x230-maximized.config
+++ b/boards/x230-maximized/x230-maximized.config
@@ -78,12 +78,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"