diff --git a/.gitignore b/.gitignore
index 40b6358..c9e7c8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /COPASI-Build-217.tar.gz
 /COPASI-Build-226.tar.gz
 /COPASI-Build-228.tar.gz
+/COPASI-Build-240.tar.gz
diff --git a/COPASI.spec b/COPASI.spec
index f009a05..eb4e55d 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -1,4 +1,4 @@
-%global buildid    228
+%global buildid    240
 %global octpkg  COPASI
 
 %global with_python  1
@@ -22,28 +22,22 @@
 
 %global _docdir_fmt %{name}
 
-%if 0%{?fedora} >= 33
 %global blaslib flexiblas
 %global lapacklib flexiblas
-%else
-%global blaslib openblas
-%global lapacklib lapack
-BuildRequires: lapack-devel
-%endif
 
 Name:  COPASI
 Summary: Biochemical network simulator
-Version: 4.29.%{buildid}
-Release: 4%{?dist}
-
-##Artistic 2.0 is main license
-##GPLv2+ is related to a Mixed Source Licensing Scenario
-##with 'copasi/randomGenerator/Cmt19937.cpp' file
-##GPLv3+ is related to a Mixed Source Licensing Scenario
-##with 'copasi/function/CEvaluationParser_yacc.cpp' file
-##BSD is related to a Mixed Source Licensing Scenario
-##with 'copasi/randomGenerator/Cmt19937.cpp' file
-##Any files with different licenses are not involved
+Version: 4.30.%{buildid}
+Release: 1%{?dist}
+
+## Artistic 2.0 is main license
+## GPLv2+ is related to a Mixed Source Licensing Scenario
+# with 'copasi/randomGenerator/Cmt19937.cpp' file
+## GPLv3+ is related to a Mixed Source Licensing Scenario
+# with 'copasi/function/CEvaluationParser_yacc.cpp' file
+## BSD is related to a Mixed Source Licensing Scenario
+# with 'copasi/randomGenerator/Cmt19937.cpp' file
+## Any files with different licenses are not involved
 License: Artistic 2.0 and GPLv3+ and BSD
 URL:   http://copasi.org/
 Source0: https://github.com/copasi/COPASI/archive/Build-%{buildid}/%{name}-Build-%{buildid}.tar.gz
@@ -85,6 +79,12 @@ BuildRequires: bzip2-devel
 BuildRequires: ImageMagick
 BuildRequires: libappstream-glib
 BuildRequires: minizip-devel
+%ifarch x86_64
+BuildRequires: nativejit-devel
+%endif
+%ifnarch s390x
+BuildRequires: google-cpu_features-devel
+%endif
 
 Requires: %{name}-data = %{version}-%{release}
 Requires: libsedml%{?_isa} >= 1:0.4.3-3
@@ -301,7 +301,7 @@ sed -i.bak '/C_FLOAT64 d_lg10(C_FLOAT64 *);/d' copasi/optimization/CPraxis.cpp
 
 %build
 mkdir -p 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/lapack -I$PWD/copasi/CopasiSBW -I%{_includedir}/%{blaslib} %{optflags} %{__global_ldflags}"
 export LDFLAGS="%{__global_ldflags} -lbz2"
 %cmake3 -B build -S copasi \
  -Wno-dev -DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
@@ -340,7 +340,8 @@ export LDFLAGS="%{__global_ldflags} -lbz2"
  -DQWT_VERSION_STRING:STRING="%(pkg-config --modversion qwt)" \
 %endif
  -DSELECT_QT=Qt5 \
- -Wno-dev \
+ -DSITE:STRING=fedora -DF2C_INTEGER=int -DF2C_LOGICAL=long \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING=" -I$PWD/copasi/lapack -I$PWD/copasi/CopasiSBW -I%{_includedir}/%{blaslib} %{optflags} %{__global_ldflags} -DNDEBUG" \
  -DCOPASI_INSTALL_C_API=OFF -DCombine_DIR:PATH=%{_libdir}/cmake \
  -DCMAKE_SHARED_LINKER_FLAGS:STRING="%{__global_ldflags} -pthread" \
  -DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags} -pthread" \
@@ -353,9 +354,9 @@ export LDFLAGS="%{__global_ldflags} -lbz2"
  -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=OFF \
  -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%{lapacklib}.so -DCLAPACK_LIBRARIES:FILEPATH="" \
  -DCOPASI_OVERWRITE_USE_LAPACK:BOOL=ON -DNO_BLAS_WRAP:BOOL=ON -DBLA_VENDOR=Generic \
+ -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/lib%{blaslib}.so \
+ -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/lib%{lapacklib}.so \
  -DCROSSGUID_INCLUDE_DIR:PATH=%{_includedir}/crossguid2 \
  -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \
  -DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \
@@ -476,6 +477,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %{_datadir}/copasi/doc/
 
 %changelog
+* Thu Mar 18 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.30.240-1
+- Release 4.30 build-240
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.29.228-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 4bba3a0..4430638 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (COPASI-Build-228.tar.gz) = 358a66b65df306018666911e3ae2fc1504b08b1f208f24852e145ff514fa684b056e85dc04e2e90da8f51d8be9d0a392fc14481013e9e5514d3d936e9f499b47
+SHA512 (COPASI-Build-240.tar.gz) = 0e8835fb80806f45039efb2e4f04fe57c821dcf42b3c037af48779439f8c0ac5325bcd49f5772298daf5b17106b32cd7ad1541592bb14cbecdd8d9653785aec3