diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.3.8-file-update.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.3.8-file-update.patch
new file mode 100644
index 0000000000..03b249a330
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.3.8-file-update.patch
@@ -0,0 +1,23 @@
+Add support for new file command output.
+
+--- bin/ebuild-helpers/prepstrip
++++ bin/ebuild-helpers/prepstrip
+@@ -346,7 +346,7 @@
+ 				${STRIP} -g "${x}"
+ 			fi
+ 		fi
+-	elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
++	elif [[ ${f} == *"SB executable"* || ${f} == *"SB pie executable"* || ${f} == *"SB shared object"* ]] ; then
+ 		process_elf "${x}" "${inode_link}" ${PORTAGE_STRIP_FLAGS}
+ 	elif [[ ${f} == *"SB relocatable"* ]] ; then
+ 		process_elf "${x}" "${inode_link}" ${SAFE_STRIP_FLAGS}
+--- bin/install-qa-check.d/10ignored-flags
++++ bin/install-qa-check.d/10ignored-flags
+@@ -33,6 +33,7 @@
+ 			f=$(file "${x}") || continue
+ 			[[ -z ${f} ]] && continue
+ 			if [[ ${f} == *"SB executable"* ||
++				${f} == *"SB pie executable"* ||
+ 				${f} == *"SB shared object"* ]] ; then
+ 				echo "${x}" >> "${T}"/scanelf-ignored-CFLAGS.log
+ 			fi
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8-r1.ebuild
similarity index 98%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8-r1.ebuild
index dfc7c873c7..e7d05e2cc3 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.3.8-r1.ebuild
@@ -87,6 +87,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.18-0002-environment-Filter-EROOT-for-all-EAPIs.patch"
 	# upstream bug:
 	"${FILESDIR}/${PN}-2.2.18-0003-depgraph-ensure-slot-rebuilds-happen-in-the-correct-.patch"
+	# support new file command output (this can be dropped when upgrading)
+	"${FILESDIR}/${P}-file-update.patch"
 )
 
 pkg_setup() {