diff --git a/grpc.changes b/grpc.changes
index e3e12d9..26b8005 100644
--- a/grpc.changes
+++ b/grpc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jun 23 09:33:15 UTC 2018 - jengelh@inai.de
+
+- Throw out silly -Werror in release builds.
+
 -------------------------------------------------------------------
 Fri May 25 05:34:36 UTC 2018 - tbechtold@suse.com
 
diff --git a/grpc.spec b/grpc.spec
index f2b5e1b..3ad5955 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -26,11 +26,8 @@ License:        Apache-2.0
 Group:          Development/Tools/Building
 Url:            http://grpc.io/
 Source:         https://github.com/grpc/grpc/archive/v%version.tar.gz
-# # PATCH-FEATURE-UPSTREAM 0001-Allow-building-the-python-module-with-system-openssl.patch -- https://github.com/grpc/grpc/pull/15548
 Patch0:         0001-Allow-building-the-python-module-with-system-openssl.patch
-# # PATCH-FEATURE-UPSTREAM 0002-Allow-building-the-python-module-with-system-zlib.patch -- https://github.com/grpc/grpc/pull/15548
 Patch1:         0002-Allow-building-the-python-module-with-system-zlib.patch
-# # PATCH-FEATURE-UPSTREAM 0003-Allow-building-the-python-module-with-system-cares.patch -- https://github.com/grpc/grpc/pull/15548
 Patch2:         0003-Allow-building-the-python-module-with-system-cares.patch
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module devel}
@@ -93,7 +90,8 @@ This subpackage contains the python3 bindings.
 %patch2 -p1
 
 %build
-make %{?_smp_mflags} STRIP=/bin/true V=1 VERBOSE=1 CFLAGS="%optflags" CXXFLAGS="%optflags"
+make %{?_smp_mflags} STRIP=/bin/true V=1 VERBOSE=1 \
+	CFLAGS="%optflags -Wno-error" CXXFLAGS="%optflags -Wno-error"
 
 # build python module
 export GRPC_PYTHON_BUILD_WITH_CYTHON=True