diff --git a/.gitignore b/.gitignore
index 3172bd9..2e7539f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,4 @@
 /annobin-9.18.tar.xz
 /annobin-9.19.tar.xz
 /annobin-9.20.tar.xz
+/annobin-9.21.tar.xz
diff --git a/annobin.spec b/annobin.spec
index 771c36e..b92874e 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 9.20
+Version: 9.21
 Release: 1%{?dist}
 License: GPLv3+
 # ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark
@@ -274,6 +274,9 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Wed Apr 22 2020 Nick Clifton <nickc@redhat.com> - 9.21-1
+- Annobin: Fall back on using the flags if the option cannot be found in cl_options.  (#1817659)
+
 * Thu Apr 16 2020 Nick Clifton <nickc@redhat.com> - 9.20-1
 - Annocheck: Detect Fortran compiled programs.  (#1824393)
 
diff --git a/sources b/sources
index 4ba60fc..fed9b7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-9.20.tar.xz) = 6cf4593da7eae3320c18d99df4580ad9bc25f1e275b8534510432246442c2e21cd11b75af4a682167e7f2068008a6a51012b8d472740c70d1c5ccd47a1dc7b3c
+SHA512 (annobin-9.21.tar.xz) = baf1c9f90b6bcfdc5db865a5f897edcac4abe6449cf520cdec856bbca9741a937798196603b486259d0981216b2e8363ee003a9c5d1cfffe5a2a65284ab53e34