diff --git a/kaem.run b/kaem.run
index 2949b2c2..2f27f942 100644
--- a/kaem.run
+++ b/kaem.run
@@ -25,17 +25,21 @@
 ./build-aux/pointer.sh
 ./build-aux/pointer.sh
 
+mes_cpu=${mes_cpu:-x86}
+stage0_cpu=${mes_cpu:-x86}
+
 M2-Planet                                       \
     --debug                                     \
-    --architecture x86                          \
+    --architecture ${stage0_cpu}                \
     -f include/m2/lib.h                         \
-    -f lib/linux/x86-mes-m2/crt1.c              \
-    -f lib/linux/x86-mes-m2/mini.c              \
+    -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
+    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
+    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
     -f lib/mes/globals.c                        \
     -f lib/m2/exit.c                            \
     -f lib/mes/mini-write.c                     \
-    -f lib/linux/x86-mes-m2/syscall.c           \
-    -f include/linux/x86/syscall.h              \
+    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
+    -f include/linux/${mes_cpu}/syscall.h       \
     -f lib/linux/brk.c                          \
     -f lib/m2/malloc.c                          \
     -f lib/string/memset.c                      \
@@ -118,20 +122,20 @@ blood-elf -f bin/mes.M1 -o bin/mes.blood-elf-M1
 
 M1                                              \
     --LittleEndian                              \
-    --architecture x86                          \
-    -f lib/m2/x86/x86_defs.M1                   \
-    -f lib/x86-mes/x86.M1                       \
-    -f lib/linux/x86-mes-m2/crt1.M1             \
+    --architecture ${stage0_cpu}                \
+    -f lib/m2/${mes_cpu}/${mes_cpu}_defs.M1     \
+    -f lib/${mes_cpu}-mes/${mes_cpu}.M1         \
+    -f lib/linux/${mes_cpu}-mes-m2/crt1.M1      \
     -f bin/mes.M1                               \
     -f bin/mes.blood-elf-M1                     \
     -o bin/mes.hex2
 
 hex2                                            \
     --LittleEndian                              \
-    --architecture x86                          \
+    --architecture ${stage0_cpu}                \
     --BaseAddress 0x1000000                     \
     --exec_enable                               \
-    -f lib/m2/x86/ELF-i386-debug.hex2           \
+    -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2    \
     -f bin/mes.hex2                             \
     -o bin/mes-m2
 
diff --git a/simple.make b/simple.make
index 2f5778b2..126493d6 100644
--- a/simple.make
+++ b/simple.make
@@ -73,7 +73,8 @@ MES_SOURCES =					\
 
 M2_SOURCES =					\
  lib/linux/x86-mes-m2/crt1.c			\
- lib/linux/x86-mes-m2/mini.c			\
+ lib/linux/x86-mes-m2/_exit.c			\
+ lib/linux/x86-mes-m2/_write.c			\
  lib/m2/exit.c					\
  lib/mes/write.c				\
  lib/linux/x86-mes-m2/syscall.c			\