diff --git a/LICENSE b/LICENSE
index 1c8fa11ea..992967250 100644
--- a/LICENSE
+++ b/LICENSE
@@ -25,12 +25,13 @@ Copyright (c) 2010 Gabriel B. <gnoahb@gmail.com>
 Copyright (c) 2016 IT-assistans Sverige AB
 Copyright (c) 2009 Janne Enberg <janne.enberg@lietu.net>
 Copyright (c) 2017 Jeffrey Gentes
+Copyright (c) 2004 Jim McBeath
 Copyright (c) 2009-2014 Jim Pingle <jimp@pfsense.org>
 Copyright (c) 2012 Jonas von Andrian
 Copyright (c) 2004-2005 Jonathan Watt <jwatt@jwatt.org>
 Copyright (c) 2003-2004 Justin Ellison <justin@techadvise.com>
 Copyright (c) 2015 Manuel Faux <mfaux@conf.at>
-Copyright (c) 2003-2004 Manuel Kasper
+Copyright (c) 2003-2009 Manuel Kasper <mk@neon1.net>
 Copyright (c) 2012 Marcello Coutinho
 Copyright (c) 2010-2015 Michael Bostock
 Copyright (c) 2005-2006 Paul Taylor <paultaylor@winn-dixie.com>
@@ -41,6 +42,7 @@ Copyright (c) 2013 Renato Botelho <garga@pfsense.org>
 Copyright (c) 2015 S. Linke <dev@devsash.de>
 Copyright (c) 2007 Sam Wenham
 Copyright (c) 2007 Scott Dale
+Copyright (c) 2004-2012 Scott Ullrich
 Copyright (c) 2003-2010 Scott Ullrich <sullrich@gmail.com>
 Copyright (c) 2007-2012 Seth Mos <seth.mos@dds.nl>
 Copyright (c) 2008-2009 Shrew Soft Inc. <mgrooms@shrew.net>
diff --git a/Scripts/license b/Scripts/license
index 086182bc3..22d1cb31e 100755
--- a/Scripts/license
+++ b/Scripts/license
@@ -67,9 +67,12 @@ my %copyrights = ();
 sub process_file
 {
     my $filename = $File::Find::name;
+
     return if not -f "$cwd/$filename";
+
     my @lines = read_file( "$cwd/$filename" );
     my $possibly_bsd;
+
     for my $line ( @lines ) {
         $possibly_bsd = 1 if $line =~ /Redistribution and use in source and binary forms/i;
         if ( $line =~ /Apache License/i ) {
@@ -77,15 +80,19 @@ sub process_file
             last;
         }
     }
+
     return if not $possibly_bsd;
+
     for my $line ( @lines ) {
         my $copy = $line;
-        chomp $copy;
         next if $line !~ s/copyright\s+\(c\)\s+//i;
-        my ( $start, $end ) = ( 0, 9999 );
-        $line =~ s/(^[\*\\#\s]+|[\.\s]+$)//g;
+        $line =~ s/^[\*\\#\s]+//g;
+        $line =~ s/[\.\s]+$//g;
         $line =~ s/Inc$/Inc./;
         $line =~ s/B\.V$/B.V./;
+        chomp $copy;
+        $copy =~ s/^[\*\\#\s]+//g;
+        my ( $start, $end ) = ( 0, 9999 );
         if ( $line =~ s/(\d\d\d\d\s*,?-?\s*)// ) {
             $start = $1;
             $start =~ s/[,\s\-]+//g;
@@ -95,6 +102,7 @@ sub process_file
             $end =~ s/[,\s]+//g;
         }
         $end = $start if $end == 9999;
+        say STDERR "Error in $filename: $copy" if $end == 0;
         if ( exists $copyrights{$line} ) {
             if ( $start > $copyrights{$line}[0] ) {
                 $start = $copyrights{$line}[0];
diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc
index 360d13144..90545f3af 100644
--- a/src/etc/inc/filter_log.inc
+++ b/src/etc/inc/filter_log.inc
@@ -2,7 +2,6 @@
 
 /*
     Copyright (C) 2014-2016 Deciso B.V.
-    Copyright (C) Scott Ullrich
     Copyright (C) 2009 Jim Pingle <jimp@pfsense.org>
     All rights reserved.
 
diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc
index 4f7caca41..d62b79bd0 100644
--- a/src/etc/inc/plugins.inc.d/ipsec.inc
+++ b/src/etc/inc/plugins.inc.d/ipsec.inc
@@ -5,7 +5,7 @@
     Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
     Copyright (C) 2008 Ermal Luçi
     Copyright (C) 2004-2007 Scott Ullrich
-    Copyright (C) 2003-2004 Manuel Kasper
+    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
diff --git a/src/www/diag_ipsec.php b/src/www/diag_ipsec.php
index 2f5dd9109..514db6328 100644
--- a/src/www/diag_ipsec.php
+++ b/src/www/diag_ipsec.php
@@ -4,7 +4,7 @@
     Copyright (C) 2014-2016 Deciso B.V.
     Copyright (C) 2004-2009 Scott Ullrich
     Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
-    Copyright (C) 2003-2004 Manuel Kasper
+    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
diff --git a/src/www/diag_traceroute.php b/src/www/diag_traceroute.php
index f8dc88fa9..e05b0bb46 100644
--- a/src/www/diag_traceroute.php
+++ b/src/www/diag_traceroute.php
@@ -3,7 +3,7 @@
 /*
     Copyright (C) 2016 Deciso B.V.
     Copyright (C) 2005 Paul Taylor <paultaylor@winn-dixie.com>
-    Copyright (C) Manuel Kasper <mk@neon1.net>
+    Copyright (C) 2005 Manuel Kasper <mk@neon1.net>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index 04c9277f0..8a3a8cd01 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -2,7 +2,7 @@
 
 /*
     Copyright (C) 2014-2015 Deciso B.V.
-    Copyright (C) Jim McBeath
+    Copyright (C) 2004 Jim McBeath
     Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>
     All rights reserved.
 
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 22de6e315..eac3cad4b 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -4,7 +4,7 @@
     Copyright (C) 2010 Ermal Luçi
     Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>
     Copyright (C) 2008 Shrew Soft Inc. <mgrooms@shrew.net>
-    Copyright (C) 2003-2004 Manuel Kasper
+    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without