diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.9.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.9-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.9.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.1.9-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
index b5867c87f5..a1098ab955 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
@@ -26,7 +26,13 @@ IUSE=""
 DEPEND=">=dev-lang/go-1.2"
 
 src_compile() {
-	./build || die
+	# work around gentoo hardened gcc incompatibilities with cgo
+	# see https://bugs.gentoo.org/show_bug.cgi?id=493328
+	if gcc-specs-pie; then
+		GOLDFLAGS="-extldflags -fno-PIC"
+	fi
+
+	GOLDFLAGS=${GOLDFLAGS} ./build || die
 }
 
 src_install() {