diff --git a/mesa.spec b/mesa.spec
index 1356b18..911c08d 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -43,7 +43,7 @@ Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 18.2.4
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -349,9 +349,6 @@ autoreconf -vfi
 %global asm_flags --disable-asm
 %endif
 
-#workaround store merging bug in gcc 8.2.1-4 (#1645400)
-export CFLAGS="%{optflags} -fno-store-merging"
-export CXXFLAGS="%{optflags} -fno-store-merging"
 %configure \
     %{?asm_flags} \
     --enable-libglvnd \
@@ -621,6 +618,9 @@ popd
 %{_includedir}/vulkan/
 
 %changelog
+* Tue Nov 06 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.4-3
+- Remove workaround
+
 * Tue Nov 06 2018 Dave Airlie <airlied@redhat.com> - 18.2.4-2
 - workaround bug with gcc 8.2.1-4