diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/p11-kit/README.md b/sdk_container/src/third_party/coreos-overlay/app-crypt/p11-kit/README.md
new file mode 100644
index 0000000000..92a3038272
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/p11-kit/README.md
@@ -0,0 +1,4 @@
+We forked this package to fix the systemd user unit directory and bash
+completion directory detection in the cross-compilation scenario.
+
+These fixes could be upstreamed to gentoo.
diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/p11-kit/p11-kit-0.23.22.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
index d8fecbda23..b36df3db26 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit multilib-minimal
+# Flatcar: inherit systemd eclass for the systemd user unit directory
+# getter, and bash-completion-r1 for bash completion directory getter.
+inherit multilib-minimal systemd bash-completion-r1
 
 DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
 HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
@@ -42,6 +44,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Flatcar: Override the detection of the systemd user unit
+	# directory and bash completion directory with these
+	# environment variables.
+	local -x systemduserunitdir=$(systemd_get_userunitdir)
+	local -x bashcompdir=$(get_bashcompdir)
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable trust trust-module) \
 		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \