diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec
index de5664f..450b985 100644
--- a/SPECS/pki-core.spec
+++ b/SPECS/pki-core.spec
@@ -13,7 +13,7 @@ License:          GPLv2 and LGPLv2
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
 Version:          10.12.0
-Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
+Release:          3%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
 
@@ -36,9 +36,8 @@ Patch: 0001-Fix-pki-healthcheck-for-clones.patch
 
 # md2man isn't available on i686. Additionally, we aren't generally multi-lib
 # compatible (https://fedoraproject.org/wiki/Packaging:Java)
-# so dropping i686 everywhere but RHEL-8 (which we've already shipped) seems
-# safest.
-%if ! 0%{?rhel} || 0%{?rhel} > 8
+# md2man has now also been dropped in RHEL 8 so exlcude from RHEL 8+
+%if ! 0%{?rhel} || 0%{?rhel} >= 8
 ExcludeArch: i686
 %endif
 
@@ -1383,6 +1382,9 @@ fi
 
 ################################################################################
 %changelog
+* Wed Jun 01 2022 Red Hat PKI Team <rhcs-maint@redhat.com> 10.12.0-3
+- ExcludeArch i686 as md2man not available in RHEL 8.7
+
 * Thu Feb 03 2022 Red Hat PKI Team <rhcs-maint@redhat.com> 10.12.0-2
 - Bug 2027470 - pki-healthcheck ClonesConnectivyAndDataCheck fails