Remove address from GPLv2 headers

As per discussion with lawyers[tm], it's not a good idea to
shorten the license header too much - not for legal reasons
but because there are tools that look for them, and giving
them a standard pattern simplifies things.

However, we got confirmation that we don't have to update
every file ever added to coreboot whenever the FSF gets a
new lease, but can drop the address instead.

util/kconfig is excluded because that's imported code that
we may want to synchronize every now and then.

$ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *MA[, ]*02110-1301[, ]*USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 59 Temple Place[-, ]*Suite 330, Boston, MA *02111-1307[, ]*USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.:Foundation, Inc.:" {} +
$ find * -type f
	-a \! -name \*.patch \
	-a \! -name \*_shipped \
	-a \! -name LICENSE_GPL \
	-a \! -name LGPL.txt \
	-a \! -name COPYING \
	-a \! -name DISCLAIMER \
	-exec sed -i "/Foundation, Inc./ N;s:Foundation, Inc.* USA\.* *:Foundation, Inc. :;s:Foundation, Inc. $:Foundation, Inc.:" {} +

Change-Id: Icc968a5a5f3a5df8d32b940f9cdb35350654bef9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/9233
Tested-by: build bot (Jenkins)
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
diff --git a/util/acpi/acpidump-all b/util/acpi/acpidump-all
index aa73a15..77c3282 100755
--- a/util/acpi/acpidump-all
+++ b/util/acpi/acpidump-all
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc.
 #
 
 rm -rf out
