diff --git a/util/update_copyrights b/util/update_copyrights
index 8bf10623ec..e94af10153 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -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.49 2007/06/18 05:59:26 marka Exp $
+# $Id: update_copyrights,v 1.50 2007/08/28 02:12:55 marka Exp $
 
 require 5.002;
 
@@ -377,8 +377,10 @@ foreach $file (keys %file_types) {
         $anchor_year = 0;
 	$years = "";
 	$anchor_end = length($years);
+	my $andor = 0;
         foreach $year (@years) {
 		if ($year < 2004) { next; }
+		$andor = 1 if ($year >= 2007);
                 if ($last_year != 0 && $year == $last_year + 1) {
                         if ($year > $anchor_year + 1) {
                                 substr($years, $anchor_end) = "-$year";
@@ -411,6 +413,7 @@ foreach $file (keys %file_types) {
 	}
 
         foreach $_ (@otherlines) {
+		s:modify, and distribute:modify, and/or distribute: if ($andor);
                 print TARGET (/^$/ ? $nonspaceprefix : $prefix);
 		s/\@NOMYEARS\@/$nomyears/;
                 print TARGET "$_";