diff --git a/.gitignore b/.gitignore
index c56b236..9afb906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,4 @@
 /annobin-9.10.tar.xz
 /annobin-9.11.tar.xz
 /annobin-9.12.tar.xz
+/annobin-9.13.tar.xz
diff --git a/annobin.spec b/annobin.spec
index e733451..e748016 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,8 +1,8 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 9.12
-Release: 3%{?dist}
+Version: 9.13
+Release: 1%{?dist}
 License: GPLv3+
 # ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark
 # Maintainer: nickc@redhat.com
@@ -182,7 +182,7 @@ echo "Requires: (gcc >= %{gcc_major} with gcc < %{gcc_next})"
 # The plugin has to be configured with the same arcane configure
 # scripts used by gcc.  Hence we must not allow the Fedora build
 # system to regenerate any of the configure files.
-touch aclocal.m4 plugin/config.h.in
+touch aclocal.m4 gcc-plugin/config.h.in
 touch configure */configure Makefile.in */Makefile.in
 # Similarly we do not want to rebuild the documentation.
 touch doc/annobin.info
@@ -204,12 +204,12 @@ touch doc/annobin.info
 # double annotations in it.  (If the build system enables annotations
 # for plugins by default).  I have not tested this yet, but I think
 # that it should be OK.
-cp plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so
-make -C plugin clean
+cp gcc-plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so
+make -C gcc-plugin clean
 BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so -fplugin-arg-tmp_annobin-rename"
 # If building on RHEL7, enable the next option as the .attach_to_group assembler pseudo op is not available in the assembler.
 # BUILD_FLAGS="$BUILD_FLAGS -fplugin-arg-tmp_annobin-no-attach"
-make -C plugin CXXFLAGS="%{optflags} $BUILD_FLAGS"
+make -C gcc-plugin CXXFLAGS="%{optflags} $BUILD_FLAGS"
 rm %{_tmppath}/tmp_annobin.so
 
 %if %{with clangplugin}
@@ -276,6 +276,10 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Thu Mar 12 2020 Nick Clifton <nickc@redhat.com> - 9.13-1
+- Rename gcc plugin directory to gcc-plugin.
+- Stop annocheck from complaining about missing options when the binary has been built in a mixed environment.
+
 * Thu Mar 12 2020 Nick Clifton <nickc@redhat.com> - 9.12-3
 - And again, this time with annotation enabled.  (#1810941)
 
diff --git a/sources b/sources
index b55d8e1..db83a78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-9.12.tar.xz) = cfe9d67ebf53816932310f1f686b4d94554506488c217870c5c440d2d1f8cb3a757f96c07e373540f2358c4e1adcf432b746c6936c237f7b44769993210bc8aa
+SHA512 (annobin-9.13.tar.xz) = e5f989f0b7e9a457a25c2fae68c5ec465fe089cc4983d0249d3c87a0ff3adf1a00f66bfd330235810387be2fb7484bb69d0c01c45d5cf9673490e829d4c8e737