diff --git a/build-aux/build-scaffold.sh b/build-aux/build-scaffold.sh
index c8377a18..665297aa 100755
--- a/build-aux/build-scaffold.sh
+++ b/build-aux/build-scaffold.sh
@@ -84,7 +84,6 @@ trace "HEX2       ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-0exit-42.h
       --base-address 0x1000000\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-0header.hex2\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-0exit-42.hex2\
-      --exec_enable\
       -o 0exit-42
 
 trace "TEST       0exit-42"
@@ -99,7 +98,6 @@ trace "HEX2       ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-body-exit-
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-header.hex2\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-body-exit-42.hex2\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-footer-single-main.hex2\
-      --exec_enable\
       -o body-exit-42
 
 trace "TEST       body-exit-42"
@@ -125,7 +123,6 @@ trace "HEX2       ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-0hello-mes
       --base-address 0x1000000\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-0header.hex2\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-0hello-mes.hex2\
-      --exec_enable\
       -o 0hello-mes
 
 trace "TEST       0hello-mes"
@@ -140,7 +137,6 @@ trace "HEX2       ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-body-hello
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-header.hex2\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-body-hello-mes.hex2\
       -f ${srcdest}lib/$mes_kernel/$mes_cpu-mes/elf$mes_bits-footer-single-main.hex2\
-      --exec_enable\
       -o body-hello-mes
 
 trace "TEST       body-hello-mes"
diff --git a/configure b/configure
index bf0d1d7f..72b3bebd 100755
--- a/configure
+++ b/configure
@@ -4,7 +4,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
 !#
 
 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@reproducible-builds.org>
 ;;;
 ;;; configure: This file is part of GNU Mes.
@@ -458,7 +458,7 @@ Some influential environment variables:
                              (make-dep "M1" #:version '(1 0 0))
                              (make-dep "blood-elf" #:version '(1 0 0))
                              (make-dep "kaem" #:version '(1 0 0) #:optional? #t)
-                             (make-dep "M2-Planet" #:version '(0 1 3) #:optional? #t)
+                             (make-dep "M2-Planet" #:version '(1 8 0) #:optional? #t)
                              (make-dep "diff" #:optional? #t)
                              (make-dep "guile" #:version '(2 0) #:commands '("guile-3.0" "guile-3" "guile-2.2" "guile-2.0" "guile-2" "guile") #:optional? #t)
                              (make-dep "mes" #:version '(0 22) #:optional? #t)
diff --git a/kaem.run b/kaem.run
index 78b44865..8e40a531 100644
--- a/kaem.run
+++ b/kaem.run
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -25,6 +25,7 @@ stage0_cpu=${stage0_cpu:-x86}
 mkdir -p m2
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f include/m2/lib.h                         \
diff --git a/scaffold/argv.kaem b/scaffold/argv.kaem
index 8a0bebdb..7da43379 100644
--- a/scaffold/argv.kaem
+++ b/scaffold/argv.kaem
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -24,6 +24,7 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f include/m2/lib.h                         \
diff --git a/scaffold/global-array.kaem b/scaffold/global-array.kaem
index 78f74b2f..40f0c5b4 100644
--- a/scaffold/global-array.kaem
+++ b/scaffold/global-array.kaem
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -24,6 +24,7 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f lib/mes/globals.c                        \
diff --git a/scaffold/hello.kaem b/scaffold/hello.kaem
index c32b04e2..0482f95b 100644
--- a/scaffold/hello.kaem
+++ b/scaffold/hello.kaem
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -24,6 +24,7 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f include/m2/lib.h                         \
diff --git a/scaffold/local-array.kaem b/scaffold/local-array.kaem
index 42d431f8..862435e3 100644
--- a/scaffold/local-array.kaem
+++ b/scaffold/local-array.kaem
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -24,6 +24,7 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f lib/mes/globals.c                        \
diff --git a/scaffold/local-static-array.kaem b/scaffold/local-static-array.kaem
index 22665731..b5e40b5f 100644
--- a/scaffold/local-static-array.kaem
+++ b/scaffold/local-static-array.kaem
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -24,6 +24,7 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f lib/mes/globals.c                        \
diff --git a/scaffold/main.kaem b/scaffold/main.kaem
index 19c1ac27..b91ada9a 100644
--- a/scaffold/main.kaem
+++ b/scaffold/main.kaem
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -24,6 +24,7 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
diff --git a/scaffold/read.kaem b/scaffold/read.kaem
index 5bd2083d..ffd976cb 100644
--- a/scaffold/read.kaem
+++ b/scaffold/read.kaem
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -24,6 +24,7 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
+    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f include/m2/lib.h                         \