diff --git a/build-aux/GNUmakefile.in b/build-aux/GNUmakefile.in
index 9b7748fe..5b1f61b8 100644
--- a/build-aux/GNUmakefile.in
+++ b/build-aux/GNUmakefile.in
@@ -151,7 +151,7 @@ install:
 uninstall:
 	./uninstall.sh
 
-seed: all-go gcc mes-gcc mes-tcc
+seed: all-go gcc mes-gcc x86_64-mes-gcc mes-tcc
 	cd $(MES_SEED) && git reset --hard HEAD
 	$(MAKE) MES=guile MES_SEED= SEED=1 mes
 	cp -v lib/x86-mes/*.S $(MES_SEED)/x86-mes
@@ -160,6 +160,7 @@ seed: all-go gcc mes-gcc mes-tcc
 	cp -v lib/x86_64-mes/*.S $(MES_SEED)/x86_64-mes
 	cp -v src/mes.x86_64-mes-S $(MES_SEED)/x86_64-mes/mes.S
 	MES=$(GUILE) GUILE=$(GUILE) SEED=1 MES_SEED= ${srcdest}build-aux/build-mes.sh
+	MES=$(GUILE) GUILE=$(GUILE) SEED=1 MES_SEED= ${srcdest}build-aux/build-x86_64-mes.sh
 	cd $(MES_SEED) && MES_PREFIX=$(PWD) ./refresh.sh
 	MES=$(GUILE) GUILE=$(GUILE) SEED=1 ${srcdest}build-aux/build-mes.sh
 	cd $(MES_SEED) && MES_PREFIX=$(PWD) arch=x86_64-mes ./refresh.sh
diff --git a/build-aux/build-mes.sh b/build-aux/build-mes.sh
index 1d4433a8..2b46c85e 100755
--- a/build-aux/build-mes.sh
+++ b/build-aux/build-mes.sh
@@ -127,9 +127,6 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc+tcc
 ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc+gnu
 ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libgetopt
 
-
-[ -n "$SEED" ] && exit 0
-
 MES_ARENA=${MES_ARENA-100000000}
 trace "SNARF.mes  gc.c"     ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
 trace "SNARF.mes  lib.c"    ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
@@ -139,8 +136,10 @@ trace "SNARF.mes  posix.c"  ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.sc
 trace "SNARF.mes  reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
 trace "SNARF.mes  vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
 
-echo MES_ARENA=$MES_ARENA
-bash ${srcdest}build-aux/cc-mes.sh scaffold/main
+if [ -n "$SEED" ]; then
+    bash ${srcdest}build-aux/cc-mes.sh src/mes
+    exit 0
+fi
 
 MES_LIBS='-l none' bash ${srcdest}build-aux/cc-mes.sh scaffold/main
 
diff --git a/build-aux/build-x86_64-mes.sh b/build-aux/build-x86_64-mes.sh
index 2d2d266c..de9fd8ec 100755
--- a/build-aux/build-x86_64-mes.sh
+++ b/build-aux/build-x86_64-mes.sh
@@ -129,9 +129,6 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libc+tcc
 ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libc+gnu
 ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-x86_64-mes.sh lib/libgetopt
 
-
-[ -n "$SEED" ] && exit 0
-
 MES_ARENA=${MES_ARENA-100000000}
 trace "SNARF.mes  gc.c"     ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
 trace "SNARF.mes  lib.c"    ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
@@ -141,8 +138,10 @@ trace "SNARF.mes  posix.c"  ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.sc
 trace "SNARF.mes  reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
 trace "SNARF.mes  vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
 
-echo MES_ARENA=$MES_ARENA
-bash ${srcdest}build-aux/cc-x86_64-mes.sh scaffold/main
+if [ -n "$SEED" ]; then
+    bash ${srcdest}build-aux/cc-mes.sh src/mes
+    exit 0
+fi
 
 MES_LIBS='-l none' bash ${srcdest}build-aux/cc-x86_64-mes.sh scaffold/main
 
diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in
index 02e69545..5ef1131e 100755
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@@ -53,4 +53,6 @@ if [ -n "$TCC" ]; then
 fi
 
 sh ${srcdest}build-aux/build-mes.sh
-sh ${srcdest}build-aux/build-x86_64-mes.sh
+if [ "$MES" = guile ]; then
+    sh ${srcdest}build-aux/build-x86_64-mes.sh
+fi