diff --git a/util/merge_copyrights b/util/merge_copyrights
index 09231beec6..483f0d4318 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,7 +1,7 @@
 #!/usr/local/bin/perl -w
 #
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1998-2002  Internet Software Consortium.
+# Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.16.2.3 2004/03/09 06:12:47 marka Exp $
+# $Id: merge_copyrights,v 1.16.2.4 2004/08/17 00:00:06 marka Exp $
 
 %file_types = ();
 %file_years = ();
@@ -51,7 +51,10 @@ while (<FILES>) {
 	# .in files are processed by configure to produce the target file.
 	($base = $_) =~ s/\.in$//;
 
-	if ($base =~ /\.(c|h|css)$/) {
+	# Contributed code should maintain its own copyright.
+	if ($base =~ /\.\/contrib\//) {
+	     $file_types{$_} = "X";
+	} elsif ($base =~ /\.(c|h|css)$/) {
 	    $file_types{$_} = "C";
         } elsif ($base =~ /\.y$/) {
 	    $file_types{$_} = "YACC";
@@ -59,6 +62,8 @@ while (<FILES>) {
 	    $file_types{$_} = "PERL";
         } elsif ($base =~ /\.sh$/) {
 	    $file_types{$_} = "SH";
+        } elsif ($base =~ /\.docbook$/) {
+	    $file_types{$_} = "SGML";
         } elsif ($base =~ /\.html$/) {
 	    $file_types{$_} = "HTML";
         } elsif ($base =~ /\.(man|[0-9])$/) {