diff --git a/contrib/build-mca-comps-outside-of-tree/README.txt b/contrib/build-mca-comps-outside-of-tree/README.txt
index f5e7184d4f..fce235fe3d 100644
--- a/contrib/build-mca-comps-outside-of-tree/README.txt
+++ b/contrib/build-mca-comps-outside-of-tree/README.txt
@@ -43,9 +43,9 @@ they can likely build off the source tree that they already used.
 Example project contents
 ========================
 
-The "tcp2" component is a direct copy of the TCP BTL -- it has just
-been renamed so that it can be built separately and installed
-alongside the real TCP BTL component.
+The "tcp2" component is a direct copy of the TCP BTL as of January
+2011 -- it has just been renamed so that it can be built separately
+and installed alongside the real TCP BTL component.
 
 Most of the mojo for both methods is handled in the example
 components' configure.ac, but the same techniques are applicable
diff --git a/contrib/build-mca-comps-outside-of-tree/autogen.sh b/contrib/build-mca-comps-outside-of-tree/autogen.sh
index d69ef09e68..4720d5576b 100755
--- a/contrib/build-mca-comps-outside-of-tree/autogen.sh
+++ b/contrib/build-mca-comps-outside-of-tree/autogen.sh
@@ -1,2 +1,10 @@
-:
+#!/bin/sh
+# Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
 autoreconf -ivf
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.addr.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.addr.h
index 5425f65895..531c2d5d27 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.addr.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.addr.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c
index 47698c1ca4..dcdca4f47a 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c
@@ -11,6 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  *
  * $COPYRIGHT$
  * 
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.h
index 886e2a0c33..0e9021fbff 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.h
@@ -10,6 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_addr.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_addr.h
index 5425f65895..531c2d5d27 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_addr.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_addr.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c
index 54a94df5a9..1ffb388683 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2009      Oak Ridge National Laboratory
  * $COPYRIGHT$
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c
index b6e6cef1da..09b273947c 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c
@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2007-2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.h
index 5ee698b536..bfa01a1435 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.c
index 35914d27c5..b65f22831d 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.c
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.c
@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.h
index 5544199da9..8d5c1797f5 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_frag.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.c
index 92438cf596..4fa38e3103 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.c
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.c
@@ -11,6 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  *
  * $COPYRIGHT$
  * 
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.h
index bbca866e73..38bff62636 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_ft.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_hdr.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_hdr.h
index 377d8ca2af..3036765055 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_hdr.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_hdr.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c
index 7542332b46..1b15fd2987 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c
@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008-2010 Oracle and/or its affiliates.  All rights reserved
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.h b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.h
index cfb4c02fd9..98f460841e 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.h
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.h
@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/contrib/build-mca-comps-outside-of-tree/configure.ac b/contrib/build-mca-comps-outside-of-tree/configure.ac
index 2433905613..87690fba2b 100644
--- a/contrib/build-mca-comps-outside-of-tree/configure.ac
+++ b/contrib/build-mca-comps-outside-of-tree/configure.ac
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow