diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.10.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.9.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.10.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
index 34ac28aa78..23a0ea9f31 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
@@ -130,6 +130,14 @@ src_install() {
 	done
 	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic || die
 
+	# Add oem/lib64 to search path towards end of the system's list.
+	# This simplifies the configuration of OEMs with dynamic libs.
+	ldpaths=
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":/usr/share/oem/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/80oem || die
+
 	if ! use symlink-usr ; then
 		# modprobe uses /lib instead of /usr/lib
 		mv "${D}"/usr/lib/modprobe.d "${D}"/lib/modprobe.d || die