diff --git a/bootstrap.d/app-emulation.y4.yml b/bootstrap.d/app-emulation.y4.yml
index 5ff7b8d29..3564e2a72 100644
--- a/bootstrap.d/app-emulation.y4.yml
+++ b/bootstrap.d/app-emulation.y4.yml
@@ -11,7 +11,7 @@ tools:
     architecture: noarch
     containerless: true
     from_source: qemu
-    revision: 1
+    revision: 2
     configure:
       - args:
         - '@THIS_SOURCE_DIR@/configure'
@@ -24,6 +24,7 @@ tools:
         - '--enable-gtk'
         - '--enable-sdl'
         - '--enable-trace-backends=log'
+        - '--enable-slirp'
         environ:
           CFLAGS: '-Wno-int-conversion'
     compile:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 14aaa2179..c1f221e4b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -193,7 +193,7 @@ RUN pip3 install --break-system-packages meson \
 
 # Install mdbook.
 RUN cd /root && \
-	wget -O mdbook.tar.gz https://github.com/rust-lang/mdBook/releases/download/v0.3.7/mdbook-v0.3.7-x86_64-unknown-linux-gnu.tar.gz && \
+	wget -O mdbook.tar.gz https://github.com/rust-lang/mdBook/releases/download/v0.4.43/mdbook-v0.4.43-$(uname -m)-unknown-linux-musl.tar.gz && \
 	tar xf mdbook.tar.gz && \
 	install -D mdbook /usr/local/bin/mdbook
 
diff --git a/scripts/vm-util.py b/scripts/vm-util.py
index d8b528089..11471ecbd 100755
--- a/scripts/vm-util.py
+++ b/scripts/vm-util.py
@@ -290,12 +290,14 @@ def do_qemu(args):
         qemu_args += ["-debugcon", "stdio"]
 
     cpu_extras = []
-    cpu_model = "host,migratable=no"
+    cpu_model = "host"
 
     if args.arch == "x86_64":
         if not have_kvm or args.virtual_cpu:
             cpu_model = "qemu64"
             cpu_extras = ["+smap", "+smep", "+umip", "+pcid", "+invpcid"]
+        else:
+            cpu_model = "host,migratable=no"
     elif args.arch == "aarch64":
         if not have_kvm or args.virtual_cpu:
             cpu_model = "cortex-a72"