diff --git a/gcc/pkg.yaml b/gcc/pkg.yaml
index 34a5518..c0016b0 100644
--- a/gcc/pkg.yaml
+++ b/gcc/pkg.yaml
@@ -41,6 +41,7 @@ steps:
         --build=${BUILD} \
         --host=${HOST} \
         --prefix=/usr \
+        --libdir=/usr/lib \
         --disable-multilib \
         --disable-nls \
         --enable-shared \
@@ -72,6 +73,8 @@ steps:
         cd build
         make DESTDIR=/rootfs install-strip
         ln -sv gcc /rootfs/usr/bin/cc
+        mv /rootfs/usr/lib64/* /rootfs/usr/lib/
+        rm -rf /rootfs/usr/lib64
 finalize:
   - from: /rootfs
     to: /
diff --git a/musl/pkg.yaml b/musl/pkg.yaml
index 895730d..1c19b55 100644
--- a/musl/pkg.yaml
+++ b/musl/pkg.yaml
@@ -33,6 +33,13 @@ steps:
       - |
         cd build
         make DESTDIR=/rootfs install
+        ARCH=$(uname -m)
+        mkdir -p /rootfs/usr/bin /rootfs/usr/lib
+        rm -rf /rootfs/lib
+        ln -sf /usr/lib/ld-musl-${ARCH}.so.1 /rootfs/usr/bin/ldd
+        mv -f /rootfs/usr/lib/libc.so /rootfs/usr/lib/ld-musl-${ARCH}.so.1
+        ln -sf ld-musl-${ARCH}.so.1 /rootfs/usr/lib/libc.musl-${ARCH}.so.1
+        ln -sf /usr/lib/ld-musl-${ARCH}.so.1 /rootfs/usr/lib/libc.so
 finalize:
   - from: /rootfs
     to: /