diff --git a/debian/changelog b/debian/changelog
index fe2dcee572e2d84f8183740056d0daff1fa39e9a..f8db53d372abfd9533aa24323e83f76e637e0738 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+poppler (22.08.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * JBIG2Stream: Fix crash on broken file (CVE-2022-38784) (Closes: #1018971)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 03 Sep 2022 21:30:51 +0200
+
 poppler (22.08.0-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/JBIG2Stream-Fix-crash-on-broken-file.patch b/debian/patches/JBIG2Stream-Fix-crash-on-broken-file.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0441f95ccff311fd90352269c7c1125fc4b6bac1
--- /dev/null
+++ b/debian/patches/JBIG2Stream-Fix-crash-on-broken-file.patch
@@ -0,0 +1,34 @@
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 25 Aug 2022 00:14:22 +0200
+Subject: JBIG2Stream: Fix crash on broken file
+Origin: https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52
+Bug-Debian: https://bugs.debian.org/1018971
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2022-38784
+
+https://github.com/jeffssh/CVE-2021-30860
+
+Thanks to David Warren for the heads up
+---
+ poppler/JBIG2Stream.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
+index 662276e547eb..9f70431de49e 100644
+--- a/poppler/JBIG2Stream.cc
++++ b/poppler/JBIG2Stream.cc
+@@ -1976,7 +1976,11 @@ void JBIG2Stream::readTextRegionSeg(unsigned int segNum, bool imm, bool lossless
+     for (i = 0; i < nRefSegs; ++i) {
+         if ((seg = findSegment(refSegs[i]))) {
+             if (seg->getType() == jbig2SegSymbolDict) {
+-                numSyms += ((JBIG2SymbolDict *)seg)->getSize();
++                const unsigned int segSize = ((JBIG2SymbolDict *)seg)->getSize();
++                if (unlikely(checkedAdd(numSyms, segSize, &numSyms))) {
++                    error(errSyntaxError, getPos(), "Too many symbols in JBIG2 text region");
++                    return;
++                }
+             } else if (seg->getType() == jbig2SegCodeTable) {
+                 codeTables.push_back(seg);
+             }
+-- 
+2.37.2
+
diff --git a/debian/patches/series b/debian/patches/series
index d0b4a0fc2a89b93013712f4ffba94762e641fd18..b1a4baaaf643537c46e421f97a10aa0e85cc6476 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 segfault-on-unset-catalog.patch
+JBIG2Stream-Fix-crash-on-broken-file.patch