diff --git a/config/opal_setup_wrappers.m4 b/config/opal_setup_wrappers.m4
index 7fdebecaf5..2c7517fa57 100644
--- a/config/opal_setup_wrappers.m4
+++ b/config/opal_setup_wrappers.m4
@@ -150,7 +150,7 @@ AC_DEFUN([OPAL_SETUP_RPATH],[
 # (because if script A sources script B, and B calls "exit", then both
 # B and A will exit).  Instead, we have to send the output to a file
 # and then source that.
-$OMPI_TOP_BUILDDIR/opal/libltdl/libtool --config > $rpath_outfile
+$OMPI_TOP_BUILDDIR/libtool --config > $rpath_outfile
 
 chmod +x $rpath_outfile
 . ./$rpath_outfile
@@ -214,9 +214,8 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[
 # runtime), and the RUNPATH args, if we have them.
 AC_DEFUN([RPATHIFY_LDFLAGS],[
     OPAL_VAR_SCOPE_PUSH([rpath_out rpath_dir rpath_tmp])
-    AS_IF([test "$enable_wrapper_rpath" = "no" -o "$WRAPPER_RPATH_SUPPORT" = "disabled"],
-          [:],
-          [rpath_out=
+    AS_IF([test "$enable_wrapper_rpath" = "yes" -a ! "$WRAPPER_RPATH_SUPPORT" = "disabled" -a ! "WRAPPER_RPATH_SUPPORT" = "unnecessary"], [
+           rpath_out=""
            for val in ${$1}; do
                case $val in
                -L*)
@@ -229,7 +228,7 @@ AC_DEFUN([RPATHIFY_LDFLAGS],[
 
            # Now add in the RPATH args for @{libdir}, and the RUNPATH args
            rpath_tmp=`echo $rpath_args | sed -e s/LIBDIR/@{libdir}/`
-           $1="$rpath_out $rpath_tmp $runpath_args"
+           $1="${$1} $rpath_out $rpath_tmp $runpath_args"
           ])
     OPAL_VAR_SCOPE_POP
 ])
diff --git a/configure.ac b/configure.ac
index c32ae5f38b..71a4121151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1307,6 +1307,8 @@ AC_SUBST(OPAL_DYN_LIB_SUFFIX)
 
 OPAL_SETUP_LIBLTDL
 
+# Need the libtool binary before the rpathify stuff
+LT_OUTPUT
 
 ############################################################################
 # final compiler config
diff --git a/contrib/platform/lanl/cray_xe6/cray-common b/contrib/platform/lanl/cray_xe6/cray-common
index de266375c3..fd1177f298 100644
--- a/contrib/platform/lanl/cray_xe6/cray-common
+++ b/contrib/platform/lanl/cray_xe6/cray-common
@@ -32,7 +32,3 @@ fi
 
 with_tm=no
 with_slurm=no
-
-# rpath alps, pmi, uGNI, and xpmem libraries
-LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib64/alps -Wl,-rpath=$with_pmi/lib64 -Wl,-rpath=$with_ugni/lib64 -Wl,-rpath=$with_xpmem/lib64 -Wl,-rpath=$with_udreg/lib64"
-with_wrapper_ldflags="-Wl,-rpath=/usr/lib64/alps -Wl,-rpath=$with_pmi/lib64 -Wl,-rpath=$with_ugni/lib64 -Wl,-rpath=$with_xpmem/lib64"