diff --git a/Makefile b/Makefile
index bb1b882c5..b2d8ce2e0 100755
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,11 @@ clean:
 	rm -f *.o *.a
 	rm -rf $(CURDIR)/build
 
+regen:
+# Regenerate generated files that are committed. If they are changed, they will
+# be marked as modified in git.
+	cd $(SOURCE_DIR)/rdpq && ./mkfontbuiltin.sh
+
 test:
 	$(MAKE) -C tests
 
diff --git a/build.sh b/build.sh
index fb533e3ab..cd5f1a0b1 100755
--- a/build.sh
+++ b/build.sh
@@ -37,7 +37,7 @@ JOBS="${JOBS:-1}" # If getconf returned nothing, default to 1
 # Clean, build, and install libdragon + tools
 sudoMakeWithParams install-mk
 makeWithParams clobber
-makeWithParams libdragon tools
+makeWithParams libdragon tools regen
 sudoMakeWithParams install tools-install
 
 # Build examples and tests - libdragon must be already installed at this point,
diff --git a/src/rdpq/mkfontbuiltin.sh b/src/rdpq/mkfontbuiltin.sh
index c83f554f9..b9e5c7511 100755
--- a/src/rdpq/mkfontbuiltin.sh
+++ b/src/rdpq/mkfontbuiltin.sh
@@ -9,6 +9,6 @@ BUILTIN="monogram at01"
 
 rm -f rdpq_font_builtin.c
 for font in $BUILTIN; do
-    $N64_INST/bin/mkfont -v --compress 0 --output $TMPDIR --range 20-BF --outline 1 "$FONTDB/$font.ttf"
+    "$N64_INST/bin/mkfont" --compress 0 --output $TMPDIR --range 20-BF --outline 1  "$@" "$FONTDB/$font.ttf"
     xxd -i -n __fontdb_$font $TMPDIR/$font.font64 >>rdpq_font_builtin.c
 done