diff --git a/steps/musl-1.2.5/pass1.sh b/steps/musl-1.2.5/pass1.sh
index d6de474a..d7686655 100755
--- a/steps/musl-1.2.5/pass1.sh
+++ b/steps/musl-1.2.5/pass1.sh
@@ -13,6 +13,21 @@ src_get() {
     fi
 }
 
+src_prepare() {
+    default
+
+    # regenerate headers in src/ctype and src/iconv
+    cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b
+    cd ctype
+    CC="gcc -std=c99" make
+    cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.5/src/ctype/
+    cd ../iconv
+    CC="gcc -std=c99" make
+    cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \
+        ../../musl-1.2.5/src/locale/
+    cd ../../musl-1.2.5
+}
+
 src_configure() {
     CC=gcc ./configure \
         --host=i386-unknown-linux-musl \
diff --git a/steps/musl-1.2.5/pass3.sh b/steps/musl-1.2.5/pass3.sh
index b3e42263..e295fabe 100755
--- a/steps/musl-1.2.5/pass3.sh
+++ b/steps/musl-1.2.5/pass3.sh
@@ -4,6 +4,21 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+src_prepare() {
+    default
+
+    # regenerate headers in src/ctype and src/iconv
+    cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b
+    cd ctype
+    CC="gcc -std=c99" make
+    cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.5/src/ctype/
+    cd ../iconv
+    CC="gcc -std=c99" make
+    cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \
+        ../../musl-1.2.5/src/locale/
+    cd ../../musl-1.2.5
+}
+
 src_configure() {
     ./configure \
         --host=i386-unknown-linux-musl \
diff --git a/steps/musl-1.2.5/sources b/steps/musl-1.2.5/sources
index b42bb196..c29d22d9 100644
--- a/steps/musl-1.2.5/sources
+++ b/steps/musl-1.2.5/sources
@@ -1 +1,2 @@
 https://musl.libc.org/releases/musl-1.2.5.tar.gz a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4
+git://github.com/richfelker/musl-chartable-tools~78b213a868553b1154ee9627c96ff1f14a9a3b1b https://github.com/richfelker/musl-chartable-tools/archive/78b213a868553b1154ee9627c96ff1f14a9a3b1b.tar.gz bb52d7c11b663c2d1c5957fd862758d1da7e65b53c0a8ecfb9110d02c04badb6