diff --git a/contrib/platform/intel/mrplus/linux b/contrib/platform/intel/mrplus/linux
new file mode 100644
index 0000000000..9c14ca4c52
--- /dev/null
+++ b/contrib/platform/intel/mrplus/linux
@@ -0,0 +1,30 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=yes
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no
diff --git a/contrib/platform/intel/mrplus/linux-optimized b/contrib/platform/intel/mrplus/linux-optimized
new file mode 100644
index 0000000000..ddb5611fdb
--- /dev/null
+++ b/contrib/platform/intel/mrplus/linux-optimized
@@ -0,0 +1,30 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=yes
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no
diff --git a/contrib/platform/intel/mrplus/linux-optimized.conf b/contrib/platform/intel/mrplus/linux-optimized.conf
new file mode 100644
index 0000000000..0e767d9c2e
--- /dev/null
+++ b/contrib/platform/intel/mrplus/linux-optimized.conf
@@ -0,0 +1,87 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# setup for MapReduce behavior
+orte_staged_execution = 1
+filem_raw_flatten_directory_trees = 1
+orte_set_default_slots = cores
+orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
+dfs_orted_num_worker_threads = 4
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/mrplus/linux.conf b/contrib/platform/intel/mrplus/linux.conf
new file mode 100644
index 0000000000..0e767d9c2e
--- /dev/null
+++ b/contrib/platform/intel/mrplus/linux.conf
@@ -0,0 +1,87 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# setup for MapReduce behavior
+orte_staged_execution = 1
+filem_raw_flatten_directory_trees = 1
+orte_set_default_slots = cores
+orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
+dfs_orted_num_worker_threads = 4
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/mrplus/mac b/contrib/platform/intel/mrplus/mac
new file mode 100644
index 0000000000..d040db5433
--- /dev/null
+++ b/contrib/platform/intel/mrplus/mac
@@ -0,0 +1,28 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=yes
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=yes
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no
+with_jdk_bindir=/usr/bin
+with_jdk_headers=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers
diff --git a/contrib/platform/intel/mrplus/mac-optimized b/contrib/platform/intel/mrplus/mac-optimized
new file mode 100644
index 0000000000..aa806352ec
--- /dev/null
+++ b/contrib/platform/intel/mrplus/mac-optimized
@@ -0,0 +1,28 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=yes
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no
+with_jdk_bindir=/usr/bin
+with_jdk_headers=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers
diff --git a/contrib/platform/intel/mrplus/mac-optimized.conf b/contrib/platform/intel/mrplus/mac-optimized.conf
new file mode 100644
index 0000000000..0e767d9c2e
--- /dev/null
+++ b/contrib/platform/intel/mrplus/mac-optimized.conf
@@ -0,0 +1,87 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# setup for MapReduce behavior
+orte_staged_execution = 1
+filem_raw_flatten_directory_trees = 1
+orte_set_default_slots = cores
+orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
+dfs_orted_num_worker_threads = 4
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/mrplus/mac.conf b/contrib/platform/intel/mrplus/mac.conf
new file mode 100644
index 0000000000..0e767d9c2e
--- /dev/null
+++ b/contrib/platform/intel/mrplus/mac.conf
@@ -0,0 +1,87 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# setup for MapReduce behavior
+orte_staged_execution = 1
+filem_raw_flatten_directory_trees = 1
+orte_set_default_slots = cores
+orte_soft_locations = 1
+orte_allowed_exit_without_sync = 1
+orte_retain_aliases = 1
+dfs_orted_num_worker_threads = 4
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/slurm/linux b/contrib/platform/intel/slurm/linux
new file mode 100644
index 0000000000..321fe0cc67
--- /dev/null
+++ b/contrib/platform/intel/slurm/linux
@@ -0,0 +1,30 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=no
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=yes
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no
diff --git a/contrib/platform/intel/slurm/linux-optimized b/contrib/platform/intel/slurm/linux-optimized
new file mode 100644
index 0000000000..cad65a63b3
--- /dev/null
+++ b/contrib/platform/intel/slurm/linux-optimized
@@ -0,0 +1,30 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=no
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=yes
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no
diff --git a/contrib/platform/intel/slurm/linux-optimized.conf b/contrib/platform/intel/slurm/linux-optimized.conf
new file mode 100644
index 0000000000..dc6b582879
--- /dev/null
+++ b/contrib/platform/intel/slurm/linux-optimized.conf
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+# setup slurm
+ras_slurm_enable_dyn_alloc = 1
+ras_slurm_dyn_allocate_timeout = 5
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/slurm/linux.conf b/contrib/platform/intel/slurm/linux.conf
new file mode 100644
index 0000000000..dc6b582879
--- /dev/null
+++ b/contrib/platform/intel/slurm/linux.conf
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+# setup slurm
+ras_slurm_enable_dyn_alloc = 1
+ras_slurm_dyn_allocate_timeout = 5
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/slurm/mac b/contrib/platform/intel/slurm/mac
new file mode 100644
index 0000000000..d958f8f01d
--- /dev/null
+++ b/contrib/platform/intel/slurm/mac
@@ -0,0 +1,26 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=yes
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=no
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=yes
diff --git a/contrib/platform/intel/slurm/mac-optimized b/contrib/platform/intel/slurm/mac-optimized
new file mode 100644
index 0000000000..ff23dc9458
--- /dev/null
+++ b/contrib/platform/intel/slurm/mac-optimized
@@ -0,0 +1,26 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=no
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=yes
diff --git a/contrib/platform/intel/slurm/mac-optimized.conf b/contrib/platform/intel/slurm/mac-optimized.conf
new file mode 100644
index 0000000000..dc6b582879
--- /dev/null
+++ b/contrib/platform/intel/slurm/mac-optimized.conf
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+# setup slurm
+ras_slurm_enable_dyn_alloc = 1
+ras_slurm_dyn_allocate_timeout = 5
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/slurm/mac.conf b/contrib/platform/intel/slurm/mac.conf
new file mode 100644
index 0000000000..dc6b582879
--- /dev/null
+++ b/contrib/platform/intel/slurm/mac.conf
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+# setup slurm
+ras_slurm_enable_dyn_alloc = 1
+ras_slurm_dyn_allocate_timeout = 5
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/xconnect/linux b/contrib/platform/intel/xconnect/linux
new file mode 100644
index 0000000000..e2dd3bc34b
--- /dev/null
+++ b/contrib/platform/intel/xconnect/linux
@@ -0,0 +1,30 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=yes
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=no
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no
diff --git a/contrib/platform/intel/xconnect/linux-optimized b/contrib/platform/intel/xconnect/linux-optimized
new file mode 100644
index 0000000000..36a5ac5eec
--- /dev/null
+++ b/contrib/platform/intel/xconnect/linux-optimized
@@ -0,0 +1,30 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_ft_thread=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_mpi_java=no
+enable_io_romio=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_tm=no
+with_slurm=no
+with_devel_headers=yes
+with_portals=no
+with_valgrind=no
diff --git a/contrib/platform/intel/xconnect/linux-optimized.conf b/contrib/platform/intel/xconnect/linux-optimized.conf
new file mode 100644
index 0000000000..851342ef53
--- /dev/null
+++ b/contrib/platform/intel/xconnect/linux-optimized.conf
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/xconnect/linux.conf b/contrib/platform/intel/xconnect/linux.conf
new file mode 100644
index 0000000000..3d25f51286
--- /dev/null
+++ b/contrib/platform/intel/xconnect/linux.conf
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/xconnect/mac b/contrib/platform/intel/xconnect/mac
new file mode 100644
index 0000000000..2eb2b5f1ac
--- /dev/null
+++ b/contrib/platform/intel/xconnect/mac
@@ -0,0 +1,26 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=yes
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=yes
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=no
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no
diff --git a/contrib/platform/intel/xconnect/mac-optimized b/contrib/platform/intel/xconnect/mac-optimized
new file mode 100644
index 0000000000..24b2e4bfb0
--- /dev/null
+++ b/contrib/platform/intel/xconnect/mac-optimized
@@ -0,0 +1,26 @@
+enable_event_thread_support=yes
+enable_opal_multi_threads=yes
+enable_orte_progress_threads=yes
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=no
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_fortran=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mpi_java=no
+enable_memchecker=no
+enable_vt=no
+enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
+enable_contrib_no_build=libnbc,vt
+with_memory_manager=no
+with_devel_headers=yes
+with_xgrid=no
+with_slurm=no
diff --git a/contrib/platform/intel/xconnect/mac-optimized.conf b/contrib/platform/intel/xconnect/mac-optimized.conf
new file mode 100644
index 0000000000..851342ef53
--- /dev/null
+++ b/contrib/platform/intel/xconnect/mac-optimized.conf
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768
diff --git a/contrib/platform/intel/xconnect/mac.conf b/contrib/platform/intel/xconnect/mac.conf
new file mode 100644
index 0000000000..3d25f51286
--- /dev/null
+++ b/contrib/platform/intel/xconnect/mac.conf
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_base_component_show_load_errors = 1
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+hwloc_base_mem_bind_failure_action = silent
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,tcp,self 
+
+## Setup shared memory
+btl_sm_free_list_max = 768