diff --git a/SOURCES/openmpi.module.in b/SOURCES/openmpi.module.in
index 6885013..287a4b5 100644
--- a/SOURCES/openmpi.module.in
+++ b/SOURCES/openmpi.module.in
@@ -6,7 +6,7 @@ conflict		mpi
 prepend-path 		PATH 		@LIBDIR@/bin
 prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
 prepend-path 		PKG_CONFIG_PATH	@LIBDIR@/lib/pkgconfig
-prepend-path		MANPATH		@MANDIR@
+prepend-path		MANPATH		:@MANDIR@
 setenv 			MPI_BIN		@LIBDIR@/bin
 setenv			MPI_SYSCONFIG	@ETCDIR@
 setenv			MPI_FORTRAN_MOD_DIR	@FMODDIR@
diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec
index 1cff2d8..ea50cdc 100644
--- a/SPECS/openmpi.spec
+++ b/SPECS/openmpi.spec
@@ -22,7 +22,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		4.0.3
-Release:		1%{?dist}
+Release:		3%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD and MIT and Romio
@@ -287,6 +287,10 @@ make check
 
 
 %changelog
+* Tue Jul 28 2020 Honggang Li <honli@redhat.com> - 4.0.3-3
+- Fix module load overwrites system MANPATH
+- Resolves: rhbz#1858519
+
 * Tue May 12 2020 Honggang Li <honli@redhat.com> - 4.0.3-1
 - Update to upstream v4.0.3 release
 - Resolves: rhbz#1817834