diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.9.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.9.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 6129ca8230..34ac28aa78 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
@@ -154,3 +154,23 @@ src_install() {
 		systemd_enable_service sysinit.target coreos-tmpfiles.service
 	fi
 }
+
+pkg_postinst() {
+	# Set up /usr/lib/debug to match the root filesystem layout
+	# FIXME: This is done in postinst right now and all errors are ignored
+	# as a transitional scheme, this isn't important enough to migrate
+	# existing SDK environments.
+	local dir
+	for dir in "${BASE_DIRS[@]}"; do
+		mkdir -p "${ROOT}/usr/lib/debug/${dir}"
+	done
+	local sym
+	for sym in "${!LIB_SYMS[@]}" ; do
+		ln -sfT "${LIB_SYMS[$sym]}" "${ROOT}/usr/lib/debug/${sym}"
+	done
+	if use symlink-usr; then
+		for sym in "${!USR_SYMS[@]}" ; do
+			ln -sfT "${USR_SYMS[$sym]}" "${ROOT}/usr/lib/debug/${sym}"
+		done
+	fi
+}