diff --git a/libsodium.changes b/libsodium.changes
index d46d072..1fa9b36 100644
--- a/libsodium.changes
+++ b/libsodium.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 26 14:44:21 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
+
+-  Revert previous change about cpuid as previous change rejected
+   in https://build.opensuse.org/request/show/724809
+-  Disable LTO as bypass boo#1148184
+
 -------------------------------------------------------------------
 Fri Aug 16 09:17:55 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
 
diff --git a/libsodium.spec b/libsodium.spec
index 2adbb62..ba244a6 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -16,6 +16,8 @@
 #
 
 
+%define _lto_cflags %{nil}
+
 %define sover   23
 %define lname   %{name}%{sover}
 Name:           libsodium
@@ -29,9 +31,7 @@ Source0:        https://download.libsodium.org/libsodium/releases/%{name}-%{vers
 Source1:        https://download.libsodium.org/libsodium/releases/%{name}-%{version}.tar.gz.sig
 Source2:        %{name}.keyring
 Source99:       baselibs.conf
-BuildRequires:  libtool
 BuildRequires:  pkgconfig
-Patch1:         libsodium_configure_cpuid_chg.patch
 
 %description
 NaCl (pronounced "salt") is a new easy-to-use high-speed software library
@@ -64,10 +64,10 @@ to compile and develop applications that use libsodium.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
-autoreconf -fvi
+# Do _NOT_ change CFLAGS
+# See https://github.com/jedisct1/libsodium/issues/604
 %configure \
   --disable-static \
   --disable-silent-rules
diff --git a/libsodium_configure_cpuid_chg.patch b/libsodium_configure_cpuid_chg.patch
deleted file mode 100644
index d1f3b80..0000000
--- a/libsodium_configure_cpuid_chg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Michel Normand <normand@linux.vnet.ibm.com>
-Subject: libsodium configure cpuid chg
-Date: Fri, 16 Aug 2019 10:58:52 +0200
-
-libsodium configure cpuid chg
-
-To avoid to have bad detection of cpuid  when lto is enabled.
-This should solve the old upstream issue#604
-https://github.com/jedisct1/libsodium/issues/604
-
-Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libsodium-1.0.18/configure.ac
-===================================================================
---- libsodium-1.0.18.orig/configure.ac
-+++ libsodium-1.0.18/configure.ac
-@@ -694,7 +694,7 @@ AC_SUBST(HAVE_TI_MODE_V)
- HAVE_CPUID_V=0
- AS_IF([test "$enable_asm" != "no"],[
-   AC_MSG_CHECKING(for cpuid instruction)
--  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[
- unsigned int cpu_info[4];
- __asm__ __volatile__ ("xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1" :
-                       "=a" (cpu_info[0]), "=&r" (cpu_info[1]),