diff --git a/util/update_copyrights b/util/update_copyrights
index e94af10153..927e85b7ac 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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.50 2007/08/28 02:12:55 marka Exp $
+# $Id: update_copyrights,v 1.51 2008/01/18 00:43:22 marka Exp $
 
 require 5.002;
 
@@ -431,9 +431,26 @@ foreach $file (keys %file_types) {
 	                print TARGET "\n";
                 }
 
-                undef $/;
-                $_ = <SOURCE>;
-                $/ = "\n";
+		if ($type eq "C" && $sysyears =~ /2008/) {
+			my $body = "";
+			while (<SOURCE>) {
+			# Process leading white space.
+			# Remove 1-7 spaces followed by a tab into a single
+			# tab if at start of line or proceeded by tabs.
+			s/^(\t*) {1,7}\t/$1\t/ while (/^\t* {1,7}\t/);
+			# Convert 8 spaces into tabs if at start of line
+			# or preceeded by tabs.
+			s/^(\t*)        /$1\t/ while (/^\t*        /);
+			# Remove trailing white space.
+			s/[ \t]*$//;
+				$body = "$body$_";
+			}
+			$_ = $body;
+		} else {
+			undef $/;
+			$_ = <SOURCE>;
+			$/ = "\n";
+		}
 
 		if ($type eq 'SGML' && m:<articleinfo>.*?</articleinfo>:s) {
 			# print "docinfo: $file\n";