diff --git a/mpivars.csh b/mpivars.csh
index 4d78e32..5c7f4a3 100644
--- a/mpivars.csh
+++ b/mpivars.csh
@@ -7,3 +7,9 @@ if ($?MANPATH) then
 else
     setenv MANPATH prefix/man:
 endif
+
+if ($?LD_LIBRARY_PATH) then
+    setenv LD_LIBRARY_PATH libdir:$LD_LIBRARY_PATH
+else
+    setenv LD_LIBRARY_PATH libdir
+endif
diff --git a/mpivars.sh b/mpivars.sh
index cc31227..c8317da 100644
--- a/mpivars.sh
+++ b/mpivars.sh
@@ -13,4 +13,19 @@ case $MANPATH in
         ;;
         *)
         MANPATH=prefix/share/man:$MANPATH
+        export MANPATH
+esac
+
+
+case $LD_LIBRARY_PATH in
+        *libdir*)
+        true
+        ;;
+        *)
+        if [ -z "$LD_LIBRARY_PATH" ]; then
+          LD_LIBRARY_PATH=libdir
+        else
+          LD_LIBRARY_PATH="libdir:$LD_LIBRARY_PATH"
+        fi
+        export LD_LIBRARY_PATH
 esac
diff --git a/mvapich2.changes b/mvapich2.changes
index 9643585..c704cce 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jul 13 14:59:13 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Add LD_LIBRARY_PATH to mpivars.sh and mpivars.csh
+
+-------------------------------------------------------------------
+Thu Jul 13 07:54:38 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Disable rpath in pkgconfig files
+
 -------------------------------------------------------------------
 Wed Jul  5 15:12:46 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 1bde41f..2ccb860 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %global flavor @BUILD_FLAVOR@%nil
 
 %if "%{flavor}" != ""
@@ -126,6 +127,7 @@ cp /usr/share/automake*/config.* .
 %build
 #./autogen.sh
 %configure \
+   --disable-wrapper-rpath      \
 %if "%{flavor}" == "psm"
    --with-device=ch3:psm \
    --with-psm=/usr \
@@ -145,8 +147,8 @@ make V=1 check
 %install
 make DESTDIR=%{buildroot} V=1 install
 # make and install mpivars files
-sed 's,prefix,%_prefix,g' %{S:1} > %{buildroot}%{_bindir}/mpivars.sh
-sed 's,prefix,%_prefix,g' %{S:2} > %{buildroot}%{_bindir}/mpivars.csh
+sed -e 's,prefix,%_prefix,g' -e 's,libdir,%{_libdir},g' %{S:1} > %{buildroot}%{_bindir}/mpivars.sh
+sed -e 's,prefix,%_prefix,g' -e 's,libdir,%{_libdir},g' %{S:2} > %{buildroot}%{_bindir}/mpivars.csh
 rm -f %{buildroot}%{_libdir}/libfmpich.la \
       %{buildroot}%{_libdir}/libmpich.la \
       %{buildroot}%{_libdir}/libmpichcxx.la \