diff --git a/install/newnode_sshkeys/GNUmakefile.in b/install/newnode_sshkeys/GNUmakefile.in
index 5503b89f8c7db2dc62e76564c8fe4a07bf201438..37b3e0e32110fda3c6481b80d438d34810c4eed1 100644
--- a/install/newnode_sshkeys/GNUmakefile.in
+++ b/install/newnode_sshkeys/GNUmakefile.in
@@ -1,4 +1,8 @@
 #
+# EMULAB-COPYRIGHT
+# Copyright (c) 2003 University of Utah and the Flux Group.
+# All rights reserved.
+#
 # For installation.
 #
 SRCDIR		= @srcdir@
diff --git a/tbsetup/ns2ir/elabinelab-withfsnode.ns b/tbsetup/ns2ir/elabinelab-withfsnode.ns
index 2c22d208a940277569f05c4c79f7bd1fd56493d7..db2330879b4f4c3d7b7b3d261b0b58f75842fcf5 100644
--- a/tbsetup/ns2ir/elabinelab-withfsnode.ns
+++ b/tbsetup/ns2ir/elabinelab-withfsnode.ns
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004-2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This file is intended to be included into another NS file. It is not
 # a stand alone file.
diff --git a/tbsetup/ns2ir/elabinelab.ns b/tbsetup/ns2ir/elabinelab.ns
index 07f70040f582f3fd588ada1bb78c8f5c77962577..a1eb13f1152d832e968367a22cb741ae2ef97ea7 100644
--- a/tbsetup/ns2ir/elabinelab.ns
+++ b/tbsetup/ns2ir/elabinelab.ns
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004-2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This file is intended to be included into another NS file. It is not
 # a stand alone file.
diff --git a/tbsetup/ns2ir/fw.ns b/tbsetup/ns2ir/fw.ns
index 19122dfaaf7f7b2085826dffea3c40ef05df89c1..83e219c545a5e4b25df6a94fbac1646400b50c32 100644
--- a/tbsetup/ns2ir/fw.ns
+++ b/tbsetup/ns2ir/fw.ns
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004-2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This file is intended to be included into another NS file. It is not
 # a stand alone file.
diff --git a/tbsetup/plab/etc/fixsudo.sh b/tbsetup/plab/etc/fixsudo.sh
index bb3c3a67bb824afe0c171f24721fc39cb6c57ffd..38bb3a027b8d174f973ffe98866291a5f27810d6 100755
--- a/tbsetup/plab/etc/fixsudo.sh
+++ b/tbsetup/plab/etc/fixsudo.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004 University of Utah and the Flux Group.
+# All rights reserved.
+#
 
 TMPSUDOERS=/tmp/sudoers
 ME=`whoami`
diff --git a/tbsetup/plab/plabmon_badpool.pm.in b/tbsetup/plab/plabmon_badpool.pm.in
index f43972c7f0e3a4414939d4a7d05300c2df3f2ff9..3443f5f4a4361ce82322dd9ac14e12d4ff81e860 100644
--- a/tbsetup/plab/plabmon_badpool.pm.in
+++ b/tbsetup/plab/plabmon_badpool.pm.in
@@ -1,6 +1,6 @@
 # -*- perl -*-
 #
-# EMULAB-LGPL
+# EMULAB-COPYRIGHT
 # Copyright (c) 2000-2005 University of Utah and the Flux Group.
 # All rights reserved.
 #
diff --git a/tbsetup/plab/plabmon_goodpool.pm.in b/tbsetup/plab/plabmon_goodpool.pm.in
index e5b3898fd090639e1201150c3c68c21002f32311..6a5329a1e1e7217ed9daccb0521e89950d7523f9 100644
--- a/tbsetup/plab/plabmon_goodpool.pm.in
+++ b/tbsetup/plab/plabmon_goodpool.pm.in
@@ -1,6 +1,6 @@
 # -*- perl -*-
 #
-# EMULAB-LGPL
+# EMULAB-COPYRIGHT
 # Copyright (c) 2000-2005 University of Utah and the Flux Group.
 # All rights reserved.
 #
diff --git a/tbsetup/plab/procmail.plab b/tbsetup/plab/procmail.plab
index f0da0a9ff2f8665fde011313bec61960622e878b..c8de9b7ef0a1abc2e9377e44368a69dbe50e778b 100644
--- a/tbsetup/plab/procmail.plab
+++ b/tbsetup/plab/procmail.plab
@@ -1,3 +1,8 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
 LOGFILE=/tmp/procmail-slice-plab.log
 VERBOSE=on
 SLICE_ALIAS_DIR=/etc/mail/plab-slice-addrs
diff --git a/testsuite/test-defs b/testsuite/test-defs
index 8b9e9ecb16baa08a177fcf33c7c7c760acf1a272..5bd72fc78746a665ae0cfe21aa046b6a4005f41e 100644
--- a/testsuite/test-defs
+++ b/testsuite/test-defs
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2003 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This is the defaults definitions file for configure.
 #
diff --git a/utils/node_testsuite b/utils/node_testsuite
index 894ae79268a92d5c12eca8ad2865794cce3ca567..c0f78cae5b6545e404b2ea345cf5b0f997df7828 100755
--- a/utils/node_testsuite
+++ b/utils/node_testsuite
@@ -1,4 +1,9 @@
 #!/usr/bin/perl -w
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2003, 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
 
 use strict;
 
diff --git a/utils/tbbuildkernels b/utils/tbbuildkernels
index fee35616b5c10ad20a6d172cffae417e03f9b8be..a4473eef9dc1b6be1df5256f3fbfb2d7187721f6 100755
--- a/utils/tbbuildkernels
+++ b/utils/tbbuildkernels
@@ -1,4 +1,10 @@
 #!/usr/bin/perl -w
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # tbbuildkernels - a little script for building and installing the
 #
diff --git a/utils/withadminprivs b/utils/withadminprivs
index b03846c490882d63a8175e00df09542f362cd782..844763aafc93b1cc9e5cc764bf843cc00e9b51b3 100644
--- a/utils/withadminprivs
+++ b/utils/withadminprivs
@@ -1,4 +1,10 @@
 #!/bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2002 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # Simple script to run a command with testbed admin privs turned on
 #
diff --git a/www/doc/users.html b/www/doc/users.html
index 7c23eec53fa71138ec0d0efef20a4d5ba2d0f24a..e1234557bf4098a91e4cb2fdc987f1a2ab5ddc32 100644
--- a/www/doc/users.html
+++ b/www/doc/users.html
@@ -1,3 +1,9 @@
+<!--
+   EMULAB-COPYRIGHT
+   Copyright (c) 2003 University of Utah and the Flux Group.
+   All rights reserved.
+  -->
+<!--- This exists to redirect to the PHP script -->
 <ul>
 <li>
 <font size="+1">
diff --git a/www/error.shtml b/www/error.shtml
index ca5037f33b7b58308b70f977ae0a6fe9c3ecf887..6034a1cc6f2aae99fadba67c34a6d93ab13c21c8 100644
--- a/www/error.shtml
+++ b/www/error.shtml
@@ -1,3 +1,9 @@
+<!--
+   EMULAB-COPYRIGHT
+   Copyright (c) 2001-2003 University of Utah and the Flux Group.
+   All rights reserved.
+  -->
+<!--- This exists to redirect to the PHP script -->
 <html>
 <head>
 	<title>Emulab.Net - Access Error</title>
diff --git a/www/ssh-mime.c b/www/ssh-mime.c
index 97a70c44b0dc7ce36504c6dae7b6465ed98144a5..d70e3bb1004ddaf5d5b19a08529dea863e114a8e 100644
--- a/www/ssh-mime.c
+++ b/www/ssh-mime.c
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2004 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Compile on cygwin with gcc -mwindows -mno-cygwin -o ssh-mime ssh-mime.c */
 /* Set the env PUTTY_CMD to the path of where you have put putty */
 #include <stdio.h>