diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 8dd50a6..57975b2 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -140,6 +140,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Tue Nov 29 2016 Panu Matilainen <pmatilai@redhat.com> - 58-1
+- Drop atom optimization on i686 (#1393492)
+
 * Tue Nov 15 2016 Dan Horák <dan[at]danny.cz> - 57-1
 - set z10 as minimum architecture level for s390(x)
 
diff --git a/rpmrc b/rpmrc
index dc7ec3e..f6b2f0a 100644
--- a/rpmrc
+++ b/rpmrc
@@ -3,7 +3,7 @@ include: /usr/lib/rpm/rpmrc
 optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
 optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables
 optflags: i586 %{__global_cflags} -m32 -march=i586 -mtune=generic -fasynchronous-unwind-tables
-optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables
+optflags: i686 %{__global_cflags} -m32 -march=i686 -fasynchronous-unwind-tables
 optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables
 optflags: ia64 %{__global_cflags}
 optflags: x86_64 %{__global_cflags} -m64 -mtune=generic