diff --git a/.annobin.metadata b/.annobin.metadata
index 0901f25..3d8e1cc 100644
--- a/.annobin.metadata
+++ b/.annobin.metadata
@@ -1 +1 @@
-36f7f3875f1f588cbc366193527dd6f6d57f5b40 SOURCES/annobin-9.19.tar.xz
+0cb8f1f99f4be6430d96441712eb59e739a9d817 SOURCES/annobin-9.21.tar.xz
diff --git a/.gitignore b/.gitignore
index 27b7242..f84422a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/annobin-9.19.tar.xz
+SOURCES/annobin-9.21.tar.xz
diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec
index 564eaf9..7172420 100644
--- a/SPECS/annobin.spec
+++ b/SPECS/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 9.19
+Version: 9.21
 Release: 1%{?dist}
 License: GPLv3+
 # ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark
@@ -275,6 +275,10 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Thu Apr 23 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)
+- Annocheck: Detect Fortran compiled programs.  (#1824393)
+
 * Mon Apr 06 2020 Nick Clifton <nickc@redhat.com> - 9.19-1
 - Annobin: If option name mismatch occurs, seach for the real option.  (#1817452)
 - Annocheck: Fix a division by zero error when parsing GO binaries.  (#1818863)
@@ -292,7 +296,7 @@ fi
 - Add ability to build clang plugin (disabled by default).
 - Annocheck: Fix error printing out the version number.
 - Annobin: Add checks of the exact location of the examined switches.
-- Annobin: Note when stack clash notes are generated.
+- Annobin: Note when stack clash notes are generated.  (#1803173)
 - Annocheck: Handle multiple builder IDs in the .comment section.
 - Add configure option to suppress building annocheck.
 - Fix debuginfod test.
@@ -320,7 +324,7 @@ fi
 - Record and report the setting of the AArcht64 specific -mbranch-protection option.
 - Improve detection of GO binaries.
 - Add gcc version information to annobin notes.
-- Do not complain about missing FORTIFY_SOURCE and GLIBCXX_ASSERTIONS in LTO compilations.
+- Do not complain about missing FORTIFY_SOURCE and GLIBCXX_ASSERTIONS in LTO compilations.  (#1743635)
 
 * Tue Aug 06 2019 Nick Clifton <nickc@redhat.com> - 8.78-1
 - Fix a memory allocation error in the annobin plugin.  (#1737306)