diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index 289864cdf..0da7cc33f 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -169,6 +169,13 @@ glibc_postmake()
 
 	# Install ld.so.conf
 	#
+	# TODO
+	# We should migrate to a more modular approach here, moving to package
+	# based configuration in '/etc/ld.so.conf.d/$pkg.conf' and including all
+	# dedicated conf files in a generic main 'ld.so.conf' like this:
+	#
+	# include /etc/ld.so.conf.d/*.conf
+	#
 	case $arch_machine in
 		powerpc64|sparc64|x86_64|mips64)
 			cat > $root/etc/ld.so.conf <<-EOT
@@ -176,6 +183,8 @@ glibc_postmake()
 			/lib
 			/usr/lib64
 			/usr/lib
+			/usr/lib64/*/
+			/usr/lib/*/
 			/usr/*/lib64
 			/usr/*/lib
 			/opt/*/lib64
@@ -187,6 +196,7 @@ EOT
 				cat >> $root/etc/ld.so.conf <<-EOT
 				/lib32
 				/usr/lib32
+				/usr/lib32/*/
 				/usr/*/lib32
 				/opt/*/lib32
 				/usr/local/lib32
@@ -196,6 +206,7 @@ EOT
 		*)	cat > $root/etc/ld.so.conf <<-EOT
 			/lib
 			/usr/lib
+			/usr/lib/*/
 			/usr/*/lib
 			/opt/*/lib
 			/usr/local/lib