diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index 9adeb89..6bc82f7 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -1,7 +1,7 @@
 Summary:        A straightforward implementation of DBM
 Name:           kyotocabinet
 Version:        1.2.76
-Release:        20%{?dist}
+Release:        21%{?dist}
 License:        GPLv3
 URL:            http://fallabs.com/%{name}/
 Source:         http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
@@ -55,12 +55,6 @@ applications that use Kyoto Cabinet.
 %patch2 -p1 -b .gcc6
 
 %build
-%ifarch s390x
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-O2 /-O1 /g')
-%endif
-export CFLAGS=$RPM_OPT_FLAGS
-
-
 %configure --disable-opt --enable-lzo --enable-lzma
 make %{?_smp_mflags}
 
@@ -148,6 +142,9 @@ make check
 %doc COPYING doc/api/* kyotocabinet.idl
 
 %changelog
+* Fri Mar  1 2019 Peng Wu <pwu@redhat.com> - 1.2.76-21
+- Switch back to use -O2 for s390x
+
 * Wed Feb 27 2019 Parag Nemade <pnemade AT redhat DOT com> - 1.2.76-20
 - Fix s390x compilation issue by changing -O2 to -O1 (rh#1675243)