14 files changed, 14 insertions, 15 deletions
diff --git a/payloads/bayou/util/pbuilder/Makefile b/payloads/bayou/util/pbuilder/Makefile
index fe850ba0f8..9c417aa18d 100644
--- a/payloads/bayou/util/pbuilder/Makefile
+++ b/payloads/bayou/util/pbuilder/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.
 ##
 
 PBUILDOBJS := config.o create.o show.o main.o
diff --git a/payloads/bayou/util/pbuilder/config.c b/payloads/bayou/util/pbuilder/config.c
index b815d808bf..b26168f67e 100644
--- a/payloads/bayou/util/pbuilder/config.c
+++ b/payloads/bayou/util/pbuilder/config.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.
  */
 
 #define _GNU_SOURCE
diff --git a/payloads/bayou/util/pbuilder/create.c b/payloads/bayou/util/pbuilder/create.c
index 24b972db0c..c866079ebf 100644
--- a/payloads/bayou/util/pbuilder/create.c
+++ b/payloads/bayou/util/pbuilder/create.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 <stdlib.h>
diff --git a/payloads/bayou/util/pbuilder/liblar/Makefile b/payloads/bayou/util/pbuilder/liblar/Makefile
index 9bb4b683ad..a72dc8d632 100644
--- a/payloads/bayou/util/pbuilder/liblar/Makefile
+++ b/payloads/bayou/util/pbuilder/liblar/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.
 ##
 
 HOSTCC = gcc
diff --git a/payloads/bayou/util/pbuilder/liblar/elf.h b/payloads/bayou/util/pbuilder/liblar/elf.h
index 01af81988a..48415bda99 100644
--- a/payloads/bayou/util/pbuilder/liblar/elf.h
+++ b/payloads/bayou/util/pbuilder/liblar/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/payloads/bayou/util/pbuilder/liblar/lar.h b/payloads/bayou/util/pbuilder/liblar/lar.h
index 9ef827d0e0..e82f5f0174 100644
--- a/payloads/bayou/util/pbuilder/liblar/lar.h
+++ b/payloads/bayou/util/pbuilder/liblar/lar.h
@@ -21,7 +21,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/payloads/bayou/util/pbuilder/liblar/lib.c b/payloads/bayou/util/pbuilder/liblar/lib.c
index fd34d851c1..1ad452f943 100644
--- a/payloads/bayou/util/pbuilder/liblar/lib.c
+++ b/payloads/bayou/util/pbuilder/liblar/lib.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/payloads/bayou/util/pbuilder/liblar/liblar.h b/payloads/bayou/util/pbuilder/liblar/liblar.h
index 93a6eee52f..c0e8a9c8f9 100644
--- a/payloads/bayou/util/pbuilder/liblar/liblar.h
+++ b/payloads/bayou/util/pbuilder/liblar/liblar.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 _LIBLAR_H_
diff --git a/payloads/bayou/util/pbuilder/liblar/self.h b/payloads/bayou/util/pbuilder/liblar/self.h
index fd0c4903bb..c24a125384 100644
--- a/payloads/bayou/util/pbuilder/liblar/self.h
+++ b/payloads/bayou/util/pbuilder/liblar/self.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 SELF_H_
diff --git a/payloads/bayou/util/pbuilder/lzma/Makefile b/payloads/bayou/util/pbuilder/lzma/Makefile
index 6c2ecd715e..638672bfd9 100644
--- a/payloads/bayou/util/pbuilder/lzma/Makefile
+++ b/payloads/bayou/util/pbuilder/lzma/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.
 ##
 
 LZMA_OBJ := $(obj)/util/lzma/LZMAEncoder.o $(obj)/util/lzma/LZInWindow.o
diff --git a/payloads/bayou/util/pbuilder/lzma/minilzma.cc b/payloads/bayou/util/pbuilder/lzma/minilzma.cc
index 441c28835f..f0f321a0fa 100644
--- a/payloads/bayou/util/pbuilder/lzma/minilzma.cc
+++ b/payloads/bayou/util/pbuilder/lzma/minilzma.cc
@@ -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 "C/Common/MyInitGuid.h"
diff --git a/payloads/bayou/util/pbuilder/main.c b/payloads/bayou/util/pbuilder/main.c
index a678157c6c..b1d79433a3 100644
--- a/payloads/bayou/util/pbuilder/main.c
+++ b/payloads/bayou/util/pbuilder/main.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/payloads/bayou/util/pbuilder/pbuilder.h b/payloads/bayou/util/pbuilder/pbuilder.h
index e903bd165d..00393e02f9 100644
--- a/payloads/bayou/util/pbuilder/pbuilder.h
+++ b/payloads/bayou/util/pbuilder/pbuilder.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 <stdio.h>
diff --git a/payloads/bayou/util/pbuilder/show.c b/payloads/bayou/util/pbuilder/show.c
index f06fb95812..a74dfddf9b 100644
--- a/payloads/bayou/util/pbuilder/show.c
+++ b/payloads/bayou/util/pbuilder/show.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>