diff --git a/templates/glibc-runstuff-after-install.sh b/templates/glibc-runstuff-after-install.sh
new file mode 100644
index 00000000000..a9590d83a12
--- /dev/null
+++ b/templates/glibc-runstuff-after-install.sh
@@ -0,0 +1,16 @@
+#
+# Replace hardcoded path to bash.
+# x86_64 arch: use /lib rather than /lib64 and make lib64 -> lib symlinks.
+#
+
+if [ -x $XBPS_DESTDIR/$pkgname-$version/usr/bin/ldd ]; then
+	sed -i -e "s,$XBPS_MASTERDIR/bin/bash,/bin/bash,g" \
+		$XBPS_DESTDIR/$pkgname-$version/usr/bin/ldd
+fi
+
+if [ "$xbps_machine" = "x86_64" ]; then
+	sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' \
+		$XBPS_DESTDIR/$pkgname-$version/usr/bin/ldd
+	cd $XBPS_DESTDIR/$pkgname-$version && ln -s lib lib64
+	cd $XBPS_DESTDIR/$pkgname-$version/usr && ln -s lib lib64
+fi
diff --git a/templates/glibc-runstuff-before-configure.sh b/templates/glibc-runstuff-before-configure.sh
index d2a2dce2fa7..8fbe8cca801 100644
--- a/templates/glibc-runstuff-before-configure.sh
+++ b/templates/glibc-runstuff-before-configure.sh
@@ -2,3 +2,4 @@
 
 mkdir -p $wrksrc/build_obj && cd $wrksrc/build_obj
 wrksrc=$wrksrc/build_obj
+echo "slibdir=/lib" >> $wrksrc/configparms
diff --git a/templates/glibc.tmpl b/templates/glibc.tmpl
index 84d94891e7a..63cc7505076 100644
--- a/templates/glibc.tmpl
+++ b/templates/glibc.tmpl
@@ -8,7 +8,8 @@ configure_env="ac_cv_path_BASH_SHELL=/bin/bash"
 configure_script="../configure"
 configure_args="--with-tls -disable-profile --with-__thread
  --enable-kernel=2.6.16 --enable-add-ons --without-gd --enable-bind-now
- --without-cvs --without-selinux --prefix=/usr"
+ --without-cvs --without-selinux --prefix=/usr --libdir=/usr/lib
+ --with-headers=/usr/include"
 make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install
  localedata/install-locales"
 short_desc="The GNU C library"