diff --git a/.conmon.metadata b/.conmon.metadata
index 3b0d3c9..e39aada 100644
--- a/.conmon.metadata
+++ b/.conmon.metadata
@@ -1 +1 @@
-c53204d9ac7ad32c3cec9327655475bc42d4f8e0 SOURCES/v2.0.21.tar.gz
+fdede06f54899d2695c011ccc66fdeb6a12c49bd SOURCES/v2.0.22.tar.gz
diff --git a/.gitignore b/.gitignore
index 9bcbd26..20621e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v2.0.21.tar.gz
+SOURCES/v2.0.22.tar.gz
diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec
index 93854db..caadc51 100644
--- a/SPECS/conmon.spec
+++ b/SPECS/conmon.spec
@@ -9,16 +9,23 @@
 
 Name: conmon
 Epoch: 2
-Version: 2.0.21
+Version: 2.0.22
 Release: 3%{?dist}
 Summary: OCI container runtime monitor
 License: ASL 2.0
 URL: %{git0}
 Source0: %{git0}/archive/v%{version}.tar.gz
+# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
+#ExclusiveArch: %%{go_arches}
+# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
+ExcludeArch: %{ix86}
 BuildRequires: gcc
 BuildRequires: git
 BuildRequires: glib2-devel
 BuildRequires: systemd-devel
+BuildRequires: golang >= 1.12.12-4
+BuildRequires: go-md2man
 
 %description
 %{summary}.
@@ -41,8 +48,22 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
+%{_mandir}/man8/*
 
 %changelog
+* Mon Jan 04 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-3
+- exclude i686 as golang is not suppoerted there
+- Related: #1888571
+
+* Sat Dec 26 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-2
+- add BR: golang, go-md2man
+- add man pages
+- Related: #1888571
+
+* Mon Dec 21 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.22
+- Related: #1888571
+
 * Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.21-3
 - simplify spec
 - Related: #1888571