diff --git a/.gitignore b/.gitignore
index 8a08efb..318284c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/IMB-v2021.2.tar.gz
-SOURCES/osu-micro-benchmarks-5.7.1.tgz
+SOURCES/IMB-v2021.3.tar.gz
+SOURCES/osu-micro-benchmarks-5.8.tgz
diff --git a/.mpitests.metadata b/.mpitests.metadata
index 5d1ec8a..3685930 100644
--- a/.mpitests.metadata
+++ b/.mpitests.metadata
@@ -1,2 +1,2 @@
-192809079c14f30966f757a2f89578bffa07e57c SOURCES/IMB-v2021.2.tar.gz
-29c8b6584afe7acb5af5c3e805cc0dfe93defeff SOURCES/osu-micro-benchmarks-5.7.1.tgz
+54718f6312d64e6500605aadccbbd5461e5ae818 SOURCES/IMB-v2021.3.tar.gz
+eb56cd190fb838b99a9bfcc530005452d81bafb8 SOURCES/osu-micro-benchmarks-5.8.tgz
diff --git a/SPECS/mpitests.spec b/SPECS/mpitests.spec
index 9285e3d..1e24a3e 100644
--- a/SPECS/mpitests.spec
+++ b/SPECS/mpitests.spec
@@ -1,9 +1,9 @@
-%global intel_mpi_bench_vers IMB-v2021.2
-%global osu_micro_bench_vers 5.7.1
+%global intel_mpi_bench_vers IMB-v2021.3
+%global osu_micro_bench_vers 5.8
 Summary: MPI Benchmarks and tests
 Name: mpitests
-Version: 5.7
-Release: 2%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 License: CPL and BSD
 Group: Applications/Engineering
 # These days we get the benchmark soucres from Intel and OSU directly
@@ -16,6 +16,7 @@ Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks
 #Patch101: OMB-disable-collective-async.patch
 BuildRequires: hwloc-devel, libibmad-devel, rdma-core-devel
 BuildRequires: automake, autoconf, libtool
+BuildRequires: gcc, gcc-c++
 
 %description
 A set of popular MPI benchmarks:
@@ -67,7 +68,7 @@ MPI test suite compiled against the mvapich2 package using OmniPath
 %prep
 %setup -c 
 %setup -T -D -a 1
-cd osu-micro-benchmarks-5.7.1
+cd osu-micro-benchmarks-5.8
 cd ..
 
 %build
@@ -171,6 +172,11 @@ do_install
 %endif
 
 %changelog
+* Fri Dec 10 2021 Honggang Li <honli@redhat.com> - 5.8-1
+- Update OSU benchmarks to upstream release 5.8
+- Update Intel MPI Benchmarks 2021.3
+- Resolves: rhbz#2008517
+
 * Thu May 13 2021 Honggang Li <honli@redhat.com> - 5.7-2
 - Update OSU benchmarks to upstream release 5.7.1
 - Update Intel MPI Benchmarks 2021.2