diff --git a/.gitignore b/.gitignore
index 49ab20c..1fd8333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@
 /annobin-8.19.tar.xz
 /annobin-8.20.tar.xz
 /annobin-8.21.tar.xz
+/annobin-8.22.tar.xz
diff --git a/annobin.spec b/annobin.spec
index fa8138b..0427d5e 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -11,7 +11,7 @@
 
 Name:    annobin
 Summary: Binary annotation plugin for GCC
-Version: 8.21
+Version: 8.22
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -200,6 +200,9 @@ make check
 #---------------------------------------------------------------------------------
 
 %changelog
+* Wed Aug 08 2018 Nick Clifton <nickc@redhat.com> - 8.22-1
+- Reduce version check to gcc major version number only.  Skip compiler option checks if binary not built with gcc.  (#1603089)
+
 * Tue Aug 07 2018 Nick Clifton <nickc@redhat.com> - 8.21-1
 - Fix bug in annobin plugin.  Add --section-size=NAME option to annocheck.
 
diff --git a/sources b/sources
index 3eb2a9e..b8d7db5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-8.21.tar.xz) = f9818d9e29295ffd3ff757b38df58d7ac60207f525dc434d4302d9b54d65483c214133639dc4a979f1dedefe414ceb8de43b70b64a7ac1b2445f2b722fb2f256
+SHA512 (annobin-8.22.tar.xz) = 290e75b7e4e18f16f1c19aa8d14efa671527c212d6fda1ce26b02c11fb6b146771e15bbe4b945e059685db33732de7a3c68e2e7cbe1cc60b4f575691215d206a