diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index 240f51ec962f951090626131a730525e0bb6f21b..fd1bc71ca2f15174eb3dd72d14c99955968d9bc8 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-17  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* ALL: Update FSF address.
+
 2005-07-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* ALL: First release as more than just a single file.
diff --git a/libssp/gets-chk.c b/libssp/gets-chk.c
index 9dd85a15ec3ee23e33664f20b49007855cc45978..a6eda745ea73b1b6d6467cc77e5a0fe62ec92533 100644
--- a/libssp/gets-chk.c
+++ b/libssp/gets-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/memcpy-chk.c b/libssp/memcpy-chk.c
index 98f7556794cd22da79b02944f14fa470ef6543a7..36e7a602518cc62363b783e0bb31f1ea04186ab7 100644
--- a/libssp/memcpy-chk.c
+++ b/libssp/memcpy-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/memmove-chk.c b/libssp/memmove-chk.c
index 95a30c6758224e5ba4d64f3c35ded68907f7220d..9507cbc5e01097d8fa928e611d259881d30ea5a9 100644
--- a/libssp/memmove-chk.c
+++ b/libssp/memmove-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/mempcpy-chk.c b/libssp/mempcpy-chk.c
index b0dfc39d801bc7b89f9a2e071b362700c8dd665f..e21b15f39f890f95fb522905366d2f4e1ab4014e 100644
--- a/libssp/mempcpy-chk.c
+++ b/libssp/mempcpy-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/memset-chk.c b/libssp/memset-chk.c
index c2ef5ad89c47c0b7cdbd55ced44bf347af805e78..6b5f511dfad2b64ce978e05520e769f15e2fe05e 100644
--- a/libssp/memset-chk.c
+++ b/libssp/memset-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/snprintf-chk.c b/libssp/snprintf-chk.c
index d8fc8942e8850a66233784d2f9b7c615e0f9aff2..f800ffe13b6a42b220166a11a29f8838580bf59e 100644
--- a/libssp/snprintf-chk.c
+++ b/libssp/snprintf-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/sprintf-chk.c b/libssp/sprintf-chk.c
index 7b084c2f84bb4ba3dda1892c6f46ebd62adecbcc..6569bf6cc51690686a722da04767a40f6fab35b9 100644
--- a/libssp/sprintf-chk.c
+++ b/libssp/sprintf-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/ssp-local.c b/libssp/ssp-local.c
index aa63cccfaae773c6bf64fa7913f6b496a0293fb6..33867cc0d2e25226b12d0a4709cb1ba3ec13a6b6 100644
--- a/libssp/ssp-local.c
+++ b/libssp/ssp-local.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/ssp.c b/libssp/ssp.c
index 6c565363b75d32e4272fbeed0ba7b82c5a62cc38..9576be445b2256bfc4a809ccb983188beb4b88a8 100644
--- a/libssp/ssp.c
+++ b/libssp/ssp.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/ssp/ssp.h.in b/libssp/ssp/ssp.h.in
index 2ce13e9d7b8f9a088f7641307cb70caee591147a..40a64aab8723e3ab65c241052543ab5321b34651 100644
--- a/libssp/ssp/ssp.h.in
+++ b/libssp/ssp/ssp.h.in
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/ssp/stdio.h b/libssp/ssp/stdio.h
index 694e6ad322f9e505ee13841ff5dfcf05c3a54ad9..00c687f245a26216ecd77828e52e84dba2d98268 100644
--- a/libssp/ssp/stdio.h
+++ b/libssp/ssp/stdio.h
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/ssp/string.h b/libssp/ssp/string.h
index d214785a05c179b0b3f6beb5a5a0d79ff6aec5b1..57a17cfe796d98d723a431e97d1875865906e4b0 100644
--- a/libssp/ssp/string.h
+++ b/libssp/ssp/string.h
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/ssp/unistd.h b/libssp/ssp/unistd.h
index 176369f78c911247c9fbee487234e1f70cc2be7a..de621669b3a97249ff55477aa1ba13608103c026 100644
--- a/libssp/ssp/unistd.h
+++ b/libssp/ssp/unistd.h
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/stpcpy-chk.c b/libssp/stpcpy-chk.c
index 02c592cda7c6d93405f000e29c884bf3dc3a1681..90d5aa4d53c66d570210ff7e6356c199a246c3c7 100644
--- a/libssp/stpcpy-chk.c
+++ b/libssp/stpcpy-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/strcat-chk.c b/libssp/strcat-chk.c
index d3a1a64a992c8f738ad0189022b1220d341a4a35..237196dffee4404966c450b5d965e53a06f5dc14 100644
--- a/libssp/strcat-chk.c
+++ b/libssp/strcat-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/strcpy-chk.c b/libssp/strcpy-chk.c
index 7a3978e73a1b1a7b1bbb427d64d625673d1b025f..47584f4a0bd99d8fdb2b4f837e95628219674c81 100644
--- a/libssp/strcpy-chk.c
+++ b/libssp/strcpy-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/strncat-chk.c b/libssp/strncat-chk.c
index 39e61c8659c0ef61a0e6d34f7bd5b45f6b1b92b8..f559e60115942d7b9de18e8a096a13cf31ed43f0 100644
--- a/libssp/strncat-chk.c
+++ b/libssp/strncat-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/strncpy-chk.c b/libssp/strncpy-chk.c
index 5c01fd9faa3071627098a29646e3cee385d81fa8..538b48192bcd7f2c792c8e269f54ba9e3837f49a 100644
--- a/libssp/strncpy-chk.c
+++ b/libssp/strncpy-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/vsnprintf-chk.c b/libssp/vsnprintf-chk.c
index 21a2aad8632e8bee0b49f5426c955babf9b5baca..2e86df5cf33e27a373e254e84f19ca1406f16d31 100644
--- a/libssp/vsnprintf-chk.c
+++ b/libssp/vsnprintf-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable
diff --git a/libssp/vsprintf-chk.c b/libssp/vsprintf-chk.c
index 669b239d9cb38d6d12a5a3c7eb7057f07b76c572..a8c436f07c80af8acff1819e9b742e51ed6353e2 100644
--- a/libssp/vsprintf-chk.c
+++ b/libssp/vsprintf-chk.c
@@ -24,8 +24,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with files compiled with
    GCC to produce an executable, this does not cause the resulting executable