diff --git a/cffi-1.5.2-wnoerror.patch b/cffi-1.5.2-wnoerror.patch
new file mode 100644
index 0000000..07fb355
--- /dev/null
+++ b/cffi-1.5.2-wnoerror.patch
@@ -0,0 +1,13 @@
+Index: cffi-1.5.2/testing/cffi1/test_verify1.py
+===================================================================
+--- cffi-1.5.2.orig/testing/cffi1/test_verify1.py
++++ cffi-1.5.2/testing/cffi1/test_verify1.py
+@@ -20,7 +20,7 @@ else:
+         extra_compile_args.append('-Qunused-arguments')
+     else:
+         # assume a standard gcc
+-        extra_compile_args = ['-Werror', '-Wall', '-Wextra', '-Wconversion']
++        extra_compile_args = ['-Werror', '-Wno-shift-negative-value', '-Wall', '-Wextra', '-Wconversion']
+ 
+ class FFI(FFI):
+     error = _cffi_backend.FFI.error
diff --git a/python-cffi.changes b/python-cffi.changes
index 15eae29..106ea00 100644
--- a/python-cffi.changes
+++ b/python-cffi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 27 13:00:22 UTC 2016 - jmatejek@suse.com
+
+- disable "negative left shift" warning in test suite to prevent
+  failures with gcc6, until upstream fixes the undefined code
+  in question (boo#981848, cffi-1.5.2-wnoerror.patch)
+
 -------------------------------------------------------------------
 Thu May 26 02:33:02 UTC 2016 - badshah400@gmail.com
 
diff --git a/python-cffi.spec b/python-cffi.spec
index 50f11ec..f04f3c7 100644
--- a/python-cffi.spec
+++ b/python-cffi.spec
@@ -25,6 +25,7 @@ Group:          Development/Languages/Python
 Url:            http://cffi.readthedocs.org
 Source0:        https://pypi.io/packages/source/c/cffi/cffi-%{version}.tar.gz
 Source1:        python-cffi-rpmlintrc
+Patch0:         cffi-1.5.2-wnoerror.patch
 BuildRequires:  gcc-c++
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
@@ -47,6 +48,7 @@ is to provide a convenient and reliable way of calling C code from Python.
 
 %prep
 %setup -q -n cffi-%{version}
+%patch0 -p1
 
 %build
 CFLAGS="%{optflags}" python setup.py build