diff --git a/config/orte_check_lsf.m4 b/config/orte_check_lsf.m4
index 6effdff3a2..6ce523cc2c 100644
--- a/config/orte_check_lsf.m4
+++ b/config/orte_check_lsf.m4
@@ -117,6 +117,10 @@ AC_DEFUN([ORTE_CHECK_LSF],[
     LDFLAGS="$orte_check_lsf_$1_save_LDFLAGS"
     LIBS="$orte_check_lsf_$1_save_LIBS"
 
+    # add the LSF libraries to static builds as they are required
+    $1_WRAPPER_EXTRA_LDFLAGS=[$]$1_LDFLAGS
+    $1_WRAPPER_EXTRA_LIBS=[$]$1_LIBS
+
     # Reset for the next time we're called
     orte_check_lsf_dir=
     orte_check_lsf_libdir=
diff --git a/orte/mca/ess/lsf/configure.m4 b/orte/mca/ess/lsf/configure.m4
index ee905adbae..262e7f690f 100644
--- a/orte/mca/ess/lsf/configure.m4
+++ b/orte/mca/ess/lsf/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2007-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011      Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,11 +30,12 @@ AC_DEFUN([MCA_orte_ess_lsf_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$ess_lsf_good" = "1"],
-          [$1
-           ess_lsf_WRAPPER_EXTRA_LDFLAGS="$ess_lsf_LDFLAGS"
-           ess_lsf_WRAPPER_EXTRA_LIBS="$ess_lsf_LIBS"],
+          [$1],
           [$2])
 
+    $1_WRAPPER_EXTRA_LDFLAGS=[$]$1_LDFLAGS
+    $1_WRAPPER_EXTRA_LIBS=[$]$1_LIBS
+
     # set build flags to use in makefile
     AC_SUBST([ess_lsf_CPPFLAGS])
     AC_SUBST([ess_lsf_LDFLAGS])
diff --git a/orte/mca/ess/slurm/configure.m4 b/orte/mca/ess/slurm/configure.m4
index fdeab8d78c..487f870d19 100644
--- a/orte/mca/ess/slurm/configure.m4
+++ b/orte/mca/ess/slurm/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011      Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,9 +30,7 @@ AC_DEFUN([MCA_orte_ess_slurm_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$ess_slurm_good" = "1"],
-          [$1
-           ess_slurm_WRAPPER_EXTRA_LDFLAGS="$ess_slurm_LDFLAGS"
-           ess_slurm_WRAPPER_EXTRA_LIBS="$ess_slurm_LIBS"],
+          [$1],
           [$2])
 
     # set build flags to use in makefile
diff --git a/orte/mca/ess/tm/configure.m4 b/orte/mca/ess/tm/configure.m4
index c1ef55befe..d0987cd356 100644
--- a/orte/mca/ess/tm/configure.m4
+++ b/orte/mca/ess/tm/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011      Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,9 +30,7 @@ AC_DEFUN([MCA_orte_ess_tm_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$ess_tm_good" = "1"],
-          [$1
-           ess_tm_WRAPPER_EXTRA_LDFLAGS="$ess_tm_LDFLAGS"
-           ess_tm_WRAPPER_EXTRA_LIBS="$ess_tm_LIBS"],
+          [$1],
           [$2])
 
     # set build flags to use in makefile
diff --git a/orte/mca/plm/lsf/configure.m4 b/orte/mca/plm/lsf/configure.m4
index 3e45d106d4..2e90012e5e 100644
--- a/orte/mca/plm/lsf/configure.m4
+++ b/orte/mca/plm/lsf/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,11 +30,12 @@ AC_DEFUN([MCA_orte_plm_lsf_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$plm_lsf_good" = "1"],
-          [$1
-           plm_lsf_WRAPPER_EXTRA_LDFLAGS="$plm_lsf_LDFLAGS"
-           plm_lsf_WRAPPER_EXTRA_LIBS="$plm_lsf_LIBS"],
+          [$1],
           [$2])
 
+    $1_WRAPPER_EXTRA_LDFLAGS=[$]$1_LDFLAGS
+    $1_WRAPPER_EXTRA_LIBS=[$]$1_LIBS
+
     # set build flags to use in makefile
     AC_SUBST([plm_lsf_CPPFLAGS])
     AC_SUBST([plm_lsf_LDFLAGS])
diff --git a/orte/mca/plm/slurm/configure.m4 b/orte/mca/plm/slurm/configure.m4
index 430ed0652a..d78c0c189d 100644
--- a/orte/mca/plm/slurm/configure.m4
+++ b/orte/mca/plm/slurm/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,9 +30,7 @@ AC_DEFUN([MCA_orte_plm_slurm_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$plm_slurm_good" = "1"],
-          [$1
-           plm_slurm_WRAPPER_EXTRA_LDFLAGS="$plm_slurm_LDFLAGS"
-           plm_slurm_WRAPPER_EXTRA_LIBS="$plm_slurm_LIBS"],
+          [$1],
           [$2])
 
     # set build flags to use in makefile
diff --git a/orte/mca/plm/tm/configure.m4 b/orte/mca/plm/tm/configure.m4
index 84bce9654a..9b34e9e31f 100644
--- a/orte/mca/plm/tm/configure.m4
+++ b/orte/mca/plm/tm/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,9 +30,7 @@ AC_DEFUN([MCA_orte_plm_tm_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$plm_tm_good" = "1"],
-          [$1
-           plm_tm_WRAPPER_EXTRA_LDFLAGS="$plm_tm_LDFLAGS"
-           plm_tm_WRAPPER_EXTRA_LIBS="$plm_tm_LIBS"],
+          [$1],
           [$2])
 
     # set build flags to use in makefile
diff --git a/orte/mca/ras/lsf/configure.m4 b/orte/mca/ras/lsf/configure.m4
index d31adc167d..d56310758f 100644
--- a/orte/mca/ras/lsf/configure.m4
+++ b/orte/mca/ras/lsf/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,12 +30,12 @@ AC_DEFUN([MCA_orte_ras_lsf_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$ras_lsf_good" = "1"],
-          [$1
-           ras_lsf_WRAPPER_EXTRA_LDFLAGS="$ras_lsf_LDFLAGS"
-           ras_lsf_WRAPPER_EXTRA_LIBS="$ras_lsf_LIBS"],
+          [$1],
           [$2])
 
-    
+    $1_WRAPPER_EXTRA_LDFLAGS=[$]$1_LDFLAGS
+    $1_WRAPPER_EXTRA_LIBS=[$]$1_LIBS
+
     # set build flags to use in makefile
     AC_SUBST([ras_lsf_CPPFLAGS])
     AC_SUBST([ras_lsf_LDFLAGS])
diff --git a/orte/mca/ras/slurm/configure.m4 b/orte/mca/ras/slurm/configure.m4
index eea90318ef..0c67f01138 100644
--- a/orte/mca/ras/slurm/configure.m4
+++ b/orte/mca/ras/slurm/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,9 +30,7 @@ AC_DEFUN([MCA_orte_ras_slurm_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$ras_slurm_good" = "1"],
-          [$1
-           ras_slurm_WRAPPER_EXTRA_LDFLAGS="$ras_slurm_LDFLAGS"
-           ras_slurm_WRAPPER_EXTRA_LIBS="$ras_slurm_LIBS"],
+          [$1],
           [$2])
 
     # set build flags to use in makefile
diff --git a/orte/mca/ras/tm/configure.m4 b/orte/mca/ras/tm/configure.m4
index 89041f081b..4445fafed3 100644
--- a/orte/mca/ras/tm/configure.m4
+++ b/orte/mca/ras/tm/configure.m4
@@ -13,7 +13,6 @@
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,9 +30,7 @@ AC_DEFUN([MCA_orte_ras_tm_CONFIG],[
     # if check worked, set wrapper flags if so.  
     # Evaluate succeed / fail
     AS_IF([test "$ras_tm_good" = "1"],
-          [$1
-           ras_tm_WRAPPER_EXTRA_LDFLAGS="$ras_tm_LDFLAGS"
-           ras_tm_WRAPPER_EXTRA_LIBS="$ras_tm_LIBS"],
+          [$1],
           [$2])
 
     # set build flags to use in makefile