diff --git a/contrib/platform/cisco/suder/debug b/contrib/platform/cisco/ludd-1/debug
similarity index 50%
rename from contrib/platform/cisco/suder/debug
rename to contrib/platform/cisco/ludd-1/debug
index 913b2b62c4..1c3269f63c 100644
--- a/contrib/platform/cisco/suder/debug
+++ b/contrib/platform/cisco/ludd-1/debug
@@ -1,28 +1,24 @@
-enable_dlopen=no
+enable_monitoring=yes
+enable_multicast=yes
+with_memory_manager=no
 enable_mem_debug=yes
-enable_mem_profile=yes
-enable_memchecker=no
+enable_mem_profile=no
 enable_debug_symbols=yes
 enable_binaries=yes
+with_devel_headers=yes
 enable_heterogeneous=no
 enable_picky=yes
 enable_debug=yes
 enable_shared=yes
-enable_static=yes
+enable_static=no
+enable_contrib_no_build=libnbc,vt
+enable_io_romio=no
 enable_ipv6=no
 enable_mpi_f77=no
 enable_mpi_f90=no
-enable_mpi_cxx=yes
-enable_mpi_cxx_seek=yes
-enable_cxx_exceptions=yes
-enable_ft_thread=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_memchecker=no
 enable_per_user_config_files=no
 enable_orterun_prefix_by_default=yes
-enable_io_romio=no
-enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm
-enable_contrib_no_build=libnbc,vt
-with_slurm=no
-with_openib=no
-with_devel_headers=yes
-with_memory_manager=ptmalloc2
-with_valgrind=no
+enable_mca_no_build=carto,crs,memchecker,rmaps-load_balance,rmaps-round_robin,rmaps-seq,rmaps-topo,rmaps-rank_file,filem,plm-slurm,plm-xgrid,snapc,grpcomm-basic,grpcomm-hier,pml-dr,pml-crcp2,pml-cm,crcp,pml-v
diff --git a/contrib/platform/cisco/suder/debug.conf b/contrib/platform/cisco/ludd-1/debug.conf
similarity index 68%
rename from contrib/platform/cisco/suder/debug.conf
rename to contrib/platform/cisco/ludd-1/debug.conf
index ca866f8c2a..20e8e076b4 100644
--- a/contrib/platform/cisco/suder/debug.conf
+++ b/contrib/platform/cisco/ludd-1/debug.conf
@@ -1,15 +1,5 @@
 #
-# 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 (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -65,31 +55,15 @@ opal_set_max_sys_limits = 1
 
 # ORTE behavior
 rmaps = resilient
+ess = cm
+routed = cm
 plm = rsh
 
-## MPI behavior
-## Do NOT specify mpi_leave_pinned so system
-## can figure out for itself whether or not
-## it is supported and usable
-
-## Protect looped collectives
-coll_sync_priority = 100
-coll_sync_barrier_before = 1000
-
-## Activate hierarchical collectives
-coll_hierarch_priority = 90
-
 ## Add the interface for out-of-band communication
 ## and set it up
 oob_tcp_listen_mode = listen_thread
 oob_tcp_sndbuf = 32768
 oob_tcp_rcvbuf = 32768
 
-## Define the MPI interconnects
-btl = sm,tcp,self 
-
-## Setup MPI options
-mpi_show_handle_leaks = 1
-mpi_warn_on_fork = 1
-mpi_abort_print_stack = 1
-
+# Define the interface for multicast
+rmcast_base_if_include = 10.0
diff --git a/contrib/platform/cisco/ludd-1/optimized b/contrib/platform/cisco/ludd-1/optimized
new file mode 100644
index 0000000000..8f416dbcbe
--- /dev/null
+++ b/contrib/platform/cisco/ludd-1/optimized
@@ -0,0 +1,25 @@
+enable_monitoring=yes
+enable_multicast=yes
+with_memory_manager=no
+enable_mem_debug=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+with_devel_headers=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_contrib_no_build=libnbc,vt
+enable_io_romio=no
+enable_ipv6=no
+enable_mpi_f77=no
+enable_mpi_f90=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_memchecker=no
+enable_per_user_config_files=no
+enable_orterun_prefix_by_default=yes
+enable_mca_no_build=carto,crs,memchecker,rmaps-load_balance,rmaps-round_robin,rmaps-seq,rmaps-topo,rmaps-rank_file,filem,plm-slurm,plm-xgrid,snapc,grpcomm-basic,grpcomm-hier,pml-dr,pml-crcp2,pml-cm,crcp,pml-v
+with_valgrind=no
diff --git a/contrib/platform/cisco/suder/optimized.conf b/contrib/platform/cisco/ludd-1/optimized.conf
similarity index 67%
rename from contrib/platform/cisco/suder/optimized.conf
rename to contrib/platform/cisco/ludd-1/optimized.conf
index 923a3c9e1a..20e8e076b4 100644
--- a/contrib/platform/cisco/suder/optimized.conf
+++ b/contrib/platform/cisco/ludd-1/optimized.conf
@@ -1,15 +1,5 @@
 #
-# 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 (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -63,17 +53,11 @@ mca_component_show_load_errors = 0
 orte_abort_timeout = 10 
 opal_set_max_sys_limits = 1
 
-## MPI behavior
-## Do NOT specify mpi_leave_pinned so system
-## can figure out for itself whether or not
-## it is supported and usable
-
-## Protect looped collectives
-coll_sync_priority = 100
-coll_sync_barrier_before = 1000
-
-## Activate hierarchical collectives
-coll_hierarch_priority = 90
+# ORTE behavior
+rmaps = resilient
+ess = cm
+routed = cm
+plm = rsh
 
 ## Add the interface for out-of-band communication
 ## and set it up
@@ -81,10 +65,5 @@ oob_tcp_listen_mode = listen_thread
 oob_tcp_sndbuf = 32768
 oob_tcp_rcvbuf = 32768
 
-## Define the MPI interconnects
-btl = sm,tcp,self 
-
-## Setup MPI options
-mpi_show_handle_leaks = 1
-mpi_warn_on_fork = 1
-mpi_abort_print_stack = 1
+# Define the interface for multicast
+rmcast_base_if_include = 10.0
diff --git a/contrib/platform/cisco/suder/optimized b/contrib/platform/cisco/suder/optimized
deleted file mode 100644
index f14d9a4971..0000000000
--- a/contrib/platform/cisco/suder/optimized
+++ /dev/null
@@ -1,26 +0,0 @@
-enable_dlopen=no
-enable_mem_debug=no
-enable_mem_profile=no
-enable_memchecker=no
-enable_debug_symbols=no
-enable_binaries=yes
-enable_heterogeneous=no
-enable_debug=no
-enable_shared=yes
-enable_static=yes
-enable_ipv6=no
-enable_mpi_f77=no
-enable_mpi_f90=no
-enable_mpi_cxx=yes
-enable_mpi_cxx_seek=yes
-enable_cxx_exceptions=no
-enable_ft_thread=no
-enable_per_user_config_files=no
-enable_orterun_prefix_by_default=yes
-enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-tcp
-enable_contrib_no_build=libnbc,vt
-with_slurm=no
-with_openib=no
-with_devel_headers=yes
-with_memory_manager=ptmalloc2
-with_valgrind=no