diff --git a/contrib/platform/lanl/rr-class/debug-nopanasas-nocell.conf b/contrib/platform/lanl/rr-class/debug-nopanasas-nocell.conf
index 11d8bad6c2..c0d1cc5231 100644
--- a/contrib/platform/lanl/rr-class/debug-nopanasas-nocell.conf
+++ b/contrib/platform/lanl/rr-class/debug-nopanasas-nocell.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/rr-class/debug-nopanasas.conf b/contrib/platform/lanl/rr-class/debug-nopanasas.conf
index 11d8bad6c2..c0d1cc5231 100644
--- a/contrib/platform/lanl/rr-class/debug-nopanasas.conf
+++ b/contrib/platform/lanl/rr-class/debug-nopanasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/rr-class/debug-panasas-nocell.conf b/contrib/platform/lanl/rr-class/debug-panasas-nocell.conf
index 11d8bad6c2..c0d1cc5231 100644
--- a/contrib/platform/lanl/rr-class/debug-panasas-nocell.conf
+++ b/contrib/platform/lanl/rr-class/debug-panasas-nocell.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/rr-class/debug-panasas.conf b/contrib/platform/lanl/rr-class/debug-panasas.conf
index 11d8bad6c2..c0d1cc5231 100644
--- a/contrib/platform/lanl/rr-class/debug-panasas.conf
+++ b/contrib/platform/lanl/rr-class/debug-panasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/rr-class/optimized-nopanasas-nocell.conf b/contrib/platform/lanl/rr-class/optimized-nopanasas-nocell.conf
index c201c1d10c..28332c8135 100644
--- a/contrib/platform/lanl/rr-class/optimized-nopanasas-nocell.conf
+++ b/contrib/platform/lanl/rr-class/optimized-nopanasas-nocell.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/rr-class/optimized-nopanasas.conf b/contrib/platform/lanl/rr-class/optimized-nopanasas.conf
index 692a7da00d..0194c1692f 100644
--- a/contrib/platform/lanl/rr-class/optimized-nopanasas.conf
+++ b/contrib/platform/lanl/rr-class/optimized-nopanasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/rr-class/optimized-panasas-nocell.conf b/contrib/platform/lanl/rr-class/optimized-panasas-nocell.conf
index c201c1d10c..28332c8135 100644
--- a/contrib/platform/lanl/rr-class/optimized-panasas-nocell.conf
+++ b/contrib/platform/lanl/rr-class/optimized-panasas-nocell.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/rr-class/optimized-panasas.conf b/contrib/platform/lanl/rr-class/optimized-panasas.conf
index 692a7da00d..0194c1692f 100644
--- a/contrib/platform/lanl/rr-class/optimized-panasas.conf
+++ b/contrib/platform/lanl/rr-class/optimized-panasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,7 +66,7 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 500
+orte_startup_timeout = 1000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
diff --git a/contrib/platform/lanl/tlcc/debug-nopanasas.conf b/contrib/platform/lanl/tlcc/debug-nopanasas.conf
index 4b4a75385b..ac699eb301 100644
--- a/contrib/platform/lanl/tlcc/debug-nopanasas.conf
+++ b/contrib/platform/lanl/tlcc/debug-nopanasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,6 +66,9 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 orte_report_launch_progress = 1
 
+# Define timeout for daemons to report back during launch
+orte_startup_timeout = 1000
+
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
 orte_tmpdir_base = /tmp
diff --git a/contrib/platform/lanl/tlcc/debug-panasas.conf b/contrib/platform/lanl/tlcc/debug-panasas.conf
index 4b4a75385b..ac699eb301 100644
--- a/contrib/platform/lanl/tlcc/debug-panasas.conf
+++ b/contrib/platform/lanl/tlcc/debug-panasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,6 +66,9 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 orte_report_launch_progress = 1
 
+# Define timeout for daemons to report back during launch
+orte_startup_timeout = 1000
+
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
 orte_tmpdir_base = /tmp
diff --git a/contrib/platform/lanl/tlcc/optimized-nopanasas.conf b/contrib/platform/lanl/tlcc/optimized-nopanasas.conf
index c245036ff2..c47624a8a7 100644
--- a/contrib/platform/lanl/tlcc/optimized-nopanasas.conf
+++ b/contrib/platform/lanl/tlcc/optimized-nopanasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,6 +66,9 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 orte_report_launch_progress = 1
 
+# Define timeout for daemons to report back during launch
+orte_startup_timeout = 1000
+
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
 orte_tmpdir_base = /tmp
diff --git a/contrib/platform/lanl/tlcc/optimized-panasas.conf b/contrib/platform/lanl/tlcc/optimized-panasas.conf
index c245036ff2..c47624a8a7 100644
--- a/contrib/platform/lanl/tlcc/optimized-panasas.conf
+++ b/contrib/platform/lanl/tlcc/optimized-panasas.conf
@@ -10,6 +10,8 @@
 # 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) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -64,6 +66,9 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 orte_report_launch_progress = 1
 
+# Define timeout for daemons to report back during launch
+orte_startup_timeout = 1000
+
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
 orte_tmpdir_base = /tmp