diff --git a/tools/relic/make-id-list b/tools/relic/make-id-list
index cdf84603e6f..ccb9cf8d3e4 100755
--- a/tools/relic/make-id-list
+++ b/tools/relic/make-id-list
@@ -13,11 +13,15 @@ my %equivalents = (
 
   "Crocodile Clips Ltd." => "Crocodile Clips Ltd",
 
+  "Hewlett-Packard Company. Portions created by Hewlett-Packard Company are Copyright" => "Hewlett-Packard Company",
+  
   "IBM" => "IBM Corporation",
   "IBM Corp" => "IBM Corporation",
   "International Business Machines Corporation" => "IBM Corporation",
 
+  "None" => "Mozilla Foundation",
   "a mozilla.org contributor" => "Mozilla Foundation",
+  "person recorded in the version control logs" => "Mozilla Foundation",
   "Mozilla" => "Mozilla Foundation",
   "Mozilla.com" => "Mozilla Corporation",
   "Mozilla.org" => "Mozilla Foundation",
@@ -37,7 +41,9 @@ my %equivalents = (
   "Netscape Communications, Inc" => "Netscape Communications Corporation",
   "Netscape Communications Corp" => "Netscape Communications Corporation",
   "Netscape Communications Corp." => "Netscape Communications Corporation",
+  "Netscape Commmunications Corp" => "Netscape Communications Corporation",
   "Netscape Communications Corp, Inc" => "Netscape Communications Corporation",
+  "Netscape Communication Corporation" => "Netscape Communications Corporation",
 
   "Novell" => "Novell Inc",
   "Novell, Inc" => "Novell Inc",
@@ -70,15 +76,14 @@ my %equivalents = (
   "Google" => "Google Inc",
   "Telephone Corporation)" => "NTT",
 
-  "Frank Schoenheit" => "Frank Schönheit",
-  "HÃ¥kan Waara" => "Håkan Waara",
-  "Karsten Düsterloh" => "Karsten Düsterloh",
-  "Simon Bünzli" => "Simon Bünzli",
-  "Vincent Béron" => "Vincent Béron",
-  "Tomas Mšller" => "Tomas Müller",
-  
-  "person recorded in the version control logs" => "Mozilla Foundation",
-  "None" => "Mozilla Foundation"
+  "Frank Schoenheit" => "Frank Schönheit",
+  "Frank Schönheit" => "Frank Schönheit",
+  "HÃ¥kan Waara" => "Håkan Waara",
+  "Håkan Waara" => "Håkan Waara",
+  "Karsten Düsterloh" => "Karsten Düsterloh",
+  "Simon Bünzli" => "Simon Bünzli",
+  "Vincent Béron" => "Vincent Béron",
+  "Tomas Mšller" => "Tomas Müller",  
 );
 
 # 'indevs' == "Initial Developers"
@@ -92,7 +97,7 @@ while (<>)
   {
     # Chop off email addresses and suchlike
     $indev =~ s/[<,\(].*$//;
-    $indev =~ s/^The\s*//i;
+    $indev =~ s/^The\s+//i;
 
     # Trim whitespace
     $indev =~ s/^\s*//;
diff --git a/tools/relic/relic b/tools/relic/relic
index 6ed9ef27476..aa5766c8aa0 100755
--- a/tools/relic/relic
+++ b/tools/relic/relic
@@ -167,7 +167,9 @@ _g_skip_file_basenames = [
     # license and readme files
     "license",
     "readme",
-
+    "copyright",
+    "LICENSE-MPL",
+    "MPL-1.1.txt",
 ]
 _g_skip_files = [
     # TODO: update with MPL block - or CVS remove (check history)
@@ -183,13 +185,6 @@ _g_skip_files = [
     "js2/COPYING",
     "security/svrcore/LICENSE",
     "extensions/xmlterm/doc/MPL",
-    "xpinstall/wizard/unix/src2/MPL-1.1.txt",
-    "nsprpub/pkg/solaris/common_files/copyright",
-    "security/nss/pkg/solaris/common_files/copyright",
-    "security/jss/pkg/solaris/common_files/copyright",
-    "security/nss/lib/freebl/mpi/utils/LICENSE-MPL",
-    "security/nss/lib/freebl/mpi/tests/LICENSE-MPL",
-    "security/nss/lib/freebl/mpi/doc/LICENSE-MPL",
     "gfx/cairo/cairo/COPYING-LGPL-2.1",
     "gfx/cairo/cairo/COPYING-MPL-1.1",
     
@@ -273,15 +268,11 @@ _g_skip_dirs = [
         
     # As per the "New Original Source Files" section of:
     #   http://www.mozilla.org/MPL/license-policy.html
+    #   with obsolete or now-relicensed directories removed
     "apache",             # Obsolete mod_gzip code
     "cck",                # mkaply's baby; not core code anyway.
     "dbm",
-#    "directory/java-sdk", # Java LDAP SDK
-    "directory/perldap",  # Perl LDAP SDK
-    "ef",                 # Multi-platform Java JIT
-    "grendel",            # Mail client in Java
     "js/rhino",           # Currently MPL/GPL - may end up BSD
-    "mstone",             # Mail server performance testing tool
     "webtools",           # Various MPLed webtools
     
     # These could be done, but no-one's clamouring for it, and it's a hassle
@@ -463,6 +454,7 @@ _g_ext_to_comment_info = {
     ".MAK":        (["#"], ),
     ".perl":       (["#"], ),
     ".pl":         (["#"], ),
+    ".PL":         (["#"], ),
     ".sh":         (["#"], ),
     ".dsw":        (["#"], ),
     ".cgi":        (["#"], ),