diff --git a/robots/emc/test_emcd.sh.in b/robots/emc/test_emcd.sh.in
index 6de734a8dbd65f46a10b85df936fe7685f38d598..74d0e4ca73e8b444a8584a41f9f8ea906ebd1448 100644
--- a/robots/emc/test_emcd.sh.in
+++ b/robots/emc/test_emcd.sh.in
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 ## Variables
 
 # The full path of the test case
diff --git a/robots/mtp/listNode.c b/robots/mtp/listNode.c
index 4c66173db8c4f0bec59939da6aac679088c78b4a..b1b864cd137958cf1ed601b36b88fc20f6670341 100644
--- a/robots/mtp/listNode.c
+++ b/robots/mtp/listNode.c
@@ -1,12 +1,7 @@
 /*
- * listNode.c
- *
- * Copyright (c) 2003, 2004, 2005 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/robots/mtp/listNode.h b/robots/mtp/listNode.h
index e77b94dd61380db17a2ccf3f5a68ab19dfe50248..eb513641556ef11d8463f161969e995754214bc4 100644
--- a/robots/mtp/listNode.h
+++ b/robots/mtp/listNode.h
@@ -1,12 +1,7 @@
 /*
- * listNode.h
- *
- * Copyright (c) 2003, 2004, 2005 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/robots/mtp/mtp_test.c b/robots/mtp/mtp_test.c
index 5da90325f1cc70d361d186179de3512a3ecd50aa..ff51afb071bb443f2b5968ae471883f724096424 100644
--- a/robots/mtp/mtp_test.c
+++ b/robots/mtp/mtp_test.c
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
 
 #include "config.h"
 
diff --git a/robots/primotion/Makefile b/robots/primotion/Makefile
index 4ff2a292824215cb5e36b6ee33fe2a38664c63ce..58d4d37de93220feeb9c67d02d20bc397b643c88 100755
--- a/robots/primotion/Makefile
+++ b/robots/primotion/Makefile
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 # Makefile for Garcia robot applications
 #
 # Dan Flickinger
diff --git a/robots/primotion/circle.cc b/robots/primotion/circle.cc
index 001022675543b5c9e0e2dc4a9486f74a1bf99f91..10657342953a560ac1e594026933dd2d377d3ad3 100755
--- a/robots/primotion/circle.cc
+++ b/robots/primotion/circle.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* circle: garcia robot simple circle path
  * (Tests grobot::setvPath(float, float))
  *
diff --git a/robots/primotion/commotion.cc b/robots/primotion/commotion.cc
index bb7519238ea09de1920ccab1096409b80cd0ba63..201569cfa18c30c6f9e26dc74ca755d8cd18146c 100755
--- a/robots/primotion/commotion.cc
+++ b/robots/primotion/commotion.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Garcia robot motion program (command and interactive mode)
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/commotion.h b/robots/primotion/dgrobot/commotion.h
index 107d5490b6ad60c7bbfb9c1cbc13b776531bdc44..bf0fa88d70aa73e31042e01d67def0522e69567d 100755
--- a/robots/primotion/dgrobot/commotion.h
+++ b/robots/primotion/dgrobot/commotion.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Garcia motion program (command and interactive mode)
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/cubicpath.h b/robots/primotion/dgrobot/cubicpath.h
index f1860d8f5bd06d163b36d1b23a2acb6be7cccd85..ad4d98666b231f3eebca0cf4786f836af92ffa1d 100755
--- a/robots/primotion/dgrobot/cubicpath.h
+++ b/robots/primotion/dgrobot/cubicpath.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* cubicpath.h
  *
  * class with methods for generating cubic paths
diff --git a/robots/primotion/dgrobot/gbehaviors.cc b/robots/primotion/dgrobot/gbehaviors.cc
index 7f44181369bdc9437b65f22071bed64339c09719..53e8cac382530810a8d3251ae1810adad1494983 100644
--- a/robots/primotion/dgrobot/gbehaviors.cc
+++ b/robots/primotion/dgrobot/gbehaviors.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Garcia robot behavior class methods
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/gbehaviors.h b/robots/primotion/dgrobot/gbehaviors.h
index babd5bb3511d17affb0c0e595445d3b6bc5fdf13..4c203f00ed7d89ec9fa5b8110acbc0d44c261a00 100644
--- a/robots/primotion/dgrobot/gbehaviors.h
+++ b/robots/primotion/dgrobot/gbehaviors.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Garcia robot behavior data class
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/gcallbacks.cc b/robots/primotion/dgrobot/gcallbacks.cc
index 474ab53d036d73bd19a79899640e609242fd94e8..ddd8d3457d953778858ca2aefa19c848567f9f18 100755
--- a/robots/primotion/dgrobot/gcallbacks.cc
+++ b/robots/primotion/dgrobot/gcallbacks.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Garcia robot callback class methods
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/gcallbacks.h b/robots/primotion/dgrobot/gcallbacks.h
index b2a8e4ec3c768c403a25604d3dcd9ed725e9b10d..8589e9cfe8ea97f910d2ebaaaeb696b6fd3c1b0b 100755
--- a/robots/primotion/dgrobot/gcallbacks.h
+++ b/robots/primotion/dgrobot/gcallbacks.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Callback functions for garcia robot
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/grobot.cc b/robots/primotion/dgrobot/grobot.cc
index 7657921a01dc06563e26bc63858e03c44399f192..847a6e6ec313ae173cde11c56ca31b36237647c8 100755
--- a/robots/primotion/dgrobot/grobot.cc
+++ b/robots/primotion/dgrobot/grobot.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Garcia robot class methods
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/grobot.h b/robots/primotion/dgrobot/grobot.h
index a65da394bed652c482536a0e6e5912e3ce4eabac..a02f9f430c4c57fdba616f0a8529901887e034c1 100755
--- a/robots/primotion/dgrobot/grobot.h
+++ b/robots/primotion/dgrobot/grobot.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Garcia robot class
  *
  * Dan Flickinger
diff --git a/robots/primotion/dgrobot/grobot_sim.cc b/robots/primotion/dgrobot/grobot_sim.cc
index b9ae55735cd8c14950a9b78a014704e0fee106a7..67d2f50d4fe67b67ccb6b9f1ba1388c91b9c0bd7 100644
--- a/robots/primotion/dgrobot/grobot_sim.cc
+++ b/robots/primotion/dgrobot/grobot_sim.cc
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
 
 #include "config.h"
 
diff --git a/robots/primotion/dgrobot/simplepath.cc b/robots/primotion/dgrobot/simplepath.cc
index bec6c47b1ed0a330be8687631419d87c89368d1d..4a2ba198d57343373af0cb33e2ad2370bed25408 100755
--- a/robots/primotion/dgrobot/simplepath.cc
+++ b/robots/primotion/dgrobot/simplepath.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* simplepath.cc
  * methods for spathseg class; simple path segment generator
  *
diff --git a/robots/primotion/dgrobot/simplepath.h b/robots/primotion/dgrobot/simplepath.h
index cb545db2dc602e29be077a041cc788f97faec390..aabb08921fa18e656baeffd818895efa7834ddb0 100755
--- a/robots/primotion/dgrobot/simplepath.h
+++ b/robots/primotion/dgrobot/simplepath.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* simplepath.h
  * class with methods for generating simple paths
  *
diff --git a/robots/primotion/flash-user-led.cc b/robots/primotion/flash-user-led.cc
index d4a8a392ebbd628a9338760a3af6ffca34eca283..dbd24419879082bb3ec04e65c2b5c9bfcb7cf17c 100644
--- a/robots/primotion/flash-user-led.cc
+++ b/robots/primotion/flash-user-led.cc
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
 
 #include "config.h"
 
diff --git a/robots/primotion/garcia-pilot.hh b/robots/primotion/garcia-pilot.hh
index 20cf74d1e443824d9834a882e854a5fe6c7f55e7..2b85d5ec39114c3682eea0cbdc3df62cf69d184a 100644
--- a/robots/primotion/garcia-pilot.hh
+++ b/robots/primotion/garcia-pilot.hh
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
 
 #ifndef _garcia_pilot_hh
 #define _garcia_pilot_hh
diff --git a/robots/primotion/gorobot.cc b/robots/primotion/gorobot.cc
index 2a7908faf2d5619899d064d30565bc30b0984b01..0ed11535ca9c24d6109b6d96b5d006902ef8c9e8 100755
--- a/robots/primotion/gorobot.cc
+++ b/robots/primotion/gorobot.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* gorobot.cc
  *
  * Sends the robot to points via the 
diff --git a/robots/primotion/gorobotc.cc b/robots/primotion/gorobotc.cc
index cc12418aa2121f14395112545823670c09f931a4..6d176977c484af894f72f279970e334ed007a0ee 100644
--- a/robots/primotion/gorobotc.cc
+++ b/robots/primotion/gorobotc.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* gorobotc.cc
  *
  * Console application to drive robot using grobot::goto()
diff --git a/robots/primotion/pathmotion.cc b/robots/primotion/pathmotion.cc
index b43ef02f791fcf3ba65d413dc0c6368669b535ab..c9c77179b9f1504419a37ab143fb9dfda10c5fdf 100755
--- a/robots/primotion/pathmotion.cc
+++ b/robots/primotion/pathmotion.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* pathmotion: garcia robot path generator
  *
  * Dan Flickinger
diff --git a/robots/primotion/watch-user-button.cc b/robots/primotion/watch-user-button.cc
index abf869a08d627eece799fa836834efca53ffd256..f5c8ab2994298655e1411155b234160a03cead41 100644
--- a/robots/primotion/watch-user-button.cc
+++ b/robots/primotion/watch-user-button.cc
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
 
 #include "config.h"
 
diff --git a/robots/rmcd/test_rmcd.sh.in b/robots/rmcd/test_rmcd.sh.in
index 8989faca8a6e17203cc3e54b53ba60a3cb9d2a74..7ac042817ac7aa3902c9cba4b9b956c64ac9359d 100644
--- a/robots/rmcd/test_rmcd.sh.in
+++ b/robots/rmcd/test_rmcd.sh.in
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 ## Variables
 
 # The full path of the test case
diff --git a/robots/tbsetdest/tbsetdest.cc b/robots/tbsetdest/tbsetdest.cc
index 238e27061a4671ba0208832105ec83a4e0525871..adf2a52a3609e9d6d65b7f29f8250efd964ad2b5 100644
--- a/robots/tbsetdest/tbsetdest.cc
+++ b/robots/tbsetdest/tbsetdest.cc
@@ -35,7 +35,11 @@
  *
  */
 
-
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
 
 extern "C" {
 #include <pwd.h>
diff --git a/robots/tbsetdest/tbsetdest.h b/robots/tbsetdest/tbsetdest.h
index bd5343d0afc94e011ee2b1bc4f57e9d22591a085..d9dac763aaa6aa97c04cfdc49927675ec8c441c0 100644
--- a/robots/tbsetdest/tbsetdest.h
+++ b/robots/tbsetdest/tbsetdest.h
@@ -1,4 +1,45 @@
 
+/*
+ * Copyright (c) 1997, 1998, 2005 Carnegie Mellon University.  All Rights
+ * Reserved. 
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation is hereby granted (including for
+ * commercial or for-profit use), provided that both the copyright notice
+ * and this permission notice appear in all copies of the software,
+ * derivative works, or modified versions, and any portions thereof, and
+ * that both notices appear in supporting documentation, and that credit
+ * is given to Carnegie Mellon University in all publications reporting
+ * on direct or indirect use of this code or its derivatives.
+ * 
+ * ALL CODE, SOFTWARE, PROTOCOLS, AND ARCHITECTURES DEVELOPED BY THE CMU
+ * MONARCH PROJECT ARE EXPERIMENTAL AND ARE KNOWN TO HAVE BUGS, SOME OF
+ * WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON PROVIDES THIS
+ * SOFTWARE OR OTHER INTELLECTUAL PROPERTY IN ITS ``AS IS'' CONDITION,
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE OR
+ * INTELLECTUAL PROPERTY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * 
+ * Carnegie Mellon encourages (but does not require) users of this
+ * software or intellectual property to return any improvements or
+ * extensions that they make, and to grant Carnegie Mellon the rights to
+ * redistribute these changes without encumbrance.
+ */
+
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 #ifndef __tbsetdest_h__
 #define __tbsetdest_h__
 
diff --git a/robots/vmcd/cam-sim.awk b/robots/vmcd/cam-sim.awk
index e8351ff4943ef849b68e06fffe7cf3e78e9481c7..bb7d1f2f5fe7ac5af5f3503e177c17e100ee6610 100755
--- a/robots/vmcd/cam-sim.awk
+++ b/robots/vmcd/cam-sim.awk
@@ -1,4 +1,11 @@
 #! /usr/bin/awk -f
+
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 # 
 # cam-sim.awk - Simulate imaging of a floor grid into an overhead wide-angle camera.
 # The default output is rows and then columns of grid points for gnuplot.
diff --git a/robots/vmcd/test_vmc-client.sh.in b/robots/vmcd/test_vmc-client.sh.in
index 0e21aded08b05ed38797fbfdba56b2d3da705de3..2e17d7f988856a7548f5a3dab257cbd824c966f6 100644
--- a/robots/vmcd/test_vmc-client.sh.in
+++ b/robots/vmcd/test_vmc-client.sh.in
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 ## Variables
 
 # The full path of the test case
diff --git a/robots/vmcd/test_vmcd.sh.in b/robots/vmcd/test_vmcd.sh.in
index 44e25a53b78b3f0e06e5c9ad739ca70f5f42ae0b..451bbecd4e30004b6ac1c21e89de5fe08acadcb3 100644
--- a/robots/vmcd/test_vmcd.sh.in
+++ b/robots/vmcd/test_vmcd.sh.in
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 ## Variables
 
 # The full path of the test case
diff --git a/robots/vmcd/test_vmcd2.sh b/robots/vmcd/test_vmcd2.sh
index cf11e29eb0e2abfba730070cd3e069288b591126..c266fef3ade3a28ada7e906f32f18d68a7d515ae 100644
--- a/robots/vmcd/test_vmcd2.sh
+++ b/robots/vmcd/test_vmcd2.sh
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 ## Variables
 
 # The full path of the test case
diff --git a/robots/vmcd/test_vmcd3.sh b/robots/vmcd/test_vmcd3.sh
index 44d6733f89fc516f851408799c25e52cedf88358..e86cb63c61f075ed62bd0fee108772477998f922 100644
--- a/robots/vmcd/test_vmcd3.sh
+++ b/robots/vmcd/test_vmcd3.sh
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 ## Variables
 
 # The full path of the test case
diff --git a/robots/vmcd/test_vmcd4.sh b/robots/vmcd/test_vmcd4.sh
index 84ba8c559cbdbec2c43c785bfe74c01704082a3c..87ffb97fd401aace46db3f687adeb8f3dc9f4796 100644
--- a/robots/vmcd/test_vmcd4.sh
+++ b/robots/vmcd/test_vmcd4.sh
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 ## Variables
 
 # The full path of the test case