diff --git a/util/bimgtool/bimgtool.c b/util/bimgtool/bimgtool.c
index b7b6491..a970234 100644
--- a/util/bimgtool/bimgtool.c
+++ b/util/bimgtool/bimgtool.c
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <errno.h>
diff --git a/util/board_status/getrevision.sh b/util/board_status/getrevision.sh
index 9a949ff..8423339b 100755
--- a/util/board_status/getrevision.sh
+++ b/util/board_status/getrevision.sh
@@ -18,7 +18,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# Foundation, Inc.
 #
 
 EXIT_SUCCESS=0
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 5bebf51..fcf6910 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index d8ca7ac..f94d0da 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <inttypes.h>
diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c
index 0a230b2..b73c431 100644
--- a/util/cbfstool/cbfs-payload-linux.c
+++ b/util/cbfstool/cbfs-payload-linux.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index ef39594..befdb2f 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __CBFS_H
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 8fb2a60..2ce4bdd 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <inttypes.h>
diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h
index 5ff8a9a..5df5dd2 100644
--- a/util/cbfstool/cbfs_image.h
+++ b/util/cbfstool/cbfs_image.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __CBFS_IMAGE_H
diff --git a/util/cbfstool/cbfs_sections.c b/util/cbfstool/cbfs_sections.c
index 81912d5..249ea95 100644
--- a/util/cbfstool/cbfs_sections.c
+++ b/util/cbfstool/cbfs_sections.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "cbfs_sections.h"
diff --git a/util/cbfstool/cbfs_sections.h b/util/cbfstool/cbfs_sections.h
index 5a23899..4d14fa9 100644
--- a/util/cbfstool/cbfs_sections.h
+++ b/util/cbfstool/cbfs_sections.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CBFS_SECTIONS_H_
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 68a83e7..bd84b01 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h
index ee9de4e..8793566 100644
--- a/util/cbfstool/coff.h
+++ b/util/cbfstool/coff.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #define DOS_MAGIC 0x5a4d
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 8773fe4..fffd096 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index ddec1a7..7fa7c7e 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __CBFSTOOL_COMMON_H
diff --git a/util/cbfstool/compress.c b/util/cbfstool/compress.c
index 9f865fb..ab94b35 100644
--- a/util/cbfstool/compress.c
+++ b/util/cbfstool/compress.c
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <string.h>
diff --git a/util/cbfstool/elf.h b/util/cbfstool/elf.h
index f6356c6..675fd22 100644
--- a/util/cbfstool/elf.h
+++ b/util/cbfstool/elf.h
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301 USA.  */
+   Software Foundation, Inc. */
 
 #ifndef _ELF_H
 #define	_ELF_H 1
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 7dc5e65..4cf3534 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/elfparsing.h b/util/cbfstool/elfparsing.h
index 0db1c59..f7d3c23 100644
--- a/util/cbfstool/elfparsing.h
+++ b/util/cbfstool/elfparsing.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef ELFPARSING_H
diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c
index 7dbfc51..0a7bea5 100644
--- a/util/cbfstool/fit.c
+++ b/util/cbfstool/fit.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdint.h>
diff --git a/util/cbfstool/fit.h b/util/cbfstool/fit.h
index 63e22f4..3f3185c 100644
--- a/util/cbfstool/fit.h
+++ b/util/cbfstool/fit.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __CBFSTOOL_FIT_H
diff --git a/util/cbfstool/flashmap_tests.c b/util/cbfstool/flashmap_tests.c
index c545285..547931a 100644
--- a/util/cbfstool/flashmap_tests.c
+++ b/util/cbfstool/flashmap_tests.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "flashmap/fmap.h"
diff --git a/util/cbfstool/fmap_from_fmd.c b/util/cbfstool/fmap_from_fmd.c
index 2671743..45ee2e8 100644
--- a/util/cbfstool/fmap_from_fmd.c
+++ b/util/cbfstool/fmap_from_fmd.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "fmap_from_fmd.h"
diff --git a/util/cbfstool/fmap_from_fmd.h b/util/cbfstool/fmap_from_fmd.h
index 689c859..1e4da01 100644
--- a/util/cbfstool/fmap_from_fmd.h
+++ b/util/cbfstool/fmap_from_fmd.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef FMAP_FROM_FMD_H_
diff --git a/util/cbfstool/fmaptool.c b/util/cbfstool/fmaptool.c
index 09b68d2..d0720be 100644
--- a/util/cbfstool/fmaptool.c
+++ b/util/cbfstool/fmaptool.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "common.h"
diff --git a/util/cbfstool/fmd.c b/util/cbfstool/fmd.c
index a4430be..1d769f6 100644
--- a/util/cbfstool/fmd.c
+++ b/util/cbfstool/fmd.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "fmd.h"
diff --git a/util/cbfstool/fmd.h b/util/cbfstool/fmd.h
index ff54cbf..9a22a96 100644
--- a/util/cbfstool/fmd.h
+++ b/util/cbfstool/fmd.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef FMD_H_
diff --git a/util/cbfstool/fmd_parser.y b/util/cbfstool/fmd_parser.y
index 2327ae4..caa2beb 100644
--- a/util/cbfstool/fmd_parser.y
+++ b/util/cbfstool/fmd_parser.y
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 %{
diff --git a/util/cbfstool/fmd_scanner.c_shipped b/util/cbfstool/fmd_scanner.c_shipped
index d0d93d3..6cc22fb 100644
--- a/util/cbfstool/fmd_scanner.c_shipped
+++ b/util/cbfstool/fmd_scanner.c_shipped
@@ -488,7 +488,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 #line 21 "fmd_scanner.l"
 #include "fmd_parser.h"
diff --git a/util/cbfstool/fmd_scanner.l b/util/cbfstool/fmd_scanner.l
index 0a58210..439548e 100644
--- a/util/cbfstool/fmd_scanner.l
+++ b/util/cbfstool/fmd_scanner.l
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 %{
diff --git a/util/cbfstool/fv.h b/util/cbfstool/fv.h
index 1988da3..0bb176c 100644
--- a/util/cbfstool/fv.h
+++ b/util/cbfstool/fv.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #define FV_SIGNATURE 0x4856465f
diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h
index ae747e6..0c8f9b4 100644
--- a/util/cbfstool/linux.h
+++ b/util/cbfstool/linux.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /*
diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c
index 649bb64..6bbdc4f 100644
--- a/util/cbfstool/linux_trampoline.c
+++ b/util/cbfstool/linux_trampoline.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #if 0
diff --git a/util/cbfstool/linux_trampoline.h b/util/cbfstool/linux_trampoline.h
index ed5b824..aebcb10d 100644
--- a/util/cbfstool/linux_trampoline.h
+++ b/util/cbfstool/linux_trampoline.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 
 /*
diff --git a/util/cbfstool/option.h b/util/cbfstool/option.h
index 70777f8..4c71cad 100644
--- a/util/cbfstool/option.h
+++ b/util/cbfstool/option.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef OPTION_H_
diff --git a/util/cbfstool/partitioned_file.c b/util/cbfstool/partitioned_file.c
index 4e1a8b5..9d67832 100644
--- a/util/cbfstool/partitioned_file.c
+++ b/util/cbfstool/partitioned_file.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "partitioned_file.h"
diff --git a/util/cbfstool/partitioned_file.h b/util/cbfstool/partitioned_file.h
index 92f228e..4583316 100644
--- a/util/cbfstool/partitioned_file.h
+++ b/util/cbfstool/partitioned_file.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef PARITITONED_FILE_H_
diff --git a/util/cbfstool/rmodtool.c b/util/cbfstool/rmodtool.c
index 1455cd9..188d749 100644
--- a/util/cbfstool/rmodtool.c
+++ b/util/cbfstool/rmodtool.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c
index fa175db..8d8772d 100644
--- a/util/cbfstool/rmodule.c
+++ b/util/cbfstool/rmodule.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <inttypes.h>
diff --git a/util/cbfstool/rmodule.h b/util/cbfstool/rmodule.h
index 94f8f3d..4531f8d 100644
--- a/util/cbfstool/rmodule.h
+++ b/util/cbfstool/rmodule.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef TOOL_RMODULE_H
diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c
index df2c4ba..1949fa6e 100644
--- a/util/cbfstool/xdr.c
+++ b/util/cbfstool/xdr.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
index fe9e923..1e75345 100644
--- a/util/cbmem/Makefile
+++ b/util/cbmem/Makefile
@@ -14,7 +14,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## Foundation, Inc.
 ##
 
 PROGRAM = cbmem
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 3c6eee4..e294c20 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <inttypes.h>
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 02a7d82..15bcd92 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+# Foundation, Inc.
 #
 
 cd `dirname $0`
diff --git a/util/dtd_parser/dtd_parser.py b/util/dtd_parser/dtd_parser.py
index 23cc7e7..8b5c75e 100755
--- a/util/dtd_parser/dtd_parser.py
+++ b/util/dtd_parser/dtd_parser.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 
 '''
diff --git a/util/ectool/Makefile b/util/ectool/Makefile
index 539e71e..3ab0bc8 100644
--- a/util/ectool/Makefile
+++ b/util/ectool/Makefile
@@ -15,7 +15,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## Foundation, Inc.
 ##
 
 CC = gcc
diff --git a/util/ectool/ec.c b/util/ectool/ec.c
index 323a43f..61e7c25 100644
--- a/util/ectool/ec.c
+++ b/util/ectool/ec.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/ectool/ec.h b/util/ectool/ec.h
index f25a3d9..dec5439 100644
--- a/util/ectool/ec.h
+++ b/util/ectool/ec.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _EC_H
diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c
index 2479633..307c1f5 100644
--- a/util/ectool/ectool.c
+++ b/util/ectool/ectool.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh
index 55a3b85..6120c1b 100755
--- a/util/genbuild_h/genbuild_h.sh
+++ b/util/genbuild_h/genbuild_h.sh
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 
 DATE=""
diff --git a/util/ifdfake/Makefile b/util/ifdfake/Makefile
index 3a896ee..bb9d87a 100644
--- a/util/ifdfake/Makefile
+++ b/util/ifdfake/Makefile
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+# Foundation, Inc.
 #
 
 PROGRAM = ifdfake
diff --git a/util/ifdfake/ifdfake.c b/util/ifdfake/ifdfake.c
index 8eb34a9..b70b6ae 100644
--- a/util/ifdfake/ifdfake.c
+++ b/util/ifdfake/ifdfake.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <errno.h>
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index 144028e..0670ea6 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+# Foundation, Inc.
 #
 
 PROGRAM = ifdtool
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 9569dfa..8d5d059 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <unistd.h>
diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h
index ed8f440..b91c02d 100644
--- a/util/ifdtool/ifdtool.h
+++ b/util/ifdtool/ifdtool.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdint.h>
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index f846672..f598ad4 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.
 #
 
 PROGRAM = inteltool
diff --git a/util/inteltool/amb.c b/util/inteltool/amb.c
index 13397db..e835751 100644
--- a/util/inteltool/amb.c
+++ b/util/inteltool/amb.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stddef.h>
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c
index 626d735..b13e04b 100644
--- a/util/inteltool/cpu.c
+++ b/util/inteltool/cpu.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <fcntl.h>
diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 7084c44..07d838b 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index a3712c5..f3520e2 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 6c1977e..283425f 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdint.h>
diff --git a/util/inteltool/ivy_memory.c b/util/inteltool/ivy_memory.c
index 50ee4c5..ba59b51 100644
--- a/util/inteltool/ivy_memory.c
+++ b/util/inteltool/ivy_memory.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c
index 950d4a3..a4ff1af 100644
--- a/util/inteltool/memory.c
+++ b/util/inteltool/memory.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 
diff --git a/util/inteltool/pcie.c b/util/inteltool/pcie.c
index ecfa2f1..a3d8270 100644
--- a/util/inteltool/pcie.c
+++ b/util/inteltool/pcie.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index 865cfba..d0fd0e0 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c
index c099737..9fd05be 100644
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/k8resdump/Makefile b/util/k8resdump/Makefile
index e69164f..5cb78ad 100644
--- a/util/k8resdump/Makefile
+++ b/util/k8resdump/Makefile
@@ -14,7 +14,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## Foundation, Inc.
 ##
 
 PROGRAM = k8resdump
diff --git a/util/k8resdump/k8resdump.c b/util/k8resdump/k8resdump.c
index bbb7c0f..1bd974e 100644
--- a/util/k8resdump/k8resdump.c
+++ b/util/k8resdump/k8resdump.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This program will dump the IO/memory/PCI resources from the K8
diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers
index 7074430..12cbe6c 100755
--- a/util/lint/lint-000-license-headers
+++ b/util/lint/lint-000-license-headers
@@ -14,11 +14,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 #
 # DESCR: Check that all files in src/ and util/ have valid license headers
 
 LC_ALL=C export LC_ALL
-grep -L "51 Franklin St, Fifth Floor, Boston" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/romcc/tests|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|/microcode-[^/]*.h$)"` | \
+grep -L "You should have received a copy of the GNU General Public License" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/romcc/tests|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|/microcode-[^/]*.h$)"` | \
 	sed -e "s,^.*$,File & has no valid GPL header.,"
diff --git a/util/lint/lint-001-no-global-config-in-romstage b/util/lint/lint-001-no-global-config-in-romstage
index 4b1d317..562b1f7 100755
--- a/util/lint/lint-001-no-global-config-in-romstage
+++ b/util/lint/lint-001-no-global-config-in-romstage
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 # DESCR: Check that no symbol #defined in any romstage.c is used elsewhere
 
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index f13aa98..819ef63 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 # DESCR: Check for superfluous whitespace in the tree
 
diff --git a/util/lint/lint-stable-004-style-labels b/util/lint/lint-stable-004-style-labels
index 10b0408..1f7953e 100755
--- a/util/lint/lint-stable-004-style-labels
+++ b/util/lint/lint-stable-004-style-labels
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 # DESCR: Check that C labels begin at start-of-line
 
diff --git a/util/lint/lint-stable-005-board-status b/util/lint/lint-stable-005-board-status
index 32f5cdc..94fc265 100755
--- a/util/lint/lint-stable-005-board-status
+++ b/util/lint/lint-stable-005-board-status
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 # DESCR: Check that every board has a meaningful board_info.txt
 
diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
index f876da8..4089498 100644
--- a/util/msrtool/Makefile.in
+++ b/util/msrtool/Makefile.in
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 
 PROGRAM = msrtool
diff --git a/util/msrtool/configure b/util/msrtool/configure
index 1d11a46..cda01ac 100755
--- a/util/msrtool/configure
+++ b/util/msrtool/configure
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 
 # If this is left unset, try to set the version string from the highest
diff --git a/util/msrtool/cs5536.c b/util/msrtool/cs5536.c
index 9017572..e8982ca 100644
--- a/util/msrtool/cs5536.c
+++ b/util/msrtool/cs5536.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c
index a3a50ef..0c05545 100644
--- a/util/msrtool/darwin.c
+++ b/util/msrtool/darwin.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <sys/types.h>
diff --git a/util/msrtool/freebsd.c b/util/msrtool/freebsd.c
index 74b6494..9c086f3 100644
--- a/util/msrtool/freebsd.c
+++ b/util/msrtool/freebsd.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <sys/types.h>
diff --git a/util/msrtool/geodegx2.c b/util/msrtool/geodegx2.c
index b70a03d..995a6d0 100644
--- a/util/msrtool/geodegx2.c
+++ b/util/msrtool/geodegx2.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/geodelx.c b/util/msrtool/geodelx.c
index cdb46bd..921c1a8 100644
--- a/util/msrtool/geodelx.c
+++ b/util/msrtool/geodelx.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c
index b53da6a..c845b4e 100644
--- a/util/msrtool/intel_atom.c
+++ b/util/msrtool/intel_atom.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_core1.c b/util/msrtool/intel_core1.c
index a0d6d08..6869781 100644
--- a/util/msrtool/intel_core1.c
+++ b/util/msrtool/intel_core1.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_core2_early.c b/util/msrtool/intel_core2_early.c
index fd79f65..b62e7c9 100644
--- a/util/msrtool/intel_core2_early.c
+++ b/util/msrtool/intel_core2_early.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c
index 80462c1..6d9fe87 100644
--- a/util/msrtool/intel_core2_later.c
+++ b/util/msrtool/intel_core2_later.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c
index 3674615..79aacd6 100644
--- a/util/msrtool/intel_nehalem.c
+++ b/util/msrtool/intel_nehalem.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium3.c b/util/msrtool/intel_pentium3.c
index 949b3ce..5dcbbd9 100644
--- a/util/msrtool/intel_pentium3.c
+++ b/util/msrtool/intel_pentium3.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium3_early.c b/util/msrtool/intel_pentium3_early.c
index 7c55b3f..51511e5 100644
--- a/util/msrtool/intel_pentium3_early.c
+++ b/util/msrtool/intel_pentium3_early.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_early.c b/util/msrtool/intel_pentium4_early.c
index 34f8242..feb0577 100644
--- a/util/msrtool/intel_pentium4_early.c
+++ b/util/msrtool/intel_pentium4_early.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c
index 5fed62e..212ca1c 100644
--- a/util/msrtool/intel_pentium4_later.c
+++ b/util/msrtool/intel_pentium4_later.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/k8.c b/util/msrtool/k8.c
index 4bf5a18..754580f 100644
--- a/util/msrtool/k8.c
+++ b/util/msrtool/k8.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/linux.c b/util/msrtool/linux.c
index 0e1a0da..2ead38f 100644
--- a/util/msrtool/linux.c
+++ b/util/msrtool/linux.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <sys/types.h>
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 356d460..66a34bf 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index e99921a..8988eba 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef MSRTOOL_H
diff --git a/util/msrtool/msrutils.c b/util/msrtool/msrutils.c
index dbce53d..fc44eac 100644
--- a/util/msrtool/msrutils.c
+++ b/util/msrtool/msrutils.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/msrtool/sys.c b/util/msrtool/sys.c
index 82c2dbf..077bdab 100644
--- a/util/msrtool/sys.c
+++ b/util/msrtool/sys.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <pci/pci.h>
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index 12f4a5c..1f19733 100644
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -15,7 +15,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## Foundation, Inc.
 ##
 
 PROGRAM = nvramtool
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc
index dc33370..dc45ede 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.inc
@@ -16,7 +16,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## Foundation, Inc.
 ##
 
 OS_ARCH        = $(shell uname)
diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c
index 4b7f8d6..dde3e27 100644
--- a/util/nvramtool/accessors/layout-bin.c
+++ b/util/nvramtool/accessors/layout-bin.c
@@ -31,8 +31,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/util/nvramtool/accessors/layout-common.c b/util/nvramtool/accessors/layout-common.c
index 0a99d3b..f8113b5 100644
--- a/util/nvramtool/accessors/layout-common.c
+++ b/util/nvramtool/accessors/layout-common.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include <ctype.h>
diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c
index a06f560..7e02768 100644
--- a/util/nvramtool/accessors/layout-text.c
+++ b/util/nvramtool/accessors/layout-text.c
@@ -30,8 +30,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/accessors/layout-text.h b/util/nvramtool/accessors/layout-text.h
index 85628f7..62286c2 100644
--- a/util/nvramtool/accessors/layout-text.h
+++ b/util/nvramtool/accessors/layout-text.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef LAYOUT_FILE_H
diff --git a/util/nvramtool/cbfs.c b/util/nvramtool/cbfs.c
index abd40ee..1d340b4 100644
--- a/util/nvramtool/cbfs.c
+++ b/util/nvramtool/cbfs.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifdef __MINGW32__
diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h
index bf5ca95..8c02d9d 100644
--- a/util/nvramtool/cbfs.h
+++ b/util/nvramtool/cbfs.h
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/util/nvramtool/cli/nvramtool.8 b/util/nvramtool/cli/nvramtool.8
index 9159a2a..a1e4a6c 100644
--- a/util/nvramtool/cli/nvramtool.8
+++ b/util/nvramtool/cli/nvramtool.8
@@ -24,8 +24,7 @@
 .\"  conditions of the GNU General Public License for more details.
 .\"
 .\"  You should have received a copy of the GNU General Public License along
-.\"  with this program; if not, write to the Free Software Foundation, Inc.,
-.\"  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+.\"  with this program; if not, write to the Free Software Foundation, Inc.
 .\"***************************************************************************/
 .TH NVRAMTOOL 8 "September 2008"
 .SH NAME
diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c
index bdfaaff..13d740f 100644
--- a/util/nvramtool/cli/nvramtool.c
+++ b/util/nvramtool/cli/nvramtool.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include <fcntl.h>
diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c
index a128c0b..c92b135 100644
--- a/util/nvramtool/cli/opts.c
+++ b/util/nvramtool/cli/opts.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/cli/opts.h b/util/nvramtool/cli/opts.h
index a011ef1..d6c31b9 100644
--- a/util/nvramtool/cli/opts.h
+++ b/util/nvramtool/cli/opts.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef OPTS_H
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
index 32f0e0a..51b998e 100644
--- a/util/nvramtool/cmos_lowlevel.c
+++ b/util/nvramtool/cmos_lowlevel.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #if defined(__FreeBSD__)
diff --git a/util/nvramtool/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h
index 264bf85..fe60147 100644
--- a/util/nvramtool/cmos_lowlevel.h
+++ b/util/nvramtool/cmos_lowlevel.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef NVRAMTOOL_CMOS_LOWLEVEL_H
diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c
index cb6c379..49d11b1 100644
--- a/util/nvramtool/cmos_ops.c
+++ b/util/nvramtool/cmos_ops.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/cmos_ops.h b/util/nvramtool/cmos_ops.h
index 3ef5023..d9d2735a8 100644
--- a/util/nvramtool/cmos_ops.h
+++ b/util/nvramtool/cmos_ops.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef CMOS_OPS_H
diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c
index 15f8b0d..ad469d9 100644
--- a/util/nvramtool/common.c
+++ b/util/nvramtool/common.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h
index 0ca2829..7f855c4 100644
--- a/util/nvramtool/common.h
+++ b/util/nvramtool/common.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef COMMON_H
diff --git a/util/nvramtool/input_file.c b/util/nvramtool/input_file.c
index 1520930..55a6b9a 100644
--- a/util/nvramtool/input_file.c
+++ b/util/nvramtool/input_file.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/input_file.h b/util/nvramtool/input_file.h
index 05d14de..b4b80aa 100644
--- a/util/nvramtool/input_file.h
+++ b/util/nvramtool/input_file.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef INPUT_FILE_H
diff --git a/util/nvramtool/layout.c b/util/nvramtool/layout.c
index f543d12..21698ae 100644
--- a/util/nvramtool/layout.c
+++ b/util/nvramtool/layout.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h
index 082c31b..405c14a 100644
--- a/util/nvramtool/layout.h
+++ b/util/nvramtool/layout.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef LAYOUT_H
diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index 5f1f22d..d6553c1 100644
--- a/util/nvramtool/lbtable.c
+++ b/util/nvramtool/lbtable.c
@@ -25,8 +25,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include <stdint.h>
diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h
index 9873ecb..ddb7938 100644
--- a/util/nvramtool/lbtable.h
+++ b/util/nvramtool/lbtable.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef LBTABLE_H
diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c
index 7d1adbe..3875f59 100644
--- a/util/nvramtool/reg_expr.c
+++ b/util/nvramtool/reg_expr.c
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #include <stdarg.h>
diff --git a/util/nvramtool/reg_expr.h b/util/nvramtool/reg_expr.h
index c93215b..55f6b5d 100644
--- a/util/nvramtool/reg_expr.h
+++ b/util/nvramtool/reg_expr.h
@@ -24,8 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, write to the Free Software Foundation, Inc.
 \*****************************************************************************/
 
 #ifndef REG_EXPR_H
diff --git a/util/optionlist/Makefile b/util/optionlist/Makefile
index 592d286..035c5f4 100644
--- a/util/optionlist/Makefile
+++ b/util/optionlist/Makefile
@@ -12,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 
 VERSION := $(shell git describe --dirty --always || git describe)
diff --git a/util/optionlist/kconfig2wiki b/util/optionlist/kconfig2wiki
index 4265d37..ddfa267 100755
--- a/util/optionlist/kconfig2wiki
+++ b/util/optionlist/kconfig2wiki
@@ -18,7 +18,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 
 import glob
diff --git a/util/romcc/COPYING b/util/romcc/COPYING
index 3661121..31c3934 100644
--- a/util/romcc/COPYING
+++ b/util/romcc/COPYING
@@ -306,7 +306,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+    Foundation, Inc.
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index fcb8989..774f708 100644
--- a/util/sconfig/lex.yy.c_shipped
+++ b/util/sconfig/lex.yy.c_shipped
@@ -555,7 +555,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "sconfig.tab.h"
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 1241a87..6c77762 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <ctype.h>
diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h
index b8a231a..d6acee9 100644
--- a/util/sconfig/sconfig.h
+++ b/util/sconfig/sconfig.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l
index 37d487c..8ab3a02 100755
--- a/util/sconfig/sconfig.l
+++ b/util/sconfig/sconfig.l
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "sconfig.tab.h"
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index 43a16d1..266eb11 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -83,7 +83,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "sconfig.h"
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y
index ba450b8..10b05a9 100755
--- a/util/sconfig/sconfig.y
+++ b/util/sconfig/sconfig.y
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "sconfig.h"
diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c
index 4e904a2..335594b 100644
--- a/util/showdevicetree/showdt.c
+++ b/util/showdevicetree/showdt.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 #include  <stdio.h>
 /* you can't include string.h due to conflicts with coreboot prototypes. */
diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index 7ce5ede..7a4f8ba 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -15,7 +15,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+## Foundation, Inc.
 ##
 
 PROGRAM = superiotool
diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index 1d683c1..57d1c10 100644
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/amd.c b/util/superiotool/amd.c
index 4f76981..07ef150 100644
--- a/util/superiotool/amd.c
+++ b/util/superiotool/amd.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index fd118b7..1a6ffa3 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/infineon.c b/util/superiotool/infineon.c
index c01f883..4ee7960 100644
--- a/util/superiotool/infineon.c
+++ b/util/superiotool/infineon.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 17e4452..295cbdc 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index 3398257..883ad7c 100644
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/nuvoton.c b/util/superiotool/nuvoton.c
index ea55a63..bc95869 100644
--- a/util/superiotool/nuvoton.c
+++ b/util/superiotool/nuvoton.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/pci.c b/util/superiotool/pci.c
index af9b938..32c2376 100644
--- a/util/superiotool/pci.c
+++ b/util/superiotool/pci.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/serverengines.c b/util/superiotool/serverengines.c
index 920eb62..d662000 100644
--- a/util/superiotool/serverengines.c
+++ b/util/superiotool/serverengines.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 72c0c7a..734cb91 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 5869cbf..a5e912d 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 46f11a7..7e7ec0c 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef SUPERIOTOOL_H
diff --git a/util/superiotool/via.c b/util/superiotool/via.c
index a082316..589a13e 100644
--- a/util/superiotool/via.c
+++ b/util/superiotool/via.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 2774a0b..3cc93eb 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include "superiotool.h"
diff --git a/util/uio_usbdebug/console/printk.c b/util/uio_usbdebug/console/printk.c
index a73407c..26292e3 100644
--- a/util/uio_usbdebug/console/printk.c
+++ b/util/uio_usbdebug/console/printk.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/uio_usbdebug/drivers/usb/pci_ehci.c b/util/uio_usbdebug/drivers/usb/pci_ehci.c
index 6a316a7..c7c1282 100644
--- a/util/uio_usbdebug/drivers/usb/pci_ehci.c
+++ b/util/uio_usbdebug/drivers/usb/pci_ehci.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <device/pci_ehci.h>
diff --git a/util/uio_usbdebug/include/device/device.h b/util/uio_usbdebug/include/device/device.h
index 1838f4d..709c644 100644
--- a/util/uio_usbdebug/include/device/device.h
+++ b/util/uio_usbdebug/include/device/device.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 
diff --git a/util/uio_usbdebug/linux/uio_ehci_pci.c b/util/uio_usbdebug/linux/uio_ehci_pci.c
index d5c33e3..52d8c99 100644
--- a/util/uio_usbdebug/linux/uio_ehci_pci.c
+++ b/util/uio_usbdebug/linux/uio_ehci_pci.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <linux/device.h>
diff --git a/util/uio_usbdebug/uio_usbdebug.c b/util/uio_usbdebug/uio_usbdebug.c
index e2836fc..d40d3c0 100644
--- a/util/uio_usbdebug/uio_usbdebug.c
+++ b/util/uio_usbdebug/uio_usbdebug.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/uio_usbdebug/uio_usbdebug_intel.c b/util/uio_usbdebug/uio_usbdebug_intel.c
index 5e4d926..34b65f5 100644
--- a/util/uio_usbdebug/uio_usbdebug_intel.c
+++ b/util/uio_usbdebug/uio_usbdebug_intel.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <arch/io.h>
diff --git a/util/viatool/Makefile b/util/viatool/Makefile
index 5124a73..becdde3 100644
--- a/util/viatool/Makefile
+++ b/util/viatool/Makefile
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.
 #
 
 PROGRAM = viatool
diff --git a/util/viatool/cpu.c b/util/viatool/cpu.c
index 4c7c9e6..d0f6623 100644
--- a/util/viatool/cpu.c
+++ b/util/viatool/cpu.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <fcntl.h>
diff --git a/util/viatool/viatool.c b/util/viatool/viatool.c
index 3f19f28..a3a2f43 100644
--- a/util/viatool/viatool.c
+++ b/util/viatool/viatool.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdio.h>
diff --git a/util/viatool/viatool.h b/util/viatool/viatool.h
index ed90112..997c5ad 100644
--- a/util/viatool/viatool.h
+++ b/util/viatool/viatool.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
  */
 
 #include <stdint.h>
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index ebc346b..37fe406 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc.
 #
 
 TMPFILE=""