diff --git a/recipes-external/glibc/console-image.bbappend b/recipes-external/glibc/console-image.bbappend
deleted file mode 100644
index b7d8649..0000000
--- a/recipes-external/glibc/console-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-TOOLCHAIN_HOST_TASK += "glibc-multilib-link"
diff --git a/recipes-external/glibc/core-image-base.bbappend b/recipes-external/glibc/core-image-base.bbappend
deleted file mode 100644
index b7d8649..0000000
--- a/recipes-external/glibc/core-image-base.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-TOOLCHAIN_HOST_TASK += "glibc-multilib-link"
diff --git a/recipes-external/glibc/core-image-sato.bbappend b/recipes-external/glibc/core-image-sato.bbappend
deleted file mode 100644
index b7d8649..0000000
--- a/recipes-external/glibc/core-image-sato.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-TOOLCHAIN_HOST_TASK += "glibc-multilib-link"
diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb
index 1235339..d311128 100644
--- a/recipes-external/glibc/glibc-external.bb
+++ b/recipes-external/glibc/glibc-external.bb
@@ -100,8 +100,6 @@ python () {
 
 # Default pattern is too greedy
 
-PACKAGES += "glibc-multilib-link"
-FILES_glibc-multilib-link += "${@sysroot_multilib_suffix(d)}"
 
 FILES_${PN}-utils = "\
     ${bindir}/gencat \
@@ -148,6 +146,9 @@ 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())} \