diff --git a/COPASI.spec b/COPASI.spec
index f059558..a954695 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -24,8 +24,10 @@
 
 %if 0%{?fedora} >= 33
 %global blaslib flexiblas
+%global lapacklib flexiblas
 %else
 %global blaslib openblas
+%global lapacklib lapack
 %define __cmake_in_source_build build
 %endif
 
@@ -291,7 +293,7 @@ sed -i.bak '/C_FLOAT64 d_lg10(C_FLOAT64 *);/d' copasi/optimization/CPraxis.cpp
 
 %build
 mkdir -p build && pushd build
-export CXXFLAGS="-I$PWD/copasi/lapack -I$PWD/copasi/CopasiSBW -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}"
+export CXXFLAGS="-I$PWD/copasi/CopasiSBW -DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags}"
 export LDFLAGS="%{__global_ldflags} -lbz2"
 %cmake -B build \
  -DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
@@ -344,7 +346,7 @@ export LDFLAGS="%{__global_ldflags} -lbz2"
  -DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \
  -DENABLE_COPASI_NONLIN_DYN_OSCILLATION:BOOL=ON -DENABLE_COPASI_EXTUNIT:BOOL=ON \
  -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/lib%{blaslib}.so -DBLAS_INCLUDE_DIR:PATH=%{_includedir}/%{blaslib} \
- -DCLAPACK_INCLUDE_DIR:PATH="" -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/lib%{blaslib}.so -DCLAPACK_LIBRARIES:FILEPATH="" \
+ -DCLAPACK_INCLUDE_DIR:PATH=$PWD/copasi/lapack -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/lib%{lapacklib}.so -DCLAPACK_LIBRARIES:FILEPATH="" \
  -DCOPASI_OVERWRITE_USE_LAPACK:BOOL=ON -DNO_BLAS_WRAP:BOOL=ON -DBLA_VENDOR=Generic \
  -DCROSSGUID_INCLUDE_DIR:PATH=%{_includedir}/crossguid2 \
  -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \