diff --git a/sensors/canaryd/canaryd.c b/sensors/canaryd/canaryd.c
index 0cf1a5e0f374866a5ce22ddc016672b546d24bc5..46d374a6f51881f0f655e02281f58624f9d8760c 100644
--- a/sensors/canaryd/canaryd.c
+++ b/sensors/canaryd/canaryd.c
@@ -1,12 +1,7 @@
 /*
- * canaryd.c
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 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/sensors/canaryd/canarydEvents.c b/sensors/canaryd/canarydEvents.c
index df810dad705b094ed81e866221d3ff836d394f46..7190ee6b6e5c57f9a399e77750e2ac1e0ed128b1 100644
--- a/sensors/canaryd/canarydEvents.c
+++ b/sensors/canaryd/canarydEvents.c
@@ -1,12 +1,7 @@
 /*
- * canarydEvents.c
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 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/sensors/canaryd/canarydEvents.h b/sensors/canaryd/canarydEvents.h
index dbc8794b1152437f57fcb01895c727580a953731..0cc3aae544593359f9a71c5aeda61bb6abb498ac 100644
--- a/sensors/canaryd/canarydEvents.h
+++ b/sensors/canaryd/canarydEvents.h
@@ -1,12 +1,7 @@
 /*
- * canarydEvents.h
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 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/sensors/canaryd/childProcess.c b/sensors/canaryd/childProcess.c
index 959a4f15af1865881880d1838e8601679ec1d8de..949a2054ae4be3a33311f2a5e9aa4e2bb43c3ee4 100644
--- a/sensors/canaryd/childProcess.c
+++ b/sensors/canaryd/childProcess.c
@@ -1,12 +1,7 @@
 /*
- * childProcess.c
- *
- * Copyright (c) 2003, 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2003-2004 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/sensors/canaryd/childProcess.h b/sensors/canaryd/childProcess.h
index d324e580c808c6981ba7ec36fa139823b6188e3f..da08d3ee9832188721660f88d9011034b8bb8f3b 100644
--- a/sensors/canaryd/childProcess.h
+++ b/sensors/canaryd/childProcess.h
@@ -1,12 +1,7 @@
 /*
- * childProcess.h
- *
- * Copyright (c) 2003, 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2003-2004 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/sensors/canaryd/networkInterface.c b/sensors/canaryd/networkInterface.c
index cf5fa79d6fe739e9534dfbdaf6cc6a7f7832eed1..8db1677181a310070de777aeb2525a88faeabced 100644
--- a/sensors/canaryd/networkInterface.c
+++ b/sensors/canaryd/networkInterface.c
@@ -1,12 +1,7 @@
 /*
- * networkInterface.c
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 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/sensors/canaryd/networkInterface.h b/sensors/canaryd/networkInterface.h
index 8f3b925e76604710fac345c1b0aaa72a7537dc27..25495fe8ec5012aa3039c76fd6521618ef29ebcc 100644
--- a/sensors/canaryd/networkInterface.h
+++ b/sensors/canaryd/networkInterface.h
@@ -1,12 +1,7 @@
 /*
- * networkInterface.h
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 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/sensors/slothd/digest-slothd b/sensors/slothd/digest-slothd
index 2c0bf062eb6cbed9c9cc93a5335c222b0b70f030..bf19efe244fc996f845d12a1b74b2352512863de 100644
--- a/sensors/slothd/digest-slothd
+++ b/sensors/slothd/digest-slothd
@@ -1,5 +1,11 @@
 #! /usr/bin/awk -f
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # Digest slothd logs and generate a TCL file that contains resource usage data
 # that can be fed back into the mapper.
diff --git a/sensors/slothd/webfeedback.in b/sensors/slothd/webfeedback.in
index b8c77cb8dcb767537fdc770ac54e4596fd18f531..964670df09a2dad78905589b8bfad5a94724b648 100644
--- a/sensors/slothd/webfeedback.in
+++ b/sensors/slothd/webfeedback.in
@@ -1,5 +1,11 @@
 #! /usr/bin/perl -wT
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 use English;
 use Getopt::Std;
 use Socket;