diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile
index 1c11ea8..736e385 100644
--- a/java-21-openjdk-portable.specfile
+++ b/java-21-openjdk-portable.specfile
@@ -329,7 +329,7 @@
 # New Version-String scheme-style defines
 %global featurever 21
 %global interimver 0
-%global updatever 8
+%global updatever 9
 %global patchver 0
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
@@ -393,7 +393,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        9
+%global buildver        10
 %global rpmrelease      1
 #%%global tagsuffix     %%{nil}
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@@ -703,7 +703,7 @@ BuildRequires: devtoolset-%{dtsversion}-gcc
 BuildRequires: devtoolset-%{dtsversion}-gcc-c++
 %else
 %ifarch %{devkit_arches}
-BuildRequires: %{devkit_name} >= 1.0-9
+BuildRequires: %{devkit_name} >= 1.1
 %else
 # Earlier versions have a bug in tree vectorization on PPC
 BuildRequires: gcc >= 4.8.3-8
@@ -759,12 +759,12 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
-# Version in src/java.desktop/share/legal/freetype.md
+# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
 Provides: bundled(freetype) = 2.13.3
 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
 Provides: bundled(giflib) = 5.2.2
 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 10.4.0
+Provides: bundled(harfbuzz) = 11.2.0
 # Version in src/java.desktop/share/native/liblcms/lcms2.h
 Provides: bundled(lcms2) = 2.17.0
 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
@@ -1043,6 +1043,14 @@ done
   tar -C devkit --strip-components=1 -xzf ${devkittarball}
   DEVKIT_ROOT=$(pwd)/devkit
   source ${DEVKIT_ROOT}/devkit.info
+  # Install annobin plugin as gcc does
+  ANNOBIN_DIR=${DEVKIT_ROOT}/lib/gcc/%{_target_cpu}-%{_target_os}-gnu/*/plugin
+  echo "annobin directory = $(echo ${ANNOBIN_DIR})"
+  pushd ${ANNOBIN_DIR}
+  cp annobin.so.0.0.0 gcc-annobin.so.0.0.0
+  rm -f gcc-annobin.so.0 gcc-annobin.so
+  ln -s gcc-annobin.so.0.0.0 gcc-annobin.so.0
+  ln -s gcc-annobin.so.0.0.0 gcc-annobin.so
   echo "Installed ${DEVKIT_NAME} devkit"
 %else
 %if 0%{?centos} > 0
@@ -1085,9 +1093,6 @@ EXTRA_CFLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-mstackrealign|-mincoming-stack
 EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4|')"
 %endif
 %ifarch %{devkit_arches}
-# Remove annobin plugin reference which isn't available in the devkit
-EXTRA_CFLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1||')"
-EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1||')"
 # Force DWARF 4 for compatibility
 EXTRA_CFLAGS="${EXTRA_CFLAGS} -gdwarf-4"
 EXTRA_CPP_FLAGS="${EXTRA_CPP_FLAGS} -gdwarf-4"
@@ -1939,7 +1944,22 @@ done
 %endif
 
 %changelog
-* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1.1
+* Fri Oct 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.9.0.10-1
+- Update to jdk-21.0.9+10 (GA)
+- Update release notes to 21.0.9+10
+- Bump harfbuzz version to 11.2.0 following JDK-8355528
+- Add NEWS corrections from Thomas
+- Use double spacing consistently in notes for this release
+- Correct 11u release reference to corresponding 21u release as pointed out by Kieran
+- ** This tarball is embargoed until 2025-10-21 @ 1pm PT. **
+- Resolves: OPENJDK-4131
+
+* Fri Oct 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-2
+- Depend on a devkit with the annobin plugin and stop filtering it out of the build flags
+- Install annobin plugin as gcc-annobin in the same way as the gcc spec file
+- Resolves: OPENJDK-4142
+
+* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1
 - Update to jdk-21.0.8+9 (GA)
 - Update release notes to 21.0.8+9
 - Switch to GA mode
diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 4a3918f..4b45737 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -2574,6 +2574,7 @@ cjc.mainProgram(args)
 - Add NEWS corrections from Thomas
 - Use double spacing consistently in notes for this release
 - Correct 11u release reference to corresponding 21u release as pointed out by Kieran
+- Sync the copy of the portable specfile with the latest update
 - ** This tarball is embargoed until 2025-10-21 @ 1pm PT. **
 - Resolves: RHEL-118774
 - Resolves: RHEL-119466