diff --git a/app-metrics/process-exporter/process-exporter-0.8.5.ebuild b/app-metrics/process-exporter/process-exporter-0.8.5.ebuild
index 6ead94d4103d5..0bb5ac941ab22 100644
--- a/app-metrics/process-exporter/process-exporter-0.8.5.ebuild
+++ b/app-metrics/process-exporter/process-exporter-0.8.5.ebuild
@@ -13,7 +13,21 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="MIT Apache-2.0 BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	#See bug 924632
+	case $ARCH in
+		x86|arm)
+			ewarn "Force CGO_ENABLED=1 for $ARCH, see bug #924632"
+			sed -r -i \
+				-e 's/(CGO_ENABLED=)0/\11/g' \
+				Makefile \
+				|| ewarn "Can not force CGO_ENABLED=1"
+		;;
+	esac
+	eapply_user
+}
 
 src_compile() {
 	emake \