diff --git a/.python-jwcrypto.metadata b/.python-jwcrypto.metadata
new file mode 100644
index 0000000..fc3aa8e
--- /dev/null
+++ b/.python-jwcrypto.metadata
@@ -0,0 +1 @@
+8eccc6fbeeee2fedc602998a7c7a97b8bd550e59 jwcrypto-0.5.0.tar.gz
diff --git a/0002-Limit-number-of-iterations-for-PBES_rhel#23038.patch b/0002-Limit-number-of-iterations-for-PBES_rhel#23038.patch
new file mode 100644
index 0000000..244f3e7
--- /dev/null
+++ b/0002-Limit-number-of-iterations-for-PBES_rhel#23038.patch
@@ -0,0 +1,44 @@
+From d2655d370586cb830e49acfb450f87598da60be8 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Thu, 7 Dec 2023 12:49:07 -0500
+Subject: [PATCH] Fix potential DoS issue with p2c header
+
+Unbounded p2c headers may be used to cause an application that accept
+PBES algorithms to spend alot of resources running PBKDF2 with a very
+high number of iterations.
+
+Clamp the default maximum to 16384 (double the default of 8192).
+An application that wants to use more iterations will have to chenge the
+jwa default max.
+
+Fixes CVE-2023-6681
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ jwcrypto/jwa.py   |  5 +++++
+ jwcrypto/tests.py | 12 ++++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/jwcrypto/jwa.py b/jwcrypto/jwa.py
+index de7a79f..ca4568e 100644
+--- a/jwcrypto/jwa.py
++++ b/jwcrypto/jwa.py
+@@ -29,6 +29,8 @@
+ 
+ # Implements RFC 7518 - JSON Web Algorithms (JWA)
+ 
++default_max_pbkdf2_iterations = 16384
++
+
+ @six.add_metaclass(abc.ABCMeta)
+ class JWAAlgorithm(object):
+@@ -588,6 +590,9 @@ def __init__(self):
+         self.aeskwmap = {128: _A128KW, 192: _A192KW, 256: _A256KW}
+ 
+     def _get_key(self, alg, key, p2s, p2c):
++        if p2c > default_max_pbkdf2_iterations:
++            raise ValueError('Invalid p2c value, too large')
++
+         if isinstance(key, bytes):
+             plain = key
+         else:
diff --git a/python-jwcrypto.spec b/python-jwcrypto.spec
index 0e5a19d..4c4e9cd 100644
--- a/python-jwcrypto.spec
+++ b/python-jwcrypto.spec
@@ -24,6 +24,7 @@ URL:            https://github.com/latchset/%{srcname}
 Source0:        https://github.com/latchset/%{srcname}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz
 
 Patch1:         0001-Address-potential-DoS-with-high-compression-ratio_rhel#28697.patch
+Patch2:         0002-Limit-number-of-iterations-for-PBES_rhel#23038.patch
 
 BuildArch:      noarch
 %if %{with python2}
@@ -117,9 +118,11 @@ rm -rf %{buildroot}/usr/share/doc/jwcrypto
 
 
 %changelog
-* Wed Apr 03 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.5.0-2
+* Mon Apr 15 2024 Rafael Jeffman <rjeffman@redhat.com> - 0.5.0-2
 - Address potential DoS with high compression ratio
   Resolves: RHEL-28697
+- Limit number of iterations for PBES
+  Resolves: RHEL-23036 RHEL-23037
 
 * Fri Jun 17 2022 Christian Heimes <cheimes@redhat.com> - 0.5.0-1.1
 - Bump dist to solve version sorting issue, fixes RHBZ#2097800