diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index e38f9b507ff..658dbf42579 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -144,6 +144,9 @@ hook() {
 		genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg}
 	fi
 	# Generate 32bit pkg.
+	if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
+		return
+	fi
 	if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then
 		_pkgver=${pkgname}-32bit-${version}_${revision}
 		_desc="${short_desc} (32bit)"
diff --git a/common/hooks/post-pkg/00-register-pkg.sh b/common/hooks/post-pkg/00-register-pkg.sh
index db0d9476e55..68974c881c4 100644
--- a/common/hooks/post-pkg/00-register-pkg.sh
+++ b/common/hooks/post-pkg/00-register-pkg.sh
@@ -53,6 +53,9 @@ hook() {
 	fi
 
 	# Register 32bit binpkg if it exists.
+	if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
+		return
+	fi
 	if [ -f ${pkgdir}/${binpkg32} ]; then
 		registerpkg ${pkgdir} ${binpkg32} x86_64
 	fi