diff --git a/annobin.spec b/annobin.spec
index 27032f7..c1b68e2 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 10.37
+Version: 10.39
 Release: 1%{?dist}
 License: GPLv3+
 # Maintainer: nickc@redhat.com
@@ -312,10 +312,11 @@ mv %{buildroot}/%{llvm_plugin_dir}/annobin-for-clang.so %{buildroot}/%{clang_plu
 # Record the version of gcc that built this plugin.
 mkdir -p                      %{buildroot}%{rrcdir}
 rm -f                         %{buildroot}%{aver}
-# Note - the comparison logic in redhat-rpm-config's %%triggger macros require
-# that the plugin builder information appear as the first three numbers in the file.
-echo %{gcc_vr}              > %{buildroot}%{aver}
+# Note - we cannot just store %%{gcc_vr} as sometimes the gcc rpm version changes
+# without the NVR being altered.  See BZ #2030671 for more discussion on this.
+echo `rpm --query gcc --queryformat '%{version}-%{release}'` > %{buildroot}%{aver}
 # Provide a more complete version information string on the second line.
+# This is not used by the comparison logic, but makes the file more useful to humans.
 echo "%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0 was built by gcc version %{gcc_vr} from the %{version} sources" >> %{buildroot}%{aver}
 
 # Also install a copy of the sources into the build tree.
@@ -376,6 +377,12 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Mon Dec 20 2021 Nick Clifton  <nickc@redhat.com> - 10.39-1
+- Annocheck: Add /usr/lib/ld-linux-aarch64.so.1 to the list of known glibc binaries.  (#2033255)
+- Doc: Note that ENDBR is only needed as the landing pad for indirect branches/calls.  (#28705)
+- Spec File: Store full	gcc version release string in plugin info file.  (#2030671)
+- Annocheck: Add special case for x86_64 RHEL-7 gaps.  (#2031133)
+
 * Tue Dec 14 2021 Nick Clifton  <nickc@redhat.com> - 10.37-1
 - Annocheck: Do not complaining about missing -mstackrealign notes in LTO mode.  (#2030298)
 - GCC Plugin: Do not record missing -mstackrealign in LTO mode.
diff --git a/sources b/sources
index ac93035..7157b77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-10.37.tar.xz) = fc6f45a4f728e5cc8fa644d8bba3b876bb24eec3c3b2e10240e8b9c3eb9f0472b80066ffc7bc174421958d9e45dc3189d0b7303c27f067874277a18b2003a072
+SHA512 (annobin-10.39.tar.xz) = 3905a9d7d57d9d588e158a9f43ba30c0774162b5078f2cfd88e907d2cd1dac0c8c0626d96bbf35ed8507dd4f733cfe324d21eb11125ec227141747fed3729af8