diff --git a/varnish-disable-pcrejit.diff b/varnish-disable-pcrejit.diff
new file mode 100644
index 0000000..2d60e24
--- /dev/null
+++ b/varnish-disable-pcrejit.diff
@@ -0,0 +1,27 @@
+From: Piotr Jankowski <piotr.jankowski@nsn.com>
+Date: 2013-09-10 10:55:57 CEST
+References: http://bugzilla.novell.com/show_bug.cgi?id=839358
+References: https://www.varnish-cache.org/trac/ticket/1191
+
+"The JIT compiler is broken on some versions of PCRE, at least on
+i386, so disable it by default."
+
+---
+ lib/libvarnish/vre.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+Index: varnish-3.0.3/lib/libvarnish/vre.c
+===================================================================
+--- varnish-3.0.3.orig/lib/libvarnish/vre.c
++++ varnish-3.0.3/lib/libvarnish/vre.c
+@@ -40,9 +40,8 @@ struct vre {
+ 	pcre_extra		*re_extra;
+ };
+ 
+-#ifndef PCRE_STUDY_JIT_COMPILE
++#undef PCRE_STUDY_JIT_COMPILE
+ #define PCRE_STUDY_JIT_COMPILE 0
+-#endif
+ 
+ /*
+  * We don't want to spread or even expose the majority of PCRE options
diff --git a/varnish.changes b/varnish.changes
index 9221c50..7169b95 100644
--- a/varnish.changes
+++ b/varnish.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct  4 21:48:01 UTC 2013 - jengelh@inai.de
+
+- Deactivate libpcre JIT (bnc#839358), add varnish-disable-pcrejit.diff
+
 -------------------------------------------------------------------
 Sun Sep 23 21:30:35 UTC 2012 - nmo.marques@gmail.com
 
diff --git a/varnish.spec b/varnish.spec
index 1d0ed89..f37b26f 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -33,6 +33,7 @@ Source5:	varnish.logrotate
 Source6:    varnishlog.init
 Source7:	varnish.service
 Source8:	varnishlog.service
+Patch1:		varnish-disable-pcrejit.diff
 
 BuildRoot:      %_tmppath/%name-%version-build
 BuildRequires:  libxslt, ncurses-devel, pcre-devel
@@ -95,11 +96,11 @@ This package holds the development files for varnish.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
-%if 0%{?suse_version} > 1000
-export CFLAGS="%optflags -fstack-protector"
-%endif
+# bnc#839358: Force-deactivate JIT
+export CFLAGS="%optflags -fstack-protector -DPCRE_STUDY_JIT_COMPILE=0"
 %configure --disable-static \
            --localstatedir=%_localstatedir/cache/ \
            --enable-developer-warnings