diff --git a/SOURCES/flexiblas-3.0.4-annocheck.patch b/SOURCES/flexiblas-3.0.4-annocheck.patch
new file mode 100644
index 0000000..57e6481
--- /dev/null
+++ b/SOURCES/flexiblas-3.0.4-annocheck.patch
@@ -0,0 +1,14 @@
+diff -up flexiblas-3.0.4/CMakeLists.txt.annocheck flexiblas-3.0.4/CMakeLists.txt
+--- flexiblas-3.0.4/CMakeLists.txt.annocheck	2020-10-22 11:07:48.000000000 +0200
++++ flexiblas-3.0.4/CMakeLists.txt	2022-02-15 09:50:29.971016074 +0100
+@@ -177,6 +177,10 @@ SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ 
++IF(DEFINED ENV{LDFLAGS})
++    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} $ENV{LDFLAGS}")
++ENDIF()
++
+ #
+ # Check Some files
+ #
diff --git a/SPECS/flexiblas.spec b/SPECS/flexiblas.spec
index fd7a092..e4dd49e 100644
--- a/SPECS/flexiblas.spec
+++ b/SPECS/flexiblas.spec
@@ -2,6 +2,7 @@
 %bcond_without atlas
 %bcond_without blis
 %bcond_without openblas
+%undefine _ld_as_needed
 
 %if %{with openblas}
 %global default_backend openblas-openmp
@@ -16,7 +17,7 @@
 
 Name:           flexiblas
 Version:        %{major_version}.%{minor_version}.%{patch_version}
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        A BLAS/LAPACK wrapper library with runtime exchangeable backends
 
 # GPLv3 with an exception for the BLAS/LAPACK interface
@@ -27,6 +28,8 @@ License:        GPLv3 with exceptions and LGPLv2+ and BSD
 URL:            https://www.mpi-magdeburg.mpg.de/projects/%{name}
 Source0:        https://csc.mpi-magdeburg.mpg.de/mpcsc/software/%{name}/%{name}-%{version}.tar.xz
 
+Patch1: flexiblas-3.0.4-annocheck.patch
+
 BuildRequires:  make, cmake, python
 BuildRequires:  gcc-fortran, gcc-c++
 %if %{with system_lapack}
@@ -204,7 +207,9 @@ threading support with a 64-integer interface.
 %endif
 
 %prep
-%autosetup -p1
+%setup -q
+
+%patch1 -p1 -b .annocheck
 
 %build
 %if %{with system_lapack}
@@ -395,6 +400,18 @@ make -C build64 test
 %endif
 
 %changelog
+* Mon Feb 28 2022 Matej Mužila <mmuzila@redhat.com> - 3.0.4-8
+- Don't use --as-needed link option
+  Related: rhbz#2044859
+
+* Wed Feb 23 2022 Matej Mužila <mmuzila@redhat.com> - 3.0.4-7
+- Add gating.yaml
+  Related: rhbz#2044859
+
+* Tue Feb 15 2022 Matej Mužila <mmuzila@redhat.com> - 3.0.4-6
+- Fix annocheck bind-now problems
+  Resolves: rhbz#2044859
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.4-5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688