diff --git a/mvapich2.changes b/mvapich2.changes
index 355e2ba..b838d01 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 30 20:04:01 UTC 2018 - eich@suse.com
+
+- Use macro in mpivars.(c)sh to be independent of changes to the module
+  setup for the compiler (boo#1078364).
+
 -------------------------------------------------------------------
 Fri Jan  5 19:03:44 UTC 2018 - eich@suse.com
 
diff --git a/mvapich2.spec b/mvapich2.spec
index b415202..df57541 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -406,9 +406,13 @@ prepend-path    MPI_DIR             %{hpc_prefix}
 family "MPI"
 EOF
 cat <<EOF >  %{buildroot}/%{p_bindir}/mpivars.sh
-module load %{hpc_compiler_family}/%{hpc_cf_full_version} %{hpc_mpi_family}%{?pack_suff}/%{version}
+%hpc_setup_compiler
+module load %{hpc_mpi_family}%{?pack_suff}/%{version}
 EOF
-ln -s mpivars.sh %{buildroot}/%{p_bindir}/mpivars.csh
+sed -e "s/export/setenv/" -e "s/=/ /" \
+    %{buildroot}/%{p_bindir}/mpivars.sh > \
+    %{buildroot}/%{p_bindir}/mpivars.csh
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
 
 %endif # with hpc