diff --git a/.gitignore b/.gitignore
index a3bd7c1..91934d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/openmpi-4.0.3.tar.bz2
+SOURCES/openmpi-4.0.5.tar.bz2
diff --git a/.openmpi.metadata b/.openmpi.metadata
index 82706ff..f532325 100644
--- a/.openmpi.metadata
+++ b/.openmpi.metadata
@@ -1 +1 @@
-d958454e32da2c86dd32b7d557cf9a401f0a08d3 SOURCES/openmpi-4.0.3.tar.bz2
+01fba71461dd0c89e191e3bf1eb70e832d1aa5db SOURCES/openmpi-4.0.5.tar.bz2
diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec
index ea50cdc..d68fa0f 100644
--- a/SPECS/openmpi.spec
+++ b/SPECS/openmpi.spec
@@ -21,8 +21,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:			openmpi%{?_cc_name_suffix}
-Version:		4.0.3
-Release:		3%{?dist}
+Version:		4.0.5
+Release:		1%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD and MIT and Romio
@@ -49,7 +49,7 @@ BuildRequires:		librdmacm-devel rdma-core-devel
 # vt_dyn.cc:958:28: error: 'class BPatch_basicBlockLoop' has no member named 'getLoopHead'
 #                      loop->getLoopHead()->getStartAddress(), loop_stmts );
 #BuildRequires:		dyninst-devel
-BuildRequires:		hwloc-devel
+BuildRequires:		hwloc-devel >= 2.2.0
 # So configure can find lstopo
 BuildRequires:		hwloc-gui
 BuildRequires:		java-devel
@@ -287,6 +287,11 @@ make check
 
 
 %changelog
+* Mon Oct 12 2020 Honggang Li <honli@redhat.com> - 4.0.5-1
+- Update to upstream v4.0.5 release
+- Build against hwloc-2.2
+- Resolves: rhbz#1850088,rhbz#1855197
+
 * Tue Jul 28 2020 Honggang Li <honli@redhat.com> - 4.0.3-3
 - Fix module load overwrites system MANPATH
 - Resolves: rhbz#1858519