diff --git a/util/copyrights b/util/copyrights
index b49f4ffd6a..e3c5ae3670 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1090,7 +1090,7 @@
 ./doc/.cvsignore				X	2000,2001
 ./doc/Makefile.in				MAKE	2000,2001,2004
 ./doc/arm/.cvsignore				X	2000,2001
-./doc/arm/Bv9ARM-book.xml			X	2000,2001
+./doc/arm/Bv9ARM-book.xml			SGML	2000,2001,2002,2003,2004,2005
 ./doc/arm/Bv9ARM.ch01.html			X	2000,2001
 ./doc/arm/Bv9ARM.ch02.html			X	2000,2001
 ./doc/arm/Bv9ARM.ch03.html			X	2000,2001
diff --git a/util/update_copyrights b/util/update_copyrights
index d0a7e2f2ea..86789e7924 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.35 2005/05/12 02:26:51 marka Exp $
+# $Id: update_copyrights,v 1.36 2005/05/12 07:42:35 marka Exp $
 
 require 5.002;
 
@@ -75,6 +75,25 @@ sub docbook {
 	$years_list = $file_years{$parent};
 }
 
+sub copyright {
+	my $holder = shift;
+	my $result = "";
+	return $result unless (@_);
+	$result = "$result    <copyright>\n";
+	$result = "$result      <year>$_</year>\n" foreach (@_);
+	$result = "$result      <holder>$holder</holder>\n";
+	$result = "$result    </copyright>\n";
+	return $result;
+}
+
+sub copyrights {
+	my $a = copyright("Internet Systems Consortium, Inc. (\"ISC\")",
+		   grep({ $_ >= 2004} @_));
+	my $b = copyright("Internet Software Consortium.",
+		   grep({ $_ < 2004} @_));
+	return "$a$b";
+}
+
 foreach $file (keys %file_types) {
 	$typeandowner = $file_types{$file};
 	$years_list = $file_years{$file};
@@ -396,6 +415,17 @@ foreach $file (keys %file_types) {
                 $_ = <SOURCE>;
                 $/ = "\n";
 
+		if ($type eq 'SGML' && m:<docinfo>.*?</docinfo>:s) {
+			print "docinfo: $file\n";
+			my $r = copyrights(@years);
+			s:<docinfo>.*?></docinfo>:<docinfo>\n$r  </docinfo>:s;
+		}
+		if ($type eq 'SGML' && m:<bookinfo>.*?</bookinfo>:s) {
+			print "bookinfo: $file\n";
+			my $r = copyrights(@years);
+			s:<bookinfo>.*?</bookinfo>:<bookinfo>\n$r  </bookinfo>:s;
+		}
+
                 my ($start, $end);
                 if ($start_comment ne "") {
                         ($start = $start_comment) =~ s/\s*\n/ /;