diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb
index 4c76bc9..2174333 100644
--- a/recipes-external/glibc/glibc-external.bb
+++ b/recipes-external/glibc/glibc-external.bb
@@ -68,6 +68,7 @@ glibc_external_do_install_extra () {
                 "This may mean that your external toolchain uses a different" \
                 "multi-lib setup than your machine configuration"
     fi
+    create_multilib_link ${D}
 }
 
 EXTERNAL_EXTRA_FILES += "\
@@ -143,6 +144,7 @@ FILES_${PN}-dev += "\
     ${libdir}/libthread_db${SOLIBSDEV} \
     ${libdir}/libpthread${SOLIBSDEV} \
 "
+FILES_${PN}-dev += "${@sysroot_multilib_suffix(d)}"
 libc_headers_file = "${@bb.utils.which('${FILESPATH}', 'libc.headers')}"
 FILES_${PN}-dev += "\
     ${@' '.join('${includedir}/' + f.rstrip() for f in base_read_file('${libc_headers_file}').splitlines())} \
diff --git a/recipes-external/glibc/glibc-sysroot-setup.inc b/recipes-external/glibc/glibc-sysroot-setup.inc
index df02b73..d5c95c1 100644
--- a/recipes-external/glibc/glibc-sysroot-setup.inc
+++ b/recipes-external/glibc/glibc-sysroot-setup.inc
@@ -10,7 +10,7 @@ create_multilib_link () {
 	dest="$1"
 	multilib_suffix="${@sysroot_multilib_suffix(d)}"
 	if [ "$multilib_suffix" != "." ]; then
-		rm -f $dest/$multilib_suffix
+		rm -rf $dest/$multilib_suffix
 		ln -s . $dest/$multilib_suffix
 	fi
 }