diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 5658f0d..287d2c0 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -1862,11 +1862,24 @@ sh %{SOURCE12} %{top_level_dir_name}
 %endif
 
 # Patch the JDK
+# This syntax is deprecated:
+#    %patchN [...]
+# and should be replaced with:
+#    %patch -PN [...]
+# For example:
+#    %patch1001 -p1
+# becomes:
+#    %patch -P1001 -p1
+# The replacement format suggested by recent (circa Fedora 38) RPM
+# deprecation messages:
+#    %patch N [...]
+# is not backward-compatible with prior (circa RHEL-8) versions of
+# rpmbuild.
 pushd %{top_level_dir_name}
 # Add crypto policy and FIPS support
-%patch1001 -p1
+%patch -P1001 -p1
 # Patches in need of upstreaming
-%patch6 -p1
+%patch -P6 -p1
 popd # openjdk
 
 
@@ -2512,6 +2525,7 @@ cjc.mainProgram(args)
 - generate_source_tarball.sh: shellcheck: Double-quote variable references (SC2086)
 - generate_source_tarball.sh: shellcheck: Do not use -a (SC2166)
 - generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
+- Use backward-compatible patch syntax
 - Related: RHEL-30946
 
 * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea