diff --git a/caja/caja-open-terminal.c b/caja/caja-open-terminal.c
index 378270a..39fc0ff 100644
--- a/caja/caja-open-terminal.c
+++ b/caja/caja-open-terminal.c
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public
  *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Christian Neumair <chris@mate-de.org>
  * 
diff --git a/caja/caja-open-terminal.h b/caja/caja-open-terminal.h
index 7132f43..7c20014 100644
--- a/caja/caja-open-terminal.h
+++ b/caja/caja-open-terminal.h
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public
  *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Christian Neumair <chris@mate-de.org>
  * 
diff --git a/caja/eel-mate-extensions.c b/caja/eel-mate-extensions.c
index b15377d..091e830 100644
--- a/caja/eel-mate-extensions.c
+++ b/caja/eel-mate-extensions.c
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Mate Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Darin Adler <darin@eazel.com>
 */
diff --git a/caja/eel-mate-extensions.h b/caja/eel-mate-extensions.h
index 70eb714..16f3056 100644
--- a/caja/eel-mate-extensions.h
+++ b/caja/eel-mate-extensions.h
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Mate Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Darin Adler <darin@eazel.com>
 */
diff --git a/caja/open-terminal.c b/caja/open-terminal.c
index 17fcaa1..e36e6e0 100644
--- a/caja/open-terminal.c
+++ b/caja/open-terminal.c
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public
  *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Christian Neumair <chris@mate-de.org>
  * 
diff --git a/src/eggdesktopfile.c b/src/eggdesktopfile.c
index cde7b75..63c86d9 100644
--- a/src/eggdesktopfile.c
+++ b/src/eggdesktopfile.c
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; see the file COPYING.LIB. If not,
  * write to the Free Software Foundation, Inc., 59 Temple Place -
- * Suite 330, Boston, MA 02111-1307, USA.
+ * Suite 330, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/eggdesktopfile.h b/src/eggdesktopfile.h
index 6d887dc..efe4aec 100644
--- a/src/eggdesktopfile.h
+++ b/src/eggdesktopfile.h
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; see the file COPYING.LIB. If not,
  * write to the Free Software Foundation, Inc., 59 Temple Place -
- * Suite 330, Boston, MA 02111-1307, USA.
+ * Suite 330, Boston, MA 02110-1301, USA.
  */
 
 #ifndef __EGG_DESKTOP_FILE_H__
