diff --git a/core/glibc/build b/core/glibc/build
index 2dbf949dd..9b70bfd91 100755
--- a/core/glibc/build
+++ b/core/glibc/build
@@ -2,22 +2,28 @@
 
 # glibc wont build without optimization for some reason
 CFLAGS="${CFLAGS:--Os}"
-# glibc fails becuase of handling warnings as errors, to prevent this some warnings are disabled.
-export CFLAGS="$CFLAGS -Wno-zero-length-bounds -Wno-array-bounds"
-
-# locale script for generating locales as well as default en_US.UTF8 locale
-install -Dm755 ./locale-gen "$1/usr/bin/locale-gen"
-install -Dm644 ./locale.gen "$1/etc/locale.gen"
 
 # glibc wont build in main directory
 mkdir build
 cd build
 
 ../configure \
-    --prefix=/usr
+    --prefix=/usr \
+    --disable-werror
 
 make
 make DESTDIR="$1" install
 
-rm "$1/var/db/Makefile"
+rm  "$1/var/db/Makefile" \
+    "$1/usr/bin/ldd" \
+    "$1/usr/bin/sotruss" \
+    "$1/usr/bin/xtrace"
+
+# locale script for generating locales as well as default en_US.UTF8 locale
+install -Dm755 ../sh-alternatives/locale-gen "$1/usr/bin/locale-gen"
+install -Dm644 ../locale.gen "$1/etc/locale.gen"
 
+# replace bash scripts with posix sh ports
+install -Dm755 ../sh-alternatives/ldd "$1/usr/bin/ldd"
+install -Dm755 ../sh-alternatives/sotruss "$1/usr/bin/sotruss"
+install -Dm755 ../sh-alternatives/xtrace "$1/usr/bin/xtrace"
diff --git a/core/glibc/checksums b/core/glibc/checksums
index f2c5f4dd1..ca1064ae5 100644
--- a/core/glibc/checksums
+++ b/core/glibc/checksums
@@ -1,3 +1,3 @@
 e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af  glibc-2.30.tar.xz
-845e725da4121f838481669fe0590e59367076a25b234d239ec66e67aa89b1ea  locale-gen
+d660ee1eeb2b8c69c1f7c731b7b5e482b2fb7450c1a2d9b003e9da60cdd9dc6c  glibc.tar.xz
 2db453cc421b0753f4939c26765717cba6e5df1712b1c6b97b92bee6565ad7a1  locale.gen
diff --git a/core/glibc/files/locale-gen b/core/glibc/files/locale-gen
deleted file mode 100755
index 16a414e17..000000000
--- a/core/glibc/files/locale-gen
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-[ "$(whoami)" = root ] || {
-    echo "Please run as root"
-    exit 1
-}
-
-[ -r /etc/locale.gen ] || {
-    echo "Cannot open /etc/locale.gen for reading"
-    exit 1
-}
-
-while read -r line; do
-    INPUTFILE="${line%% *}"
-    INPUTFILE="${INPUTFILE%%.*}"
-    CHARMAPFILE="${line##* }"
-    echo "Generating locale $INPUTFILE.$CHARMAPFILE"
-    localedef -i "$INPUTFILE" -f "$CHARMAPFILE" "$INPUTFILE.$CHARMAPFILE" || {
-        echo "Generating locale $INPUTFILE.$CHARMAPFILE failed"
-        exit 1
-    }
-done < /etc/locale.gen
diff --git a/core/glibc/sources b/core/glibc/sources
index ad8566bea..be9ae5ab8 100644
--- a/core/glibc/sources
+++ b/core/glibc/sources
@@ -1,3 +1,4 @@
 https://ftp.gnu.org/gnu/libc/glibc-2.30.tar.xz
+https://github.com/gkiss-linux/sh-alternatives/releases/download/1.0/glibc.tar.xz sh-alternatives/
 files/locale-gen
 files/locale.gen
diff --git a/core/glibc/version b/core/glibc/version
index 3b559ca85..fda1815f4 100644
--- a/core/glibc/version
+++ b/core/glibc/version
@@ -1 +1 @@
-2.31 2
+2.31 3