diff --git a/mvapich2.changes b/mvapich2.changes
index 628781d..bd3c652 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 29 13:44:44 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- HPC: Fix environment module settings for MANPATH. 
+
 -------------------------------------------------------------------
 Sat Jul 25 07:03:57 UTC 2020 - Egbert Eich <eich@suse.com>
 
diff --git a/mvapich2.spec b/mvapich2.spec
index e072f78..de7ee32 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -519,9 +519,9 @@ module-whatis "URL: %{url}"
 
 set     version                     %{version}
 
-prepend-path    PATH                %{hpc_prefix}/bin
-prepend-path    MANPATH             %{hpc_prefix}/man
-prepend-path    LD_LIBRARY_PATH     %{hpc_prefix}/%_lib
+prepend-path    PATH                %{hpc_bindir}
+prepend-path    MANPATH             %{hpc_mandir}
+prepend-path    LD_LIBRARY_PATH     %{hpc_libdir}
 prepend-path    MODULEPATH          %{hpc_modulepath}
 prepend-path    MPI_DIR             %{hpc_prefix}
 %{hpc_modulefile_add_pkgconfig_path}