diff --git a/build-aux/build-source-lib.sh b/build-aux/build-source-lib.sh
index 91805679..413f7493 100644
--- a/build-aux/build-source-lib.sh
+++ b/build-aux/build-source-lib.sh
@@ -49,5 +49,22 @@ for c in $libc_gnu_SOURCES; do
 done
 cp libc+gnu.c $mes_cpu-mes
 
-cp ${srcdest}lib/libtcc1.c $mes_cpu-mes
+rm -f libtcc1.c
+cat > libtcc1.c <<EOF
+// Generated from Mes -- do not edit
+// compiler: $compiler
+// cpu:      $mes_cpu
+// bits:     $mes_bits
+// libc:     $mes_libc
+// kernel:   $mes_kernel
+// system:   $mes_system
+
+EOF
+for c in $libtcc1_SOURCES; do
+    echo "// $c" >> libtcc1.c
+    cat ${srcdest}$c >> libtcc1.c
+    echo >> libtcc1.c
+done
+cp libtcc1.c $mes_cpu-mes
+
 cp ${srcdest}lib/posix/getopt.c $mes_cpu-mes/libgetopt.c
diff --git a/build-aux/configure-lib.sh b/build-aux/configure-lib.sh
index 84e1283e..36597246 100644
--- a/build-aux/configure-lib.sh
+++ b/build-aux/configure-lib.sh
@@ -217,6 +217,15 @@ libtcc1_SOURCES="
 lib/libtcc1.c
 "
 
+if test $mes_cpu = arm; then
+    libtcc1_SOURCES="$libtcc1_SOURCES
+lib/mes/div.c
+lib/string/__memcpy.c
+lib/string/__memmove.c
+lib/string/__memset.c
+"
+fi
+
 libc_tcc_SOURCES="
 $libc_SOURCES
 lib/ctype/islower.c