diff --git a/annobin.spec b/annobin.spec
index 60ef18e..4bdf605 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,8 +1,8 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 9.35
-Release: 4%{?dist}
+Version: 9.36
+Release: 1%{?dist}
 License: GPLv3+
 # ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark
 # Maintainer: nickc@redhat.com
@@ -31,11 +31,9 @@ License: GPLv3+
 # Set this to zero to disable the requirement for a specific version of gcc.
 # This should only be needed if there is some kind of problem with the version
 # checking logic or when building on RHEL-7 or earlier.
-# %%global with_hard_gcc_version_requirement 1
-%global with_hard_gcc_version_requirement 0
+%global with_hard_gcc_version_requirement 1
 
-# %%bcond_without annobin_plugin
-%bcond_with annobin_plugin
+%bcond_without annobin_plugin
 # Allow the building of annobin without using annobin itself.
 # This is because if we are bootstrapping a new build environment we can have
 # a new version of gcc installed, but without a new of annobin installed.
@@ -314,6 +312,10 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Wed Oct 21 2020 Nick Clifton <nickc@redhat.com> - 9.36-1
+- Record the -flto setting and produce a soft warning if it is absent.
+- Suppress warnings about _D_GLIBCXX_ASSERTIONS if the source code is known to be something other than C++.
+
 * Wed Oct 21 2020 Nick Clifton <nickc@redhat.com> - 9.35-3
 - NVR bump to allow building on ELN sidetag.
 
diff --git a/sources b/sources
index bba2b24..d333c22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-9.35.tar.xz) = c7a8ae040bceea23725561fe27441c242692e7ca21bbae5f1c330acf2567963bc0b9ba92046f485d0627adeb1a9bd846b5f77cdfffe4bb158d39daf3d826e993
+SHA512 (annobin-9.36.tar.xz) = 40ce8399aa1188f76766d36557857b4624a0af3c551f8a75bfdb11f736301378e8d526d4d1c71ae458c46873cbecd0014343b98bbfefbe09d88b7dfdde37cce4