diff --git a/disable-flatten-attr.patch b/disable-flatten-attr.patch
new file mode 100644
index 0000000..f076721
--- /dev/null
+++ b/disable-flatten-attr.patch
@@ -0,0 +1,13 @@
+diff --git a/prov/opx/include/rdma/opx/fi_opx_compiler.h b/prov/opx/include/rdma/opx/fi_opx_compiler.h
+index 80493bd..e216faa 100644
+--- a/prov/opx/include/rdma/opx/fi_opx_compiler.h
++++ b/prov/opx/include/rdma/opx/fi_opx_compiler.h
+@@ -41,7 +41,7 @@
+ #define L2_CACHE_LINE_SIZE	(64)
+ 
+ #ifdef NDEBUG // No Debug, Optimizing
+-#define __OPX_FORCE_INLINE_AND_FLATTEN__ static inline __attribute__ ((always_inline, flatten))
++#define __OPX_FORCE_INLINE_AND_FLATTEN__ static inline __attribute__ ((always_inline))
+ #define __OPX_FORCE_INLINE__ static inline __attribute__ ((always_inline))
+ #else // NDEBUG
+ #define __OPX_FORCE_INLINE_AND_FLATTEN__ static inline
diff --git a/fabtests.changes b/fabtests.changes
index c15a715..f8dbeee 100644
--- a/fabtests.changes
+++ b/fabtests.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 20:01:18 UTC 2022 - Martin Liška <mliska@suse.cz>
+
+- Add disable-flatten-attr.patch that drops flatten attribute.
+  Note the flatten attribute results in huge compile time hog
+  in inliner (same the binary size would be huge).
+- Use %make_build and enable LTO (boo#1133235).
+- Synchronize used Patches.
+
 -------------------------------------------------------------------
 Thu Jun 23 10:36:09 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 
diff --git a/fabtests.spec b/fabtests.spec
index 2ddc606..562058b 100644
--- a/fabtests.spec
+++ b/fabtests.spec
@@ -27,6 +27,9 @@ Group:          Development/Tools/Other
 URL:            http://www.github.com/ofiwg/libfabric
 Source:         libfabric-%{version}%{git_ver}.tar.bz2
 Source1:        fabtests-rpmlintrc
+Patch0:         libfabric-libtool.patch
+Patch1:         prov-opx-Correctly-disable-OPX-if-unsupported.patch
+Patch2:         disable-flatten-attr.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libfabric-devel = %{version}
@@ -38,12 +41,15 @@ Fabtests provides a set of examples that uses libfabric, a fabric software libra
 
 %prep
 %setup -q -n  libfabric-%{version}%{git_ver}
+%patch0 -p1
+%patch1
+%patch2 -p1
 
 %build
 cd fabtests
 ./autogen.sh
 %configure %{?_with_libfabric}
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install -C fabtests
diff --git a/libfabric.changes b/libfabric.changes
index c15a715..f8dbeee 100644
--- a/libfabric.changes
+++ b/libfabric.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 20:01:18 UTC 2022 - Martin Liška <mliska@suse.cz>
+
+- Add disable-flatten-attr.patch that drops flatten attribute.
+  Note the flatten attribute results in huge compile time hog
+  in inliner (same the binary size would be huge).
+- Use %make_build and enable LTO (boo#1133235).
+- Synchronize used Patches.
+
 -------------------------------------------------------------------
 Thu Jun 23 10:36:09 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 
diff --git a/libfabric.spec b/libfabric.spec
index 64e1263..5a401e6 100644
--- a/libfabric.spec
+++ b/libfabric.spec
@@ -29,6 +29,7 @@ Source:         %{name}-%{version}%{git_ver}.tar.bz2
 Source1:        baselibs.conf
 Patch0:         libfabric-libtool.patch
 Patch1:         prov-opx-Correctly-disable-OPX-if-unsupported.patch
+Patch2:         disable-flatten-attr.patch
 URL:            http://www.github.com/ofiwg/libfabric
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -72,9 +73,9 @@ services, such as RDMA. This package contains the development files.
 %setup -q -n  %{name}-%{version}%{git_ver}
 %patch0 -p1
 %patch1
+%patch2 -p1
 
 %build
-%define _lto_cflags %{nil}
 rm -f config/libtool.m4
 autoreconf -fi
 # defaults: with-dlopen and without-valgrind can be over-rode:
@@ -88,7 +89,7 @@ autoreconf -fi
     --enable-psm3 \
 %endif
     --disable-static
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install