diff --git a/pcre-8.40-Fix-a-missing-else-in-the-JIT-compiler-reported-by-i.patch b/pcre-8.40-Fix-a-missing-else-in-the-JIT-compiler-reported-by-i.patch
new file mode 100644
index 0000000..af9c59f
--- /dev/null
+++ b/pcre-8.40-Fix-a-missing-else-in-the-JIT-compiler-reported-by-i.patch
@@ -0,0 +1,64 @@
+From ad21e1941bfe5d5c8d8474028139343f884bf28c Mon Sep 17 00:00:00 2001
+From: zherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Tue, 14 Feb 2017 08:48:18 +0000
+Subject: [PATCH] Fix a missing else in the JIT compiler reported by
+ 'idaifish'.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Petr Pisar: Ported to 8.40:
+
+commit 7ddfbe9d0b9f43402f8043e940172a318cc407c6
+Author: zherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date:   Tue Feb 14 08:48:18 2017 +0000
+
+    Fix a missing else in the JIT compiler reported by 'idaifish'.
+
+    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1680 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ pcre_jit_compile.c    | 2 +-
+ testdata/testinput12  | 2 ++
+ testdata/testoutput12 | 2 ++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c
+index 46ce6c6..a6e2ad5 100644
+--- a/pcre_jit_compile.c
++++ b/pcre_jit_compile.c
+@@ -8111,7 +8111,7 @@ if (opcode == OP_COND || opcode == OP_SCOND)
+ 
+     if (*matchingpath == OP_FAIL)
+       stacksize = 0;
+-    if (*matchingpath == OP_RREF)
++    else if (*matchingpath == OP_RREF)
+       {
+       stacksize = GET2(matchingpath, 1);
+       if (common->currententry == NULL)
+diff --git a/testdata/testinput12 b/testdata/testinput12
+index 944be69..89ed456 100644
+--- a/testdata/testinput12
++++ b/testdata/testinput12
+@@ -104,4 +104,6 @@ and a couple of things that are different with JIT. --/
+ /(.|.)*?bx/
+     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax
+ 
++/((?(?!))x)(?'name')(?1)/S++
++
+ /-- End of testinput12 --/
+diff --git a/testdata/testoutput12 b/testdata/testoutput12
+index 8791108..7632c4e 100644
+--- a/testdata/testoutput12
++++ b/testdata/testoutput12
+@@ -201,4 +201,6 @@ No match, mark = m (JIT)
+     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax
+ Error -8 (match limit exceeded)
+ 
++/((?(?!))x)(?'name')(?1)/S++
++
+ /-- End of testinput12 --/
+-- 
+2.7.4
+
diff --git a/pcre.spec b/pcre.spec
index 4eaa202..77f5dbb 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -37,6 +37,9 @@ Patch1:     pcre-8.32-refused_spelling_terminated.patch
 # Fix pcre2grep multi-line matching --only-matching option, upstream bug #1848,
 # in upstream after 8.40
 Patch2:     pcre-8.40-Correct-fix-for-pcre2grep-multiline-with-only-matchi.patch
+# Fix a crash in JIT compilation, upstream bug #2035,
+# in upstream after 8.40
+Patch3:     pcre-8.40-Fix-a-missing-else-in-the-JIT-compiler-reported-by-i.patch
 BuildRequires:  readline-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -127,6 +130,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # Because of rpath patch
 libtoolize --copy --force
 autoreconf -vif
@@ -225,6 +229,7 @@ make %{?_smp_mflags} check VERBOSE=yes
 %changelog
 * Tue Feb 14 2017 Petr Pisar <ppisar@redhat.com> - 8.40-2
 - Fix pcre2grep multi-line matching --only-matching option (upstream bug #1848)
+- Fix a crash in JIT compilation (upstream bug #2035)
 
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.40-1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild