diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild
index 31dea2e495..e84c86b851 100644
--- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild
@@ -24,7 +24,9 @@ DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	sed -i -e "s/-Werror //" configure.in || die "Sed failed"
+	sed -i -r \
+		-e '/CFLAGS/s/ -(Werror|m64)//' \
+		configure.in || die
 	epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
 	epatch "${FILESDIR}"/${PN}-1.3.5-password.patch