diff --git a/tbb.spec b/tbb.spec
index 98b58e0e6eb825e4313db60de2943223f925d63b..ecc73b52fb0619b101c8f02a8e4a336dcdd52f1d 100644
--- a/tbb.spec
+++ b/tbb.spec
@@ -1,6 +1,6 @@
 Name:           tbb
 Version:        2020.3
-Release:        4
+Release:        5
 Summary:        Threading Building Blocks lets you easily write parallel C++ programs
 License:        ASL 2.0
 URL:            http://threadingbuildingblocks.org/
@@ -54,8 +54,12 @@ sed -i '/^#!/d' python/tbb/{pool,test}.py
 
 %build
 %make_build tbb_build_prefix=obj stdver=c++14 \
-	CXXFLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD -fstack-protector-strong" \
-	LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong"
+    CXXFLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD -fstack-protector-strong" \
+  %ifarch riscv64
+    LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong -latomic"
+  %else
+    LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong"
+  %endif
 %define pcsource {%{SOURCE6} %{SOURCE7} %{SOURCE8}}
 for pcfile in %{pcsource}; do
     base=$(basename ${pcfile})
@@ -66,11 +70,11 @@ done
 . build/obj_release/tbbvars.sh
 pushd python
 %make_build -C rml stdver=c++14 \
-  CPLUS_FLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD -fstack-protector-strong" \
+    CPLUS_FLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD -fstack-protector-strong" \
   %ifarch riscv64
-  LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong -latomic"
+    LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong -latomic"
   %else
-  LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong"
+    LDFLAGS="$RPM_LD_FLAGS -lpthread -fstack-protector-strong"
   %endif
 cp -p rml/libirml.so* .
 %py3_build
@@ -147,6 +151,9 @@ rm %{buildroot}%{_libdir}/cmake/tbb/README.rst
 %{python3_sitearch}/__pycache__/TBB*
 
 %changelog
+* Thu Aug 12 2021 PandaGix <pandagix@gitee.com> -2020.3-5
+- Improve support for riscv64. Build(make_build) also link to libatomic for riscv64, not only in py3_build.
+
 * Fri Jul 2 2021 Hugel <genqihu1@huawei.com> - 2020.3-4
 - Add multiple threads to make test