diff --git a/COPYRIGHT b/COPYRIGHT
index 05f21687c6..89c523014c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
-Permission to use, copy, modify, and distribute this software for any
+Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 
@@ -13,7 +13,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-$Id: COPYRIGHT,v 1.12 2007/01/03 04:53:20 marka Exp $
+$Id: COPYRIGHT,v 1.13 2007/06/18 05:59:26 marka Exp $
 
 Portions Copyright (C) 1996-2001  Nominum, Inc.
 
diff --git a/util/COPYRIGHT b/util/COPYRIGHT
index b73c7e96fd..938988a834 100644
--- a/util/COPYRIGHT
+++ b/util/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) @SFTYEARS@  Internet Software Consortium.
 
-Permission to use, copy, modify, and distribute this software for any
+Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 
diff --git a/util/COPYRIGHT.BSDI b/util/COPYRIGHT.BSDI
index 4be8672cf1..600838b5f5 100644
--- a/util/COPYRIGHT.BSDI
+++ b/util/COPYRIGHT.BSDI
@@ -4,7 +4,7 @@ Copyright (C) @SFTYEARS@  Internet Software Consortium.
 This code is derived from software contributed to ISC by
 Berkeley Software Design, Inc.
 
-Permission to use, copy, modify, and distribute this software for any
+Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 
diff --git a/util/COPYRIGHT.NAI b/util/COPYRIGHT.NAI
index f00313a337..8a13c7d7bb 100644
--- a/util/COPYRIGHT.NAI
+++ b/util/COPYRIGHT.NAI
@@ -1,5 +1,18 @@
 Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
 Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS
+ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 Portions Copyright (C) 1995-2000 by Network Associates, Inc.
 
 Permission to use, copy, modify, and distribute this software for any
diff --git a/util/COPYRIGHT.NOM b/util/COPYRIGHT.NOM
index a244c86a92..bb28fa3d44 100644
--- a/util/COPYRIGHT.NOM
+++ b/util/COPYRIGHT.NOM
@@ -1,5 +1,18 @@
 Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
 Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NOMINUM DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 Portions Copyright (C) @NOMYEARS@  Nominum, Inc.
 
 Permission to use, copy, modify, and distribute this software for any
diff --git a/util/COPYRIGHT.PORTION b/util/COPYRIGHT.PORTION
index 46530460bc..a16f034f11 100644
--- a/util/COPYRIGHT.PORTION
+++ b/util/COPYRIGHT.PORTION
@@ -1,7 +1,7 @@
 Portions Copyright (C) @SYSYEARS@  Internet Systems Consortium, Inc. ("ISC")
 Portions Copyright (C) @SFTYEARS@  Internet Software Consortium.
 
-Permission to use, copy, modify, and distribute this software for any
+Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 
diff --git a/util/update_copyrights b/util/update_copyrights
index 696ab0048e..8bf10623ec 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -3,7 +3,7 @@
 # Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# Permission to use, copy, modify, and distribute this software for any
+# Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
 #
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: update_copyrights,v 1.48 2007/01/05 05:56:05 marka Exp $
+# $Id: update_copyrights,v 1.49 2007/06/18 05:59:26 marka Exp $
 
 require 5.002;
 
@@ -399,22 +399,20 @@ foreach $file (keys %file_types) {
         }
 	$sysyears = $years;
 
-        ($firstline, $secondline, $thirdline, @otherlines) = @$textp;
+        ($firstline, $secondline, @otherlines) = @$textp;
 
         $firstline =~ s/\@SYSYEARS\@/$sysyears/;
         $secondline =~ s/\@SFTYEARS\@/$sftyears/;
-        $thirdline =~ s/\@NOMYEARS\@/$nomyears/;
 
         print TARGET "$prefix$firstline";
 	if ($sftyears ne "" ) {
 		print TARGET $secondline =~ /^$/ ? $nonspaceprefix : $prefix;
 		print TARGET "$secondline";
 	}
-        print TARGET $thirdline =~ /^$/ ? $nonspaceprefix : $prefix;
-	print TARGET "$thirdline";
 
         foreach $_ (@otherlines) {
                 print TARGET (/^$/ ? $nonspaceprefix : $prefix);
+		s/\@NOMYEARS\@/$nomyears/;
                 print TARGET "$_";
         }
         print TARGET $end_comment if $end_comment;