diff --git a/src/eggshell.c b/src/eggshell.c
index 0a83d85..e7e7757 100644
--- a/src/eggshell.c
+++ b/src/eggshell.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Mate Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 /*
   @NOTATION@
diff --git a/src/eggshell.h b/src/eggshell.h
index a4d4c4b..39e5add 100644
--- a/src/eggshell.h
+++ b/src/eggshell.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Mate Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 /*
   @NOTATION@
diff --git a/src/eggsmclient-osx.c b/src/eggsmclient-osx.c
index 456616c..0cd7fbc 100644
--- a/src/eggsmclient-osx.c
+++ b/src/eggsmclient-osx.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /* EggSMClientOSX
diff --git a/src/eggsmclient-private.h b/src/eggsmclient-private.h
index d1e39cb..eebf884 100644
--- a/src/eggsmclient-private.h
+++ b/src/eggsmclient-private.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __EGG_SM_CLIENT_PRIVATE_H__
diff --git a/src/eggsmclient-win32.c b/src/eggsmclient-win32.c
index 745b265..c037a15 100644
--- a/src/eggsmclient-win32.c
+++ b/src/eggsmclient-win32.c
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /* EggSMClientWin32
diff --git a/src/eggsmclient-xsmp.c b/src/eggsmclient-xsmp.c
index 5cade1f..c52b689 100644
--- a/src/eggsmclient-xsmp.c
+++ b/src/eggsmclient-xsmp.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/src/eggsmclient.c b/src/eggsmclient.c
index a347eae..a938675 100644
--- a/src/eggsmclient.c
+++ b/src/eggsmclient.c
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/src/eggsmclient.h b/src/eggsmclient.h
index 2916036..48112ef 100644
--- a/src/eggsmclient.h
+++ b/src/eggsmclient.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __EGG_SM_CLIENT_H__
diff --git a/src/profile-editor.h b/src/profile-editor.h
index 2eec796..8fd6e7f 100644
--- a/src/profile-editor.h
+++ b/src/profile-editor.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_PROFILE_EDITOR_H
diff --git a/src/skey-popup.h b/src/skey-popup.h
index e0ac7cf..2bc1452 100644
--- a/src/skey-popup.h
+++ b/src/skey-popup.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SKEY_POPUP_H
diff --git a/src/skey/md4.c b/src/skey/md4.c
index 5456340..9061581 100644
--- a/src/skey/md4.c
+++ b/src/skey/md4.c
@@ -13,8 +13,8 @@
  *
  *    You should have received a copy of the GNU Library General Public
  *    License along with this library; if not, write to the
- *    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *    Boston, MA 02111-1307, USA.
+ *    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *    Boston, MA 02110-1301, USA.
  */
 
 /*
diff --git a/src/terminal-accels.h b/src/terminal-accels.h
index 3707146..16a5f74 100644
--- a/src/terminal-accels.h
+++ b/src/terminal-accels.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_ACCELS_H
diff --git a/src/terminal-app.h b/src/terminal-app.h
index 490121c..586902d 100644
--- a/src/terminal-app.h
+++ b/src/terminal-app.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_APP_H
diff --git a/src/terminal-debug.c b/src/terminal-debug.c
index de75e41..f4be4e2 100644
--- a/src/terminal-debug.c
+++ b/src/terminal-debug.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/src/terminal-debug.h b/src/terminal-debug.h
index 1f03ec3..53f88f1 100644
--- a/src/terminal-debug.h
+++ b/src/terminal-debug.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /* The interfaces in this file are subject to change at any time. */
diff --git a/src/terminal-encoding.h b/src/terminal-encoding.h
index 529c1e1..ee13417 100644
--- a/src/terminal-encoding.h
+++ b/src/terminal-encoding.h
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_ENCODING_H
diff --git a/src/terminal-info-bar.c b/src/terminal-info-bar.c
index edf77db..0574224 100644
--- a/src/terminal-info-bar.c
+++ b/src/terminal-info-bar.c
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/src/terminal-info-bar.h b/src/terminal-info-bar.h
index 6a53c8b..125224b 100644
--- a/src/terminal-info-bar.h
+++ b/src/terminal-info-bar.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_INFO_BAR_H
diff --git a/src/terminal-intl.h b/src/terminal-intl.h
index cc9f9a2..ea34df4 100644
--- a/src/terminal-intl.h
+++ b/src/terminal-intl.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_INTL_H
diff --git a/src/terminal-profile.h b/src/terminal-profile.h
index 351f0ec..e7ac3bf 100644
--- a/src/terminal-profile.h
+++ b/src/terminal-profile.h
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_PROFILE_H
diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c
index 53865f6..1681c6d 100644
--- a/src/terminal-screen-container.c
+++ b/src/terminal-screen-container.c
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/src/terminal-screen-container.h b/src/terminal-screen-container.h
index 7f96760..d9eac83 100644
--- a/src/terminal-screen-container.h
+++ b/src/terminal-screen-container.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_SCREEN_CONTAINER_H
diff --git a/src/terminal-screen.h b/src/terminal-screen.h
index 428b893..b74372b 100644
--- a/src/terminal-screen.h
+++ b/src/terminal-screen.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_SCREEN_H
diff --git a/src/terminal-search-dialog.c b/src/terminal-search-dialog.c
index 05fe398..0228af1 100644
--- a/src/terminal-search-dialog.c
+++ b/src/terminal-search-dialog.c
@@ -14,8 +14,8 @@
  *
  * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/src/terminal-search-dialog.h b/src/terminal-search-dialog.h
index c685c44..593290a 100644
--- a/src/terminal-search-dialog.h
+++ b/src/terminal-search-dialog.h
@@ -14,8 +14,8 @@
  *
  * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_SEARCH_DIALOG_H
diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
index 94c2b80..a24677d 100644
--- a/src/terminal-tab-label.c
+++ b/src/terminal-tab-label.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h
index 89c9fd2..c30580f 100644
--- a/src/terminal-tab-label.h
+++ b/src/terminal-tab-label.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_TAB_LABEL_H
diff --git a/src/terminal-util.h b/src/terminal-util.h
index 00ed8a4..24a5a81 100644
--- a/src/terminal-util.h
+++ b/src/terminal-util.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_UTIL_H
diff --git a/src/terminal-window.h b/src/terminal-window.h
index a2403d9..d00f825 100644
--- a/src/terminal-window.h
+++ b/src/terminal-window.h
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TERMINAL_WINDOW_H