Fixed incorrect fsf addresses. Closes #28.

373 files changed, 654 insertions, 654 deletions

diff --git a/cut-n-paste-code/libegg/eggdesktopfile.c b/cut-n-paste-code/libegg/eggdesktopfile.c
index 6e9cf44d..f6547e1b 100644
--- a/cut-n-paste-code/libegg/eggdesktopfile.c
+++ b/cut-n-paste-code/libegg/eggdesktopfile.c
@@ -17,8 +17,8 @@
  *
  * 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.
+ * write to the Free Software Foundation, Inc., Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/cut-n-paste-code/libegg/eggdesktopfile.h b/cut-n-paste-code/libegg/eggdesktopfile.h
index 6a6d580a..4a1d4064 100644
--- a/cut-n-paste-code/libegg/eggdesktopfile.h
+++ b/cut-n-paste-code/libegg/eggdesktopfile.h
@@ -13,8 +13,8 @@
  *
  * 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.
+ * write to the Free Software Foundation, Inc., Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __EGG_DESKTOP_FILE_H__
diff --git a/cut-n-paste-code/libegg/eggsmclient-private.h b/cut-n-paste-code/libegg/eggsmclient-private.h
index 68f1c9ea..a8da9c7a 100644
--- a/cut-n-paste-code/libegg/eggsmclient-private.h
+++ b/cut-n-paste-code/libegg/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/cut-n-paste-code/libegg/eggsmclient-xsmp.c b/cut-n-paste-code/libegg/eggsmclient-xsmp.c
index 40d8c270..f6aae232 100644
--- a/cut-n-paste-code/libegg/eggsmclient-xsmp.c
+++ b/cut-n-paste-code/libegg/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/cut-n-paste-code/libegg/eggsmclient.c b/cut-n-paste-code/libegg/eggsmclient.c
index 280c7ded..f0226e34 100644
--- a/cut-n-paste-code/libegg/eggsmclient.c
+++ b/cut-n-paste-code/libegg/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/cut-n-paste-code/libegg/eggsmclient.h b/cut-n-paste-code/libegg/eggsmclient.h
index f025bb50..1fba40cd 100644
--- a/cut-n-paste-code/libegg/eggsmclient.h
+++ b/cut-n-paste-code/libegg/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/cut-n-paste-code/libegg/eggtreemultidnd.c b/cut-n-paste-code/libegg/eggtreemultidnd.c
index ff62b9dd..572f50ca 100644
--- a/cut-n-paste-code/libegg/eggtreemultidnd.c
+++ b/cut-n-paste-code/libegg/eggtreemultidnd.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.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/cut-n-paste-code/libegg/eggtreemultidnd.h b/cut-n-paste-code/libegg/eggtreemultidnd.h
index f7b98e51..0510e517 100644
--- a/cut-n-paste-code/libegg/eggtreemultidnd.h
+++ b/cut-n-paste-code/libegg/eggtreemultidnd.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 __EGG_TREE_MULTI_DND_H__
diff --git a/eel/check-program.c b/eel/check-program.c
index b1e0a3c7..b0cb3d9a 100644
--- a/eel/check-program.c
+++ b/eel/check-program.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-accessibility.c b/eel/eel-accessibility.c
index 1a8a8037..707756d1 100644
--- a/eel/eel-accessibility.c
+++ b/eel/eel-accessibility.c
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Eel 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:
 	Anders Carlsson <[email protected]>
diff --git a/eel/eel-accessibility.h b/eel/eel-accessibility.h
index 3ca24a0f..45514c91 100644
--- a/eel/eel-accessibility.h
+++ b/eel/eel-accessibility.h
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Eel 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: Anders Carlsson <[email protected]>
 */
diff --git a/eel/eel-alert-dialog.c b/eel/eel-alert-dialog.c
index 976c1227..726e4c67 100644
--- a/eel/eel-alert-dialog.c
+++ b/eel/eel-alert-dialog.c
@@ -14,8 +14,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.
 
 */
 #include <config.h>
diff --git a/eel/eel-alert-dialog.h b/eel/eel-alert-dialog.h
index 62d86a27..b1bbebe0 100644
--- a/eel/eel-alert-dialog.h
+++ b/eel/eel-alert-dialog.h
@@ -14,8 +14,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.
 
 */
 
diff --git a/eel/eel-art-extensions.c b/eel/eel-art-extensions.c
index c245101b..505d12ca 100644
--- a/eel/eel-art-extensions.c
+++ b/eel/eel-art-extensions.c
@@ -16,8 +16,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 <[email protected]>
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-art-extensions.h b/eel/eel-art-extensions.h
index 67f5aa04..273a035a 100644
--- a/eel/eel-art-extensions.h
+++ b/eel/eel-art-extensions.h
@@ -16,8 +16,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 <[email protected]>
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-art-gtk-extensions.c b/eel/eel-art-gtk-extensions.c
index f3ccef3c..09f6d9d5 100644
--- a/eel/eel-art-gtk-extensions.c
+++ b/eel/eel-art-gtk-extensions.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-art-gtk-extensions.h b/eel/eel-art-gtk-extensions.h
index 3ad24f2d..aea709c3 100644
--- a/eel/eel-art-gtk-extensions.h
+++ b/eel/eel-art-gtk-extensions.h
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-background-box.c b/eel/eel-background-box.c
index 614d89ab..a3e98ed1 100644
--- a/eel/eel-background-box.c
+++ b/eel/eel-background-box.c
@@ -16,8 +16,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.
 
    Author: Dave Camp <[email protected]>
 */
diff --git a/eel/eel-background-box.h b/eel/eel-background-box.h
index 849f5ebf..1a8f3e36 100644
--- a/eel/eel-background-box.h
+++ b/eel/eel-background-box.h
@@ -16,8 +16,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.
 
    Author: Dave Camp <[email protected]>
 */
diff --git a/eel/eel-background.c b/eel/eel-background.c
index 4d12b37f..f43831e0 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-background.h b/eel/eel-background.h
index 36a6c3f5..3e299a30 100644
--- a/eel/eel-background.h
+++ b/eel/eel-background.h
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c
index 9481a7fd..c637769d 100644
--- a/eel/eel-canvas-rect-ellipse.c
+++ b/eel/eel-canvas-rect-ellipse.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/eel/eel-canvas-rect-ellipse.h b/eel/eel-canvas-rect-ellipse.h
index 06f1eeab..eb78bf1a 100644
--- a/eel/eel-canvas-rect-ellipse.h
+++ b/eel/eel-canvas-rect-ellipse.h
@@ -16,8 +16,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/eel/eel-canvas-util.c b/eel/eel-canvas-util.c
index ac90177f..26e2b29e 100644
--- a/eel/eel-canvas-util.c
+++ b/eel/eel-canvas-util.c
@@ -16,8 +16,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/eel/eel-canvas-util.h b/eel/eel-canvas-util.h
index e4484cde..62e53d04 100644
--- a/eel/eel-canvas-util.h
+++ b/eel/eel-canvas-util.h
@@ -16,8 +16,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/eel/eel-canvas.c b/eel/eel-canvas.c
index afa038f0..a4d6612d 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.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/eel/eel-canvas.h b/eel/eel-canvas.h
index 1d185a76..2f799c39 100644
--- a/eel/eel-canvas.h
+++ b/eel/eel-canvas.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/eel/eel-debug-drawing.c b/eel/eel-debug-drawing.c
index aee400d5..50ea70a4 100644
--- a/eel/eel-debug-drawing.c
+++ b/eel/eel-debug-drawing.c
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-debug-drawing.h b/eel/eel-debug-drawing.h
index ce655c23..8620ca6b 100644
--- a/eel/eel-debug-drawing.h
+++ b/eel/eel-debug-drawing.h
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-debug.c b/eel/eel-debug.c
index e651baed..25bfaceb 100644
--- a/eel/eel-debug.c
+++ b/eel/eel-debug.c
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-debug.h b/eel/eel-debug.h
index be7f0ab7..86a36ada 100644
--- a/eel/eel-debug.h
+++ b/eel/eel-debug.h
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index b41f197d..7780fe7f 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -13,7 +13,7 @@
  *
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /*
diff --git a/eel/eel-editable-label.h b/eel/eel-editable-label.h
index 559ac6a1..249a3367 100644
--- a/eel/eel-editable-label.h
+++ b/eel/eel-editable-label.h
@@ -13,7 +13,7 @@
  *
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /*
diff --git a/eel/eel-enumeration.c b/eel/eel-enumeration.c
index b9cd3bc3..df46ec61 100644
--- a/eel/eel-enumeration.c
+++ b/eel/eel-enumeration.c
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-enumeration.h b/eel/eel-enumeration.h
index 8b08aaa0..72cad6b4 100644
--- a/eel/eel-enumeration.h
+++ b/eel/eel-enumeration.h
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-gdk-extensions.c b/eel/eel-gdk-extensions.c
index acd85af5..86a8600e 100644
--- a/eel/eel-gdk-extensions.c
+++ b/eel/eel-gdk-extensions.c
@@ -16,8 +16,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 <[email protected]>,
             Pavel Cisler <[email protected]>,
diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h
index d5e041c5..91518186 100644
--- a/eel/eel-gdk-extensions.h
+++ b/eel/eel-gdk-extensions.h
@@ -16,8 +16,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 <[email protected]>,
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c
index a58ef4c5..a75158db 100644
--- a/eel/eel-gdk-pixbuf-extensions.c
+++ b/eel/eel-gdk-pixbuf-extensions.c
@@ -16,8 +16,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 <[email protected]>
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-gdk-pixbuf-extensions.h b/eel/eel-gdk-pixbuf-extensions.h
index cb66348c..7d7956e4 100644
--- a/eel/eel-gdk-pixbuf-extensions.h
+++ b/eel/eel-gdk-pixbuf-extensions.h
@@ -16,8 +16,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 <[email protected]>
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c
index b72029fd..80180054 100644
--- a/eel/eel-glib-extensions.c
+++ b/eel/eel-glib-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: John Sullivan <[email protected]>
 */
diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h
index ac36fe7e..fc973852 100644
--- a/eel/eel-glib-extensions.h
+++ b/eel/eel-glib-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: John Sullivan <[email protected]>
 */
diff --git a/eel/eel-graphic-effects.c b/eel/eel-graphic-effects.c
index c96135d8..b234b914 100644
--- a/eel/eel-graphic-effects.c
+++ b/eel/eel-graphic-effects.c
@@ -18,8 +18,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.
  */
 
 /* This file contains pixbuf manipulation routines used for graphical effects like pre-lighting
diff --git a/eel/eel-graphic-effects.h b/eel/eel-graphic-effects.h
index 5f174c83..7ac627f1 100644
--- a/eel/eel-graphic-effects.h
+++ b/eel/eel-graphic-effects.h
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Andy Hertzfeld <[email protected]>
  */
diff --git a/eel/eel-gtk-container.c b/eel/eel-gtk-container.c
index 033579c5..cb841fd5 100644
--- a/eel/eel-gtk-container.c
+++ b/eel/eel-gtk-container.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.
 
    Authors: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-gtk-container.h b/eel/eel-gtk-container.h
index 6b2dd0fa..f5ca876d 100644
--- a/eel/eel-gtk-container.h
+++ b/eel/eel-gtk-container.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.
 
    Authors: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index da78a532..94c4987d 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-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: John Sullivan <[email protected]>
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h
index 21ab382d..e286bf74 100644
--- a/eel/eel-gtk-extensions.h
+++ b/eel/eel-gtk-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: John Sullivan <[email protected]>
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-gtk-macros.h b/eel/eel-gtk-macros.h
index 996d75f8..2bf8e064 100644
--- a/eel/eel-gtk-macros.h
+++ b/eel/eel-gtk-macros.h
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Darin Adler <[email protected]>
             Ramiro Estrugo <[email protected]>
diff --git a/eel/eel-i18n.c b/eel/eel-i18n.c
index b43163e3..9e7ef29b 100644
--- a/eel/eel-i18n.c
+++ b/eel/eel-i18n.c
@@ -16,8 +16,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: Frederic Crozat <[email protected]>
 */
diff --git a/eel/eel-i18n.h b/eel/eel-i18n.h
index 827539d8..68b71f11 100644
--- a/eel/eel-i18n.h
+++ b/eel/eel-i18n.h
@@ -16,8 +16,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: Frederic Crozat <[email protected]>
 */
diff --git a/eel/eel-image-table.c b/eel/eel-image-table.c
index 25f67a0a..8f87660b 100644
--- a/eel/eel-image-table.c
+++ b/eel/eel-image-table.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-image-table.h b/eel/eel-image-table.h
index 90602a76..780e23c4 100644
--- a/eel/eel-image-table.h
+++ b/eel/eel-image-table.h
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c
index 76a23876..c1e51070 100644
--- a/eel/eel-labeled-image.c
+++ b/eel/eel-labeled-image.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-labeled-image.h b/eel/eel-labeled-image.h
index 22058a0e..bb3a4cbb 100644
--- a/eel/eel-labeled-image.h
+++ b/eel/eel-labeled-image.h
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-lib-self-check-functions.c b/eel/eel-lib-self-check-functions.c
index 89ea2c7c..81f826a5 100644
--- a/eel/eel-lib-self-check-functions.c
+++ b/eel/eel-lib-self-check-functions.c
@@ -17,8 +17,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-lib-self-check-functions.h b/eel/eel-lib-self-check-functions.h
index 6a103171..e538178e 100644
--- a/eel/eel-lib-self-check-functions.h
+++ b/eel/eel-lib-self-check-functions.h
@@ -17,8 +17,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-mate-extensions.c b/eel/eel-mate-extensions.c
index 212abefc..aca3cddf 100644
--- a/eel/eel-mate-extensions.c
+++ b/eel/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 <[email protected]>
 */
diff --git a/eel/eel-mate-extensions.h b/eel/eel-mate-extensions.h
index 4261c9da..cabd4380 100644
--- a/eel/eel-mate-extensions.h
+++ b/eel/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 <[email protected]>
 */
diff --git a/eel/eel-mateconf-extensions.c b/eel/eel-mateconf-extensions.c
index 518f0a3f..43f5b8b2 100644
--- a/eel/eel-mateconf-extensions.c
+++ b/eel/eel-mateconf-extensions.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-mateconf-extensions.h b/eel/eel-mateconf-extensions.h
index 5f1275da..60554272 100644
--- a/eel/eel-mateconf-extensions.h
+++ b/eel/eel-mateconf-extensions.h
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-pango-extensions.c b/eel/eel-pango-extensions.c
index ec34c9c9..68a9b08e 100644
--- a/eel/eel-pango-extensions.c
+++ b/eel/eel-pango-extensions.c
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Eel 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: Anders Carlsson <[email protected]>
 */
diff --git a/eel/eel-pango-extensions.h b/eel/eel-pango-extensions.h
index e788ffcc..2be3a965 100644
--- a/eel/eel-pango-extensions.h
+++ b/eel/eel-pango-extensions.h
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Eel 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: Anders Carlsson <[email protected]>
 */
diff --git a/eel/eel-preferences-builder.c b/eel/eel-preferences-builder.c
index e02ca4df..87ea530b 100644
--- a/eel/eel-preferences-builder.c
+++ b/eel/eel-preferences-builder.c
@@ -16,8 +16,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: Jan Arne Petersen <[email protected]>
 */
diff --git a/eel/eel-preferences.c b/eel/eel-preferences.c
index 7a24ed11..a60d0a9e 100644
--- a/eel/eel-preferences.c
+++ b/eel/eel-preferences.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-preferences.h b/eel/eel-preferences.h
index ecbd7704..75fbeaf5 100644
--- a/eel/eel-preferences.h
+++ b/eel/eel-preferences.h
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-self-checks.c b/eel/eel-self-checks.c
index c1fa425f..eca9cc2f 100644
--- a/eel/eel-self-checks.c
+++ b/eel/eel-self-checks.c
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-self-checks.h b/eel/eel-self-checks.h
index 778a2be2..50313258 100644
--- a/eel/eel-self-checks.h
+++ b/eel/eel-self-checks.h
@@ -16,8 +16,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
index c538971c..c9cadfb3 100644
--- a/eel/eel-stock-dialogs.c
+++ b/eel/eel-stock-dialogs.c
@@ -16,8 +16,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 <[email protected]>
 */
diff --git a/eel/eel-stock-dialogs.h b/eel/eel-stock-dialogs.h
index 8e4f105f..178f02de 100644
--- a/eel/eel-stock-dialogs.h
+++ b/eel/eel-stock-dialogs.h
@@ -16,8 +16,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 <[email protected]>
 */
diff --git a/eel/eel-string.c b/eel/eel-string.c
index f554b91c..fd733f88 100644
--- a/eel/eel-string.c
+++ b/eel/eel-string.c
@@ -16,8 +16,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 <[email protected]>
 */
diff --git a/eel/eel-string.h b/eel/eel-string.h
index ffd5c647..fb98157a 100644
--- a/eel/eel-string.h
+++ b/eel/eel-string.h
@@ -16,8 +16,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 <[email protected]>
 */
diff --git a/eel/eel-types.c b/eel/eel-types.c
index 3b93817e..4b5ae176 100644
--- a/eel/eel-types.c
+++ b/eel/eel-types.c
@@ -15,8 +15,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: Maciej Stachowiak <[email protected]>
 */
diff --git a/eel/eel-types.h b/eel/eel-types.h
index cf18f3f1..ff25087d 100644
--- a/eel/eel-types.h
+++ b/eel/eel-types.h
@@ -15,8 +15,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: Maciej Stachowiak <[email protected]>
 */
diff --git a/eel/eel-vfs-extensions.c b/eel/eel-vfs-extensions.c
index 0ddea688..27db2a46 100644
--- a/eel/eel-vfs-extensions.c
+++ b/eel/eel-vfs-extensions.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.
 
    Authors: Darin Adler <[email protected]>
 	    Pavel Cisler <[email protected]>
diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h
index 596da8c3..a79df1c3 100644
--- a/eel/eel-vfs-extensions.h
+++ b/eel/eel-vfs-extensions.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.
 
    Authors: Darin Adler <[email protected]>
 	    Pavel Cisler <[email protected]>
diff --git a/eel/eel-wrap-table.c b/eel/eel-wrap-table.c
index 12325a14..f7e8a6ad 100644
--- a/eel/eel-wrap-table.c
+++ b/eel/eel-wrap-table.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-wrap-table.h b/eel/eel-wrap-table.h
index 0353b19c..b6a94dff 100644
--- a/eel/eel-wrap-table.h
+++ b/eel/eel-wrap-table.h
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/eel/eel-xml-extensions.c b/eel/eel-xml-extensions.c
index a2d3a3a2..fe4a91a4 100644
--- a/eel/eel-xml-extensions.c
+++ b/eel/eel-xml-extensions.c
@@ -16,8 +16,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 <[email protected]>
 */
diff --git a/eel/eel-xml-extensions.h b/eel/eel-xml-extensions.h
index 76ad4b84..328e1d33 100644
--- a/eel/eel-xml-extensions.h
+++ b/eel/eel-xml-extensions.h
@@ -16,8 +16,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 <[email protected]>
 */
diff --git a/eel/eel.h b/eel/eel.h
index 80c848cc..7af76e96 100644
--- a/eel/eel.h
+++ b/eel/eel.h
@@ -16,8 +16,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: Maciej Stachowiak <[email protected]>
 */
diff --git a/libcaja-extension/caja-column-provider.c b/libcaja-extension/caja-column-provider.c
index dac1fcaf..9faf438f 100644
--- a/libcaja-extension/caja-column-provider.c
+++ b/libcaja-extension/caja-column-provider.c
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-column-provider.h b/libcaja-extension/caja-column-provider.h
index beb9b5ae..c3ba919f 100644
--- a/libcaja-extension/caja-column-provider.h
+++ b/libcaja-extension/caja-column-provider.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-column.c b/libcaja-extension/caja-column.c
index 5a29550f..ce0d2c33 100644
--- a/libcaja-extension/caja-column.c
+++ b/libcaja-extension/caja-column.c
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-column.h b/libcaja-extension/caja-column.h
index 8bc80318..e60f7889 100644
--- a/libcaja-extension/caja-column.h
+++ b/libcaja-extension/caja-column.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-extension-private.h b/libcaja-extension/caja-extension-private.h
index 9babbb50..a22e7e74 100644
--- a/libcaja-extension/caja-extension-private.h
+++ b/libcaja-extension/caja-extension-private.h
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Alexander Larsson <[email protected]>
  *
diff --git a/libcaja-extension/caja-extension-types.c b/libcaja-extension/caja-extension-types.c
index 77b0506b..adc977ab 100644
--- a/libcaja-extension/caja-extension-types.c
+++ b/libcaja-extension/caja-extension-types.c
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-extension-types.h b/libcaja-extension/caja-extension-types.h
index cb344ec3..a72dd41e 100644
--- a/libcaja-extension/caja-extension-types.h
+++ b/libcaja-extension/caja-extension-types.h
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-file-info.c b/libcaja-extension/caja-file-info.c
index f3947167..accbb4e9 100644
--- a/libcaja-extension/caja-file-info.c
+++ b/libcaja-extension/caja-file-info.c
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/libcaja-extension/caja-file-info.h b/libcaja-extension/caja-file-info.h
index 48cba602..6ad2d10f 100644
--- a/libcaja-extension/caja-file-info.h
+++ b/libcaja-extension/caja-file-info.h
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/libcaja-extension/caja-info-provider.c b/libcaja-extension/caja-info-provider.c
index 0816142a..76c67157 100644
--- a/libcaja-extension/caja-info-provider.c
+++ b/libcaja-extension/caja-info-provider.c
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-info-provider.h b/libcaja-extension/caja-info-provider.h
index e4be7c47..69371f96 100644
--- a/libcaja-extension/caja-info-provider.h
+++ b/libcaja-extension/caja-info-provider.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-location-widget-provider.c b/libcaja-extension/caja-location-widget-provider.c
index 4a915b3b..3ac29096 100644
--- a/libcaja-extension/caja-location-widget-provider.c
+++ b/libcaja-extension/caja-location-widget-provider.c
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Alexander Larsson <[email protected]>
  *
diff --git a/libcaja-extension/caja-location-widget-provider.h b/libcaja-extension/caja-location-widget-provider.h
index 6d9af7a2..9b3ade46 100644
--- a/libcaja-extension/caja-location-widget-provider.h
+++ b/libcaja-extension/caja-location-widget-provider.h
@@ -17,7 +17,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *           Alexander Larsson <[email protected]>
diff --git a/libcaja-extension/caja-menu-item.c b/libcaja-extension/caja-menu-item.c
index 967f8001..f83131a7 100644
--- a/libcaja-extension/caja-menu-item.c
+++ b/libcaja-extension/caja-menu-item.c
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-menu-item.h b/libcaja-extension/caja-menu-item.h
index c598b131..1d972fbd 100644
--- a/libcaja-extension/caja-menu-item.h
+++ b/libcaja-extension/caja-menu-item.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-menu-provider.c b/libcaja-extension/caja-menu-provider.c
index 98b3714d..fa2fc0ed 100644
--- a/libcaja-extension/caja-menu-provider.c
+++ b/libcaja-extension/caja-menu-provider.c
@@ -17,7 +17,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-menu-provider.h b/libcaja-extension/caja-menu-provider.h
index 0e947932..2177a8cc 100644
--- a/libcaja-extension/caja-menu-provider.h
+++ b/libcaja-extension/caja-menu-provider.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-menu.c b/libcaja-extension/caja-menu.c
index 3b29b27b..5f0c06b4 100644
--- a/libcaja-extension/caja-menu.c
+++ b/libcaja-extension/caja-menu.c
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Raffaele Sandrini <[email protected]>
  *
diff --git a/libcaja-extension/caja-menu.h b/libcaja-extension/caja-menu.h
index 7d75e337..58a5e158 100644
--- a/libcaja-extension/caja-menu.h
+++ b/libcaja-extension/caja-menu.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *           Raffaele Sandrini <[email protected]>
diff --git a/libcaja-extension/caja-property-page-provider.c b/libcaja-extension/caja-property-page-provider.c
index da6ab1d0..90780a10 100644
--- a/libcaja-extension/caja-property-page-provider.c
+++ b/libcaja-extension/caja-property-page-provider.c
@@ -17,7 +17,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-property-page-provider.h b/libcaja-extension/caja-property-page-provider.h
index a9f0227c..6dd82625 100644
--- a/libcaja-extension/caja-property-page-provider.h
+++ b/libcaja-extension/caja-property-page-provider.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-property-page.c b/libcaja-extension/caja-property-page.c
index 2ad869c4..ad3313c8 100644
--- a/libcaja-extension/caja-property-page.c
+++ b/libcaja-extension/caja-property-page.c
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-extension/caja-property-page.h b/libcaja-extension/caja-property-page.h
index 1e9e8b3a..1de9f9ea 100644
--- a/libcaja-extension/caja-property-page.h
+++ b/libcaja-extension/caja-property-page.h
@@ -16,7 +16,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author:  Dave Camp <[email protected]>
  *
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index eacef167..78340c5e 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: David Zeuthen <[email protected]>
  */
diff --git a/libcaja-private/caja-autorun.h b/libcaja-private/caja-autorun.h
index cafecd7a..43223639 100644
--- a/libcaja-private/caja-autorun.h
+++ b/libcaja-private/caja-autorun.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: David Zeuthen <[email protected]>
  */
diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c
index bf174247..e20efd96 100644
--- a/libcaja-private/caja-bookmark.c
+++ b/libcaja-private/caja-bookmark.c
@@ -16,8 +16,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: John Sullivan <[email protected]>
 */
diff --git a/libcaja-private/caja-bookmark.h b/libcaja-private/caja-bookmark.h
index 2bf44208..3aa99645 100644
--- a/libcaja-private/caja-bookmark.h
+++ b/libcaja-private/caja-bookmark.h
@@ -16,8 +16,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: John Sullivan <[email protected]>
 */
diff --git a/libcaja-private/caja-cell-renderer-pixbuf-emblem.c b/libcaja-private/caja-cell-renderer-pixbuf-emblem.c
index 150e9eb2..4fec3a4a 100644
--- a/libcaja-private/caja-cell-renderer-pixbuf-emblem.c
+++ b/libcaja-private/caja-cell-renderer-pixbuf-emblem.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    This is based on GtkCellRendererPixbuf written by
    Jonathan Blandford <[email protected]>
diff --git a/libcaja-private/caja-cell-renderer-pixbuf-emblem.h b/libcaja-private/caja-cell-renderer-pixbuf-emblem.h
index 404c0d64..cfdf93d4 100644
--- a/libcaja-private/caja-cell-renderer-pixbuf-emblem.h
+++ b/libcaja-private/caja-cell-renderer-pixbuf-emblem.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    This is based on GtkCellRendererPixbuf written by
    Jonathan Blandford <[email protected]>
diff --git a/libcaja-private/caja-cell-renderer-text-ellipsized.c b/libcaja-private/caja-cell-renderer-text-ellipsized.c
index 7b200d2e..4c3cd443 100644
--- a/libcaja-private/caja-cell-renderer-text-ellipsized.c
+++ b/libcaja-private/caja-cell-renderer-text-ellipsized.c
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Martin Wehner <[email protected]>
 */
diff --git a/libcaja-private/caja-cell-renderer-text-ellipsized.h b/libcaja-private/caja-cell-renderer-text-ellipsized.h
index 7ff2e3a2..28e2bc9a 100644
--- a/libcaja-private/caja-cell-renderer-text-ellipsized.h
+++ b/libcaja-private/caja-cell-renderer-text-ellipsized.h
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Martin Wehner <[email protected]>
 */
diff --git a/libcaja-private/caja-clipboard-monitor.c b/libcaja-private/caja-clipboard-monitor.c
index a2258cae..d1483ae4 100644
--- a/libcaja-private/caja-clipboard-monitor.c
+++ b/libcaja-private/caja-clipboard-monitor.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-clipboard-monitor.h b/libcaja-private/caja-clipboard-monitor.h
index 19b9617d..8ea4e686 100644
--- a/libcaja-private/caja-clipboard-monitor.h
+++ b/libcaja-private/caja-clipboard-monitor.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c
index 53a3b8d9..b1614509 100644
--- a/libcaja-private/caja-clipboard.c
+++ b/libcaja-private/caja-clipboard.c
@@ -20,8 +20,8 @@
  *
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors: Rebecca Schulman <[email protected]>,
  *          Darin Adler <[email protected]>
diff --git a/libcaja-private/caja-clipboard.h b/libcaja-private/caja-clipboard.h
index 22dcbde7..3b9c1c16 100644
--- a/libcaja-private/caja-clipboard.h
+++ b/libcaja-private/caja-clipboard.h
@@ -17,8 +17,8 @@
  *
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Author: Rebecca Schulman <[email protected]>
  */
diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c
index 0bc52a30..d1fd243a 100644
--- a/libcaja-private/caja-column-chooser.c
+++ b/libcaja-private/caja-column-chooser.c
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Mate Library; see the column 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: Dave Camp <[email protected]>
 */
diff --git a/libcaja-private/caja-column-chooser.h b/libcaja-private/caja-column-chooser.h
index 9c99078c..e54eb00a 100644
--- a/libcaja-private/caja-column-chooser.h
+++ b/libcaja-private/caja-column-chooser.h
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Mate Library; see the column 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: Dave Camp <[email protected]>
 */
diff --git a/libcaja-private/caja-column-utilities.c b/libcaja-private/caja-column-utilities.c
index 19794891..3b789221 100644
--- a/libcaja-private/caja-column-utilities.c
+++ b/libcaja-private/caja-column-utilities.c
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Mate Library; see the column 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: Dave Camp <[email protected]>
 */
diff --git a/libcaja-private/caja-column-utilities.h b/libcaja-private/caja-column-utilities.h
index 2a6a99bd..73800c5f 100644
--- a/libcaja-private/caja-column-utilities.h
+++ b/libcaja-private/caja-column-utilities.h
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Mate Library; see the column 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: Dave Camp <[email protected]>
 */
diff --git a/libcaja-private/caja-customization-data.c b/libcaja-private/caja-customization-data.c
index e96cd7c6..f29eee40 100644
--- a/libcaja-private/caja-customization-data.c
+++ b/libcaja-private/caja-customization-data.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Rebecca Schulman <[email protected]>
  */
diff --git a/libcaja-private/caja-customization-data.h b/libcaja-private/caja-customization-data.h
index 92d74af2..b2294b8d 100644
--- a/libcaja-private/caja-customization-data.h
+++ b/libcaja-private/caja-customization-data.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Rebecca Schulman <[email protected]>
  */
diff --git a/libcaja-private/caja-debug-log.c b/libcaja-private/caja-debug-log.c
index 66192ced..89ff6933 100644
--- a/libcaja-private/caja-debug-log.c
+++ b/libcaja-private/caja-debug-log.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Federico Mena-Quintero <[email protected]>
 */
diff --git a/libcaja-private/caja-debug-log.h b/libcaja-private/caja-debug-log.h
index 9f82b513..b4f41bd9 100644
--- a/libcaja-private/caja-debug-log.h
+++ b/libcaja-private/caja-debug-log.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Federico Mena-Quintero <[email protected]>
 */
diff --git a/libcaja-private/caja-default-file-icon.c b/libcaja-private/caja-default-file-icon.c
index c9389471..2ae91670 100644
--- a/libcaja-private/caja-default-file-icon.c
+++ b/libcaja-private/caja-default-file-icon.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-default-file-icon.h b/libcaja-private/caja-default-file-icon.h
index 0fd31870..7a78334c 100644
--- a/libcaja-private/caja-default-file-icon.h
+++ b/libcaja-private/caja-default-file-icon.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-directory-file.c b/libcaja-private/caja-desktop-directory-file.c
index a87ec431..0adf239f 100644
--- a/libcaja-private/caja-desktop-directory-file.c
+++ b/libcaja-private/caja-desktop-directory-file.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-directory-file.h b/libcaja-private/caja-desktop-directory-file.h
index ec6f3217..367fa1fd 100644
--- a/libcaja-private/caja-desktop-directory-file.h
+++ b/libcaja-private/caja-desktop-directory-file.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c
index 11f1f3c0..1b334f1f 100644
--- a/libcaja-private/caja-desktop-directory.c
+++ b/libcaja-private/caja-desktop-directory.c
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-directory.h b/libcaja-private/caja-desktop-directory.h
index 06a050fc..da18fb87 100644
--- a/libcaja-private/caja-desktop-directory.h
+++ b/libcaja-private/caja-desktop-directory.h
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-icon-file.c b/libcaja-private/caja-desktop-icon-file.c
index 5b216a45..fa5ad094 100644
--- a/libcaja-private/caja-desktop-icon-file.c
+++ b/libcaja-private/caja-desktop-icon-file.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-icon-file.h b/libcaja-private/caja-desktop-icon-file.h
index bb0474e6..f65f82a0 100644
--- a/libcaja-private/caja-desktop-icon-file.h
+++ b/libcaja-private/caja-desktop-icon-file.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-link-monitor.c b/libcaja-private/caja-desktop-link-monitor.c
index a88a32ea..c8720307 100644
--- a/libcaja-private/caja-desktop-link-monitor.c
+++ b/libcaja-private/caja-desktop-link-monitor.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-link-monitor.h b/libcaja-private/caja-desktop-link-monitor.h
index e05599c3..e962386e 100644
--- a/libcaja-private/caja-desktop-link-monitor.h
+++ b/libcaja-private/caja-desktop-link-monitor.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-link.c b/libcaja-private/caja-desktop-link.c
index e632a5b0..502d6ef0 100644
--- a/libcaja-private/caja-desktop-link.c
+++ b/libcaja-private/caja-desktop-link.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-desktop-link.h b/libcaja-private/caja-desktop-link.h
index 001b2fcf..113d20b3 100644
--- a/libcaja-private/caja-desktop-link.h
+++ b/libcaja-private/caja-desktop-link.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 4451efc1..3baa3f75 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-directory-background.c b/libcaja-private/caja-directory-background.c
index ad1306f2..69c792d6 100644
--- a/libcaja-private/caja-directory-background.c
+++ b/libcaja-private/caja-directory-background.c
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-directory-background.h b/libcaja-private/caja-directory-background.h
index a9a23bd7..080655cf 100644
--- a/libcaja-private/caja-directory-background.h
+++ b/libcaja-private/caja-directory-background.h
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-directory-notify.h b/libcaja-private/caja-directory-notify.h
index 82aa1f72..63346dab 100644
--- a/libcaja-private/caja-directory-notify.h
+++ b/libcaja-private/caja-directory-notify.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-directory-private.h b/libcaja-private/caja-directory-private.h
index 207a5890..e5c2d201 100644
--- a/libcaja-private/caja-directory-private.h
+++ b/libcaja-private/caja-directory-private.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index 5c1aa80d..fb047567 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-directory.h b/libcaja-private/caja-directory.h
index 5ad935e9..5beda869 100644
--- a/libcaja-private/caja-directory.h
+++ b/libcaja-private/caja-directory.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c
index 9b794956..87617a77 100644
--- a/libcaja-private/caja-dnd.c
+++ b/libcaja-private/caja-dnd.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.
 
    Authors: Pavel Cisler <[email protected]>,
    	    Ettore Perazzoli <[email protected]>
diff --git a/libcaja-private/caja-dnd.h b/libcaja-private/caja-dnd.h
index 1861c404..b9a74382 100644
--- a/libcaja-private/caja-dnd.h
+++ b/libcaja-private/caja-dnd.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.
 
    Authors: Pavel Cisler <[email protected]>,
 	    Ettore Perazzoli <[email protected]>
diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c
index b1813e10..3c41a016 100644
--- a/libcaja-private/caja-emblem-utils.c
+++ b/libcaja-private/caja-emblem-utils.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-emblem-utils.h b/libcaja-private/caja-emblem-utils.h
index ef679f8c..cdc4e677 100644
--- a/libcaja-private/caja-emblem-utils.h
+++ b/libcaja-private/caja-emblem-utils.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-entry.c b/libcaja-private/caja-entry.c
index 5ebb62a6..5e34c84e 100644
--- a/libcaja-private/caja-entry.c
+++ b/libcaja-private/caja-entry.c
@@ -20,8 +20,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/libcaja-private/caja-entry.h b/libcaja-private/caja-entry.h
index 5c774bda..afe2204a 100644
--- a/libcaja-private/caja-entry.h
+++ b/libcaja-private/caja-entry.h
@@ -20,8 +20,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 CAJA_ENTRY_H
diff --git a/libcaja-private/caja-file-attributes.h b/libcaja-private/caja-file-attributes.h
index 11d643c2..a35cc32c 100644
--- a/libcaja-private/caja-file-attributes.h
+++ b/libcaja-private/caja-file-attributes.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-file-changes-queue.c b/libcaja-private/caja-file-changes-queue.c
index 0be95302..b3cd1db0 100644
--- a/libcaja-private/caja-file-changes-queue.c
+++ b/libcaja-private/caja-file-changes-queue.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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Pavel Cisler <[email protected]>
 */
diff --git a/libcaja-private/caja-file-changes-queue.h b/libcaja-private/caja-file-changes-queue.h
index 3b69bc75..0d159158 100644
--- a/libcaja-private/caja-file-changes-queue.h
+++ b/libcaja-private/caja-file-changes-queue.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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Pavel Cisler <[email protected]>
 */
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index d0b09f42..c1769960 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Cosimo Cecchi <[email protected]>
 */
diff --git a/libcaja-private/caja-file-conflict-dialog.h b/libcaja-private/caja-file-conflict-dialog.h
index b8af1596..8dd9e281 100644
--- a/libcaja-private/caja-file-conflict-dialog.h
+++ b/libcaja-private/caja-file-conflict-dialog.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Cosimo Cecchi <[email protected]>
 */
diff --git a/libcaja-private/caja-file-dnd.c b/libcaja-private/caja-file-dnd.c
index 9996c0c8..a44d42f3 100644
--- a/libcaja-private/caja-file-dnd.c
+++ b/libcaja-private/caja-file-dnd.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.
 
    Authors: Pavel Cisler <[email protected]>,
 */
diff --git a/libcaja-private/caja-file-dnd.h b/libcaja-private/caja-file-dnd.h
index 5bf66cf7..117e1823 100644
--- a/libcaja-private/caja-file-dnd.h
+++ b/libcaja-private/caja-file-dnd.h
@@ -16,8 +16,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: Pavel Cisler <[email protected]>,
 */
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index b35e98f6..6fc9ba8c 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Alexander Larsson <[email protected]>
             Ettore Perazzoli <[email protected]>
diff --git a/libcaja-private/caja-file-operations.h b/libcaja-private/caja-file-operations.h
index 6d0e39d6..d95e275a 100644
--- a/libcaja-private/caja-file-operations.h
+++ b/libcaja-private/caja-file-operations.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Ettore Perazzoli <[email protected]>,
             Pavel Cisler <[email protected]>
diff --git a/libcaja-private/caja-file-private.h b/libcaja-private/caja-file-private.h
index cc78386e..2c0c76c1 100644
--- a/libcaja-private/caja-file-private.h
+++ b/libcaja-private/caja-file-private.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-file-queue.c b/libcaja-private/caja-file-queue.c
index bcd7d845..be7e20b6 100644
--- a/libcaja-private/caja-file-queue.c
+++ b/libcaja-private/caja-file-queue.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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Maciej Stachowiak <[email protected]>
 */
diff --git a/libcaja-private/caja-file-queue.h b/libcaja-private/caja-file-queue.h
index 31dd9e30..32dee492 100644
--- a/libcaja-private/caja-file-queue.h
+++ b/libcaja-private/caja-file-queue.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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Maciej Stachowiak <[email protected]>
 */
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index bb942c99..0748364a 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -16,8 +16,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: John Sullivan <[email protected]>
 */
diff --git a/libcaja-private/caja-file-utilities.h b/libcaja-private/caja-file-utilities.h
index 77946eb0..81600ef8 100644
--- a/libcaja-private/caja-file-utilities.h
+++ b/libcaja-private/caja-file-utilities.h
@@ -16,8 +16,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: John Sullivan <[email protected]>
 */
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 2f43eec2..839940fa 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-file.h b/libcaja-private/caja-file.h
index e79dacfc..f1b64643 100644
--- a/libcaja-private/caja-file.h
+++ b/libcaja-private/caja-file.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index de2abd0a..3097793f 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.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.
 
    Authors: Ramiro Estrugo <[email protected]>
 */
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
index be9d57a3..534f36a3 100644
--- a/libcaja-private/caja-global-preferences.h
+++ b/libcaja-private/caja-global-preferences.h
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; 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: Ramiro Estrugo <[email protected]>
 */
diff --git a/libcaja-private/caja-horizontal-splitter.c b/libcaja-private/caja-horizontal-splitter.c
index e31d8a6a..0fbaa3c4 100644
--- a/libcaja-private/caja-horizontal-splitter.c
+++ b/libcaja-private/caja-horizontal-splitter.c
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/libcaja-private/caja-horizontal-splitter.h b/libcaja-private/caja-horizontal-splitter.h
index 75d60ef4..b0fdcf4a 100644
--- a/libcaja-private/caja-horizontal-splitter.h
+++ b/libcaja-private/caja-horizontal-splitter.h
@@ -16,8 +16,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: Ramiro Estrugo <[email protected]>
 */
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 7362809b..c96cd6ef 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -18,8 +18,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/libcaja-private/caja-icon-canvas-item.h b/libcaja-private/caja-icon-canvas-item.h
index e284d221..27d01867 100644
--- a/libcaja-private/caja-icon-canvas-item.h
+++ b/libcaja-private/caja-icon-canvas-item.h
@@ -18,8 +18,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 CAJA_ICON_CANVAS_ITEM_H
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 8c249791..df56d0f1 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.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: Ettore Perazzoli <[email protected]>,
    Darin Adler <[email protected]>
diff --git a/libcaja-private/caja-icon-container.h b/libcaja-private/caja-icon-container.h
index 10472878..cb24bca2 100644
--- a/libcaja-private/caja-icon-container.h
+++ b/libcaja-private/caja-icon-container.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.
 
    Authors: Ettore Perazzoli <[email protected]>, Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index b0e89942..12cc5cbf 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.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.
 
    Authors: Ettore Perazzoli <[email protected]>,
             Darin Adler <[email protected]>,
diff --git a/libcaja-private/caja-icon-dnd.h b/libcaja-private/caja-icon-dnd.h
index e7fcc615..1070c41f 100644
--- a/libcaja-private/caja-icon-dnd.h
+++ b/libcaja-private/caja-icon-dnd.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.
 
    Authors: Ettore Perazzoli <[email protected]>,
             Darin Adler <[email protected]>,
diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c
index e9596d8f..e504a557 100644
--- a/libcaja-private/caja-icon-info.c
+++ b/libcaja-private/caja-icon-info.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/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h
index 3214586d..8258ca15 100644
--- a/libcaja-private/caja-icon-private.h
+++ b/libcaja-private/caja-icon-private.h
@@ -16,8 +16,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.
 
    Author: Ettore Perazzoli <[email protected]>
 */
diff --git a/libcaja-private/caja-idle-queue.c b/libcaja-private/caja-idle-queue.c
index c198f5e0..182c6e74 100644
--- a/libcaja-private/caja-idle-queue.c
+++ b/libcaja-private/caja-idle-queue.c
@@ -17,7 +17,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Darin Adler <[email protected]>
  *
diff --git a/libcaja-private/caja-idle-queue.h b/libcaja-private/caja-idle-queue.h
index 18785f00..e9c5db9c 100644
--- a/libcaja-private/caja-idle-queue.h
+++ b/libcaja-private/caja-idle-queue.h
@@ -17,7 +17,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Darin Adler <[email protected]>
  *
diff --git a/libcaja-private/caja-iso9660.h b/libcaja-private/caja-iso9660.h
index 46a729aa..d8352cc2 100644
--- a/libcaja-private/caja-iso9660.h
+++ b/libcaja-private/caja-iso9660.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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _ISOFS_FS_H
 #define _ISOFS_FS_H
diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c
index 77a74041..51c709ce 100644
--- a/libcaja-private/caja-keep-last-vertical-box.c
+++ b/libcaja-private/caja-keep-last-vertical-box.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.
 
    Author: John Sullivan <[email protected]>,
  */
diff --git a/libcaja-private/caja-keep-last-vertical-box.h b/libcaja-private/caja-keep-last-vertical-box.h
index d5c9eabf..d7955786 100644
--- a/libcaja-private/caja-keep-last-vertical-box.h
+++ b/libcaja-private/caja-keep-last-vertical-box.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.
 
    Author: John Sullivan <[email protected]>,
  */
diff --git a/libcaja-private/caja-lib-self-check-functions.c b/libcaja-private/caja-lib-self-check-functions.c
index e529fc3f..17a6098b 100644
--- a/libcaja-private/caja-lib-self-check-functions.c
+++ b/libcaja-private/caja-lib-self-check-functions.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-lib-self-check-functions.h b/libcaja-private/caja-lib-self-check-functions.h
index f7b53766..4fa973e3 100644
--- a/libcaja-private/caja-lib-self-check-functions.h
+++ b/libcaja-private/caja-lib-self-check-functions.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-link.c b/libcaja-private/caja-link.c
index 0954f3c5..89971772 100644
--- a/libcaja-private/caja-link.c
+++ b/libcaja-private/caja-link.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Jonathan Blandford <[email protected]>
             Alexander Larsson <[email protected]>
diff --git a/libcaja-private/caja-link.h b/libcaja-private/caja-link.h
index 352bbcb6..a4752d57 100644
--- a/libcaja-private/caja-link.h
+++ b/libcaja-private/caja-link.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Jonathan Blandford <[email protected]>
 */
diff --git a/libcaja-private/caja-merged-directory.c b/libcaja-private/caja-merged-directory.c
index 328876cf..f3d4cf01 100644
--- a/libcaja-private/caja-merged-directory.c
+++ b/libcaja-private/caja-merged-directory.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-merged-directory.h b/libcaja-private/caja-merged-directory.h
index 592e60ad..816b7581 100644
--- a/libcaja-private/caja-merged-directory.h
+++ b/libcaja-private/caja-merged-directory.h
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-metadata.c b/libcaja-private/caja-metadata.c
index 6acae98d..b4a315c8 100644
--- a/libcaja-private/caja-metadata.c
+++ b/libcaja-private/caja-metadata.c
@@ -16,8 +16,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/libcaja-private/caja-metadata.h b/libcaja-private/caja-metadata.h
index 59eb1193..ee9d22e4 100644
--- a/libcaja-private/caja-metadata.h
+++ b/libcaja-private/caja-metadata.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: John Sullivan <[email protected]>
 */
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index c946e938..33897f5d 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -16,8 +16,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: Maciej Stachowiak <[email protected]>
 */
diff --git a/libcaja-private/caja-mime-actions.h b/libcaja-private/caja-mime-actions.h
index 6551c560..863491b8 100644
--- a/libcaja-private/caja-mime-actions.h
+++ b/libcaja-private/caja-mime-actions.h
@@ -16,8 +16,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: Maciej Stachowiak <[email protected]>
 */
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index a183f0c5..3f458dba 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along application 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: Dave Camp <[email protected]>
             Alexander Larsson <[email protected]>
diff --git a/libcaja-private/caja-mime-application-chooser.h b/libcaja-private/caja-mime-application-chooser.h
index ed1ec683..3446024e 100644
--- a/libcaja-private/caja-mime-application-chooser.h
+++ b/libcaja-private/caja-mime-application-chooser.h
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along application 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: Dave Camp <[email protected]>
 */
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index 3cadd59e..b24dc053 100644
--- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Dave Camp <[email protected]>
  *
diff --git a/libcaja-private/caja-module.h b/libcaja-private/caja-module.h
index c920e3f8..b89cbf34 100644
--- a/libcaja-private/caja-module.h
+++ b/libcaja-private/caja-module.h
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Dave Camp <[email protected]>
  *
diff --git a/libcaja-private/caja-monitor.c b/libcaja-private/caja-monitor.c
index 0a8a2e34..0434dfe2 100644
--- a/libcaja-private/caja-monitor.c
+++ b/libcaja-private/caja-monitor.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Seth Nickell <[email protected]>
             Darin Adler <[email protected]>
diff --git a/libcaja-private/caja-monitor.h b/libcaja-private/caja-monitor.h
index 85271c95..a1cb97bf 100644
--- a/libcaja-private/caja-monitor.h
+++ b/libcaja-private/caja-monitor.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Authors: Seth Nickell <[email protected]>
             Darin Adler <[email protected]>
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index 5471367a..8f236d5e 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.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: Dave Camp <[email protected]>
             Alexander Larsson <[email protected]>
diff --git a/libcaja-private/caja-open-with-dialog.h b/libcaja-private/caja-open-with-dialog.h
index 213e7d78..693aec02 100644
--- a/libcaja-private/caja-open-with-dialog.h
+++ b/libcaja-private/caja-open-with-dialog.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.
 
    Authors: Dave Camp <[email protected]>
 */
diff --git a/libcaja-private/caja-program-choosing.c b/libcaja-private/caja-program-choosing.c
index 0a4b7f24..df541a75 100644
--- a/libcaja-private/caja-program-choosing.c
+++ b/libcaja-private/caja-program-choosing.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.
 
    Author: John Sullivan <[email protected]>
 */
diff --git a/libcaja-private/caja-program-choosing.h b/libcaja-private/caja-program-choosing.h
index 09201a29..50646a55 100644
--- a/libcaja-private/caja-program-choosing.h
+++ b/libcaja-private/caja-program-choosing.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.
 
    Author: John Sullivan <[email protected]>
 */
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index 4945e22b..b547ead8 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-progress-info.h b/libcaja-private/caja-progress-info.h
index 4c0d21da..cb846a5f 100644
--- a/libcaja-private/caja-progress-info.h
+++ b/libcaja-private/caja-progress-info.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index 53e51ff6..42804eda 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/libcaja-private/caja-query.h b/libcaja-private/caja-query.h
index 1f387a88..a13c930e 100644
--- a/libcaja-private/caja-query.h
+++ b/libcaja-private/caja-query.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/libcaja-private/caja-recent.c b/libcaja-private/caja-recent.c
index 7d496678..c50c0eb5 100644
--- a/libcaja-private/caja-recent.c
+++ b/libcaja-private/caja-recent.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 "caja-recent.h"
diff --git a/libcaja-private/caja-saved-search-file.c b/libcaja-private/caja-saved-search-file.c
index 05b6109c..dd0a7263 100644
--- a/libcaja-private/caja-saved-search-file.c
+++ b/libcaja-private/caja-saved-search-file.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson
 */
diff --git a/libcaja-private/caja-saved-search-file.h b/libcaja-private/caja-saved-search-file.h
index 0cdedc57..35d93fd7 100644
--- a/libcaja-private/caja-saved-search-file.h
+++ b/libcaja-private/caja-saved-search-file.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson
 */
diff --git a/libcaja-private/caja-search-directory-file.c b/libcaja-private/caja-search-directory-file.c
index d1b2ba03..8fc99093 100644
--- a/libcaja-private/caja-search-directory-file.c
+++ b/libcaja-private/caja-search-directory-file.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Anders Carlsson <[email protected]>
 */
diff --git a/libcaja-private/caja-search-directory-file.h b/libcaja-private/caja-search-directory-file.h
index 9ceef618..2bfb7a7e 100644
--- a/libcaja-private/caja-search-directory-file.h
+++ b/libcaja-private/caja-search-directory-file.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-search-directory.c b/libcaja-private/caja-search-directory.c
index 7c1d7660..56cc4bec 100644
--- a/libcaja-private/caja-search-directory.c
+++ b/libcaja-private/caja-search-directory.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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Anders Carlsson <[email protected]>
 */
diff --git a/libcaja-private/caja-search-directory.h b/libcaja-private/caja-search-directory.h
index 47e85fa7..b7e6a00b 100644
--- a/libcaja-private/caja-search-directory.h
+++ b/libcaja-private/caja-search-directory.h
@@ -18,8 +18,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 */
 
 #ifndef CAJA_SEARCH_DIRECTORY_H
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index de591977..0a2c34ff 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/libcaja-private/caja-search-engine-beagle.h b/libcaja-private/caja-search-engine-beagle.h
index bab7adab..4fe65663 100644
--- a/libcaja-private/caja-search-engine-beagle.h
+++ b/libcaja-private/caja-search-engine-beagle.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c
index 62bffd5e..5e906334 100644
--- a/libcaja-private/caja-search-engine-simple.c
+++ b/libcaja-private/caja-search-engine-simple.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Alexander Larsson <[email protected]>
  *
diff --git a/libcaja-private/caja-search-engine-simple.h b/libcaja-private/caja-search-engine-simple.h
index 42baeda3..a66fe7b1 100644
--- a/libcaja-private/caja-search-engine-simple.h
+++ b/libcaja-private/caja-search-engine-simple.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Alexander Larsson <[email protected]>
  *
diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c
index 90be40b3..ea56a924 100644
--- a/libcaja-private/caja-search-engine-tracker.c
+++ b/libcaja-private/caja-search-engine-tracker.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Jamie McCracken <[email protected]>
  *
diff --git a/libcaja-private/caja-search-engine-tracker.h b/libcaja-private/caja-search-engine-tracker.h
index 2de11a70..72c6ef67 100644
--- a/libcaja-private/caja-search-engine-tracker.h
+++ b/libcaja-private/caja-search-engine-tracker.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Jamie McCracken ([email protected])
  *
diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c
index 539d1442..e5b1a311 100644
--- a/libcaja-private/caja-search-engine.c
+++ b/libcaja-private/caja-search-engine.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/libcaja-private/caja-search-engine.h b/libcaja-private/caja-search-engine.h
index 26fbee4e..3f37d2fc 100644
--- a/libcaja-private/caja-search-engine.h
+++ b/libcaja-private/caja-search-engine.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/libcaja-private/caja-sidebar-provider.c b/libcaja-private/caja-sidebar-provider.c
index f5e9cf52..eb23f886 100644
--- a/libcaja-private/caja-sidebar-provider.c
+++ b/libcaja-private/caja-sidebar-provider.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-sidebar-provider.h b/libcaja-private/caja-sidebar-provider.h
index 63d90c56..21febd6a 100644
--- a/libcaja-private/caja-sidebar-provider.h
+++ b/libcaja-private/caja-sidebar-provider.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-sidebar.c b/libcaja-private/caja-sidebar.c
index 08ae7724..2d2b06cc 100644
--- a/libcaja-private/caja-sidebar.c
+++ b/libcaja-private/caja-sidebar.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-sidebar.h b/libcaja-private/caja-sidebar.h
index 6b8f694e..7eeacb36 100644
--- a/libcaja-private/caja-sidebar.h
+++ b/libcaja-private/caja-sidebar.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-signaller.c b/libcaja-private/caja-signaller.c
index 217e13f4..38f75110 100644
--- a/libcaja-private/caja-signaller.c
+++ b/libcaja-private/caja-signaller.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: John Sullivan <[email protected]>
  */
diff --git a/libcaja-private/caja-signaller.h b/libcaja-private/caja-signaller.h
index 54d68cb0..7d4bf9ec 100644
--- a/libcaja-private/caja-signaller.h
+++ b/libcaja-private/caja-signaller.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: John Sullivan <[email protected]>
  */
diff --git a/libcaja-private/caja-thumbnails.c b/libcaja-private/caja-thumbnails.c
index b656c550..7034fe34 100644
--- a/libcaja-private/caja-thumbnails.c
+++ b/libcaja-private/caja-thumbnails.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Andy Hertzfeld <[email protected]>
 */
diff --git a/libcaja-private/caja-thumbnails.h b/libcaja-private/caja-thumbnails.h
index b58669f1..7ae49a6c 100644
--- a/libcaja-private/caja-thumbnails.h
+++ b/libcaja-private/caja-thumbnails.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Andy Hertzfeld <[email protected]>
 */
diff --git a/libcaja-private/caja-trash-monitor.c b/libcaja-private/caja-trash-monitor.c
index ce344a52..5c2341f6 100644
--- a/libcaja-private/caja-trash-monitor.c
+++ b/libcaja-private/caja-trash-monitor.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Pavel Cisler <[email protected]>
 */
diff --git a/libcaja-private/caja-trash-monitor.h b/libcaja-private/caja-trash-monitor.h
index ec947054..e420d064 100644
--- a/libcaja-private/caja-trash-monitor.h
+++ b/libcaja-private/caja-trash-monitor.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Pavel Cisler <[email protected]>
 */
diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c
index 528ff029..1c25c452 100644
--- a/libcaja-private/caja-tree-view-drag-dest.c
+++ b/libcaja-private/caja-tree-view-drag-dest.c
@@ -17,8 +17,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Author: Dave Camp <[email protected]>
  * XDS support: Benedikt Meurer <[email protected]> (adapted by Amos Brocco <[email protected]>)
diff --git a/libcaja-private/caja-tree-view-drag-dest.h b/libcaja-private/caja-tree-view-drag-dest.h
index 01e71b68..520c8822 100644
--- a/libcaja-private/caja-tree-view-drag-dest.h
+++ b/libcaja-private/caja-tree-view-drag-dest.h
@@ -17,8 +17,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Author: Dave Camp <[email protected]>
  */
diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
index f9f75819..71ef9b31 100644
--- a/libcaja-private/caja-ui-utilities.c
+++ b/libcaja-private/caja-ui-utilities.c
@@ -16,8 +16,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: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-ui-utilities.h b/libcaja-private/caja-ui-utilities.h
index e333c6da..492db57c 100644
--- a/libcaja-private/caja-ui-utilities.h
+++ b/libcaja-private/caja-ui-utilities.h
@@ -16,8 +16,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: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-undo-manager.c b/libcaja-private/caja-undo-manager.c
index 35951898..8f999dd0 100644
--- a/libcaja-private/caja-undo-manager.c
+++ b/libcaja-private/caja-undo-manager.c
@@ -18,8 +18,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/libcaja-private/caja-undo-manager.h b/libcaja-private/caja-undo-manager.h
index 41665060..e6541325 100644
--- a/libcaja-private/caja-undo-manager.h
+++ b/libcaja-private/caja-undo-manager.h
@@ -19,8 +19,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 CAJA_UNDO_MANAGER_H
diff --git a/libcaja-private/caja-undo-private.h b/libcaja-private/caja-undo-private.h
index bd620388..c5efbb7c 100644
--- a/libcaja-private/caja-undo-private.h
+++ b/libcaja-private/caja-undo-private.h
@@ -18,8 +18,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 CAJA_UNDO_PRIVATE_H
diff --git a/libcaja-private/caja-undo-signal-handlers.c b/libcaja-private/caja-undo-signal-handlers.c
index 04d5360e..f1dfba3c 100644
--- a/libcaja-private/caja-undo-signal-handlers.c
+++ b/libcaja-private/caja-undo-signal-handlers.c
@@ -18,8 +18,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/libcaja-private/caja-undo-signal-handlers.h b/libcaja-private/caja-undo-signal-handlers.h
index d80aaa9c..47cd4f67 100644
--- a/libcaja-private/caja-undo-signal-handlers.h
+++ b/libcaja-private/caja-undo-signal-handlers.h
@@ -18,8 +18,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 CAJA_UNDO_SIGNAL_HANDLERS_H
diff --git a/libcaja-private/caja-undo-transaction.c b/libcaja-private/caja-undo-transaction.c
index b5e1bb40..ad34bd93 100644
--- a/libcaja-private/caja-undo-transaction.c
+++ b/libcaja-private/caja-undo-transaction.c
@@ -20,8 +20,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/libcaja-private/caja-undo-transaction.h b/libcaja-private/caja-undo-transaction.h
index d9c802af..0d9d8cd6 100644
--- a/libcaja-private/caja-undo-transaction.h
+++ b/libcaja-private/caja-undo-transaction.h
@@ -20,8 +20,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 CAJA_UNDO_TRANSACTION_H
diff --git a/libcaja-private/caja-undo.c b/libcaja-private/caja-undo.c
index 6dc5a029..ba946a0a 100644
--- a/libcaja-private/caja-undo.c
+++ b/libcaja-private/caja-undo.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.
  *
  * Author: Darin Adler <[email protected]>
  */
diff --git a/libcaja-private/caja-undo.h b/libcaja-private/caja-undo.h
index 09adefc0..f68335e1 100644
--- a/libcaja-private/caja-undo.h
+++ b/libcaja-private/caja-undo.h
@@ -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.
  *
  * Author: Darin Adler <[email protected]>
  */
diff --git a/libcaja-private/caja-undostack-manager.c b/libcaja-private/caja-undostack-manager.c
index dfcc88ee..465e35e1 100644
--- a/libcaja-private/caja-undostack-manager.c
+++ b/libcaja-private/caja-undostack-manager.c
@@ -20,8 +20,8 @@
  *
  * 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., 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 "caja-undostack-manager.h"
diff --git a/libcaja-private/caja-undostack-manager.h b/libcaja-private/caja-undostack-manager.h
index 6261d570..e360a9a6 100644
--- a/libcaja-private/caja-undostack-manager.h
+++ b/libcaja-private/caja-undostack-manager.h
@@ -20,8 +20,8 @@
  *
  * 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., 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 CAJA_UNDOSTACK_MANAGER_H
diff --git a/libcaja-private/caja-users-groups-cache.c b/libcaja-private/caja-users-groups-cache.c
index 41682854..9e579f5e 100644
--- a/libcaja-private/caja-users-groups-cache.c
+++ b/libcaja-private/caja-users-groups-cache.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Zbigniew Chyla <[email protected]>
 */
diff --git a/libcaja-private/caja-users-groups-cache.h b/libcaja-private/caja-users-groups-cache.h
index 719be0d7..79ac61db 100644
--- a/libcaja-private/caja-users-groups-cache.h
+++ b/libcaja-private/caja-users-groups-cache.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Zbigniew Chyla <[email protected]>
 */
diff --git a/libcaja-private/caja-vfs-directory.c b/libcaja-private/caja-vfs-directory.c
index 152ed70b..9915889a 100644
--- a/libcaja-private/caja-vfs-directory.c
+++ b/libcaja-private/caja-vfs-directory.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-vfs-directory.h b/libcaja-private/caja-vfs-directory.h
index 2f8838f4..969dbbe1 100644
--- a/libcaja-private/caja-vfs-directory.h
+++ b/libcaja-private/caja-vfs-directory.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-vfs-file.c b/libcaja-private/caja-vfs-file.c
index 797ca79d..5959dfe8 100644
--- a/libcaja-private/caja-vfs-file.c
+++ b/libcaja-private/caja-vfs-file.c
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-vfs-file.h b/libcaja-private/caja-vfs-file.h
index 3f4c18a6..1069464c 100644
--- a/libcaja-private/caja-vfs-file.h
+++ b/libcaja-private/caja-vfs-file.h
@@ -17,8 +17,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Darin Adler <[email protected]>
 */
diff --git a/libcaja-private/caja-view-factory.c b/libcaja-private/caja-view-factory.c
index cfa720d5..ff16981e 100644
--- a/libcaja-private/caja-view-factory.c
+++ b/libcaja-private/caja-view-factory.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-view-factory.h b/libcaja-private/caja-view-factory.h
index 2ddec69d..e40fd8aa 100644
--- a/libcaja-private/caja-view-factory.h
+++ b/libcaja-private/caja-view-factory.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-view.c b/libcaja-private/caja-view.c
index 03ab1f4d..a3c55421 100644
--- a/libcaja-private/caja-view.c
+++ b/libcaja-private/caja-view.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-view.h b/libcaja-private/caja-view.h
index a7973fa4..3f2da382 100644
--- a/libcaja-private/caja-view.h
+++ b/libcaja-private/caja-view.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-window-info.c b/libcaja-private/caja-window-info.c
index 1d23e409..f55e6803 100644
--- a/libcaja-private/caja-window-info.c
+++ b/libcaja-private/caja-window-info.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-window-info.h b/libcaja-private/caja-window-info.h
index 8852ad7b..fb39c73f 100644
--- a/libcaja-private/caja-window-info.h
+++ b/libcaja-private/caja-window-info.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Alexander Larsson <[email protected]>
 */
diff --git a/libcaja-private/caja-window-slot-info.c b/libcaja-private/caja-window-slot-info.c
index 902530ee..f0193980 100644
--- a/libcaja-private/caja-window-slot-info.c
+++ b/libcaja-private/caja-window-slot-info.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Christian Neumair <[email protected]>
 */
diff --git a/libcaja-private/caja-window-slot-info.h b/libcaja-private/caja-window-slot-info.h
index 0a158ad7..2d8b21d2 100644
--- a/libcaja-private/caja-window-slot-info.h
+++ b/libcaja-private/caja-window-slot-info.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Christian Neumair <[email protected]>
 */
diff --git a/src/caja-actions.h b/src/caja-actions.h
index 5736d1d4..5c48601e 100644
--- a/src/caja-actions.h
+++ b/src/caja-actions.h
@@ -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.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Alexander Larsson <[email protected]>
  *
diff --git a/src/caja-application.c b/src/caja-application.c
index af2b586d..50c28a25 100644
--- a/src/caja-application.c
+++ b/src/caja-application.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>,
  *           Darin Adler <[email protected]>
diff --git a/src/caja-application.h b/src/caja-application.h
index 843c6407..c07cfe0e 100644
--- a/src/caja-application.h
+++ b/src/caja-application.h
@@ -17,8 +17,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /* caja-application.h
diff --git a/src/caja-autorun-software.c b/src/caja-autorun-software.c
index 502f1eac..a06eecb0 100644
--- a/src/caja-autorun-software.c
+++ b/src/caja-autorun-software.c
@@ -16,8 +16,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.
 
    Author: David Zeuthen <[email protected]>
 */
diff --git a/src/caja-bookmark-list.c b/src/caja-bookmark-list.c
index 17f9b961..cde07a1c 100644
--- a/src/caja-bookmark-list.c
+++ b/src/caja-bookmark-list.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: John Sullivan <[email protected]>
  */
diff --git a/src/caja-bookmark-list.h b/src/caja-bookmark-list.h
index d5a584cc..abe420a3 100644
--- a/src/caja-bookmark-list.h
+++ b/src/caja-bookmark-list.h
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: John Sullivan <[email protected]>
  */
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c
index afd87425..d4089b8a 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: John Sullivan <[email protected]>
  */
diff --git a/src/caja-bookmarks-window.h b/src/caja-bookmarks-window.h
index 4a8a8c6b..20e242c5 100644
--- a/src/caja-bookmarks-window.h
+++ b/src/caja-bookmarks-window.h
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: John Sullivan <[email protected]>
  */
diff --git a/src/caja-connect-server-dialog-main.c b/src/caja-connect-server-dialog-main.c
index a543fc80..b75534d7 100644
--- a/src/caja-connect-server-dialog-main.c
+++ b/src/caja-connect-server-dialog-main.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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:
  *   Vincent Untz <[email protected]>
diff --git a/src/caja-connect-server-dialog-nonmain.c b/src/caja-connect-server-dialog-nonmain.c
index 94aa40f6..99bde7ba 100644
--- a/src/caja-connect-server-dialog-nonmain.c
+++ b/src/caja-connect-server-dialog-nonmain.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  */
 
 #include <config.h>
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index 90364764..3737a15b 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  */
 
 #include <config.h>
diff --git a/src/caja-connect-server-dialog.h b/src/caja-connect-server-dialog.h
index 6313e36a..135df55f 100644
--- a/src/caja-connect-server-dialog.h
+++ b/src/caja-connect-server-dialog.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  */
 
 #ifndef CAJA_CONNECT_SERVER_DIALOG_H
diff --git a/src/caja-convert-metadata.c b/src/caja-convert-metadata.c
index 7571173d..57c2d234 100644
--- a/src/caja-convert-metadata.c
+++ b/src/caja-convert-metadata.c
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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:
  *   Alexander Larsson <[email protected]>
diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c
index 807db291..08749cc2 100644
--- a/src/caja-desktop-window.c
+++ b/src/caja-desktop-window.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: Darin Adler <[email protected]>
  */
diff --git a/src/caja-desktop-window.h b/src/caja-desktop-window.h
index 9268414b..cd9582b4 100644
--- a/src/caja-desktop-window.h
+++ b/src/caja-desktop-window.h
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: Darin Adler <[email protected]>
  */
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c
index 79de5299..57a8ab21 100644
--- a/src/caja-emblem-sidebar.c
+++ b/src/caja-emblem-sidebar.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Authors:  James Willcox  <[email protected]>
  *           Alexander Larsson <[email protected]>
diff --git a/src/caja-emblem-sidebar.h b/src/caja-emblem-sidebar.h
index 9c62934e..249484d1 100644
--- a/src/caja-emblem-sidebar.h
+++ b/src/caja-emblem-sidebar.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *
  *  This is the header file for the index panel widget, which displays oversidebar information
diff --git a/src/caja-file-management-properties-main.c b/src/caja-file-management-properties-main.c
index 78f375e4..ba5ee984 100644
--- a/src/caja-file-management-properties-main.c
+++ b/src/caja-file-management-properties-main.c
@@ -16,8 +16,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: Jan Arne Petersen <[email protected]>
 */
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index fcfbbbf4..ade5e081 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -16,8 +16,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: Jan Arne Petersen <[email protected]>
 */
diff --git a/src/caja-file-management-properties.h b/src/caja-file-management-properties.h
index db2bf485..5dc3db71 100644
--- a/src/caja-file-management-properties.h
+++ b/src/caja-file-management-properties.h
@@ -16,8 +16,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: Jan Arne Petersen <[email protected]>
 */
diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c
index 3f256ee9..897d836e 100644
--- a/src/caja-history-sidebar.c
+++ b/src/caja-history-sidebar.c
@@ -18,7 +18,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.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *           Darin Adler <[email protected]>
diff --git a/src/caja-history-sidebar.h b/src/caja-history-sidebar.h
index 4bb8109d..b7e3cb40 100644
--- a/src/caja-history-sidebar.h
+++ b/src/caja-history-sidebar.h
@@ -18,7 +18,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.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *           Darin Adler <[email protected]>
diff --git a/src/caja-image-properties-page.c b/src/caja-image-properties-page.c
index 119f262b..67428fde 100644
--- a/src/caja-image-properties-page.c
+++ b/src/caja-image-properties-page.c
@@ -16,8 +16,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Author: Alexander Larsson <[email protected]>
  * XMP support by Hubert Figuiere <[email protected]>
diff --git a/src/caja-image-properties-page.h b/src/caja-image-properties-page.h
index ec9ce5f0..70cde795 100644
--- a/src/caja-image-properties-page.h
+++ b/src/caja-image-properties-page.h
@@ -15,8 +15,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Author: Alexander Larsson <[email protected]>
  */
diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c
index e31173aa..a7a978fb 100644
--- a/src/caja-information-panel.c
+++ b/src/caja-information-panel.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  *
diff --git a/src/caja-information-panel.h b/src/caja-information-panel.h
index 020342f9..b6df023d 100644
--- a/src/caja-information-panel.h
+++ b/src/caja-information-panel.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  *
diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c
index 2e35d50d..6fdc34e5 100644
--- a/src/caja-location-bar.c
+++ b/src/caja-location-bar.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Maciej Stachowiak <[email protected]>
  *         Ettore Perazzoli <[email protected]>
diff --git a/src/caja-location-bar.h b/src/caja-location-bar.h
index 48606733..4f29373b 100644
--- a/src/caja-location-bar.h
+++ b/src/caja-location-bar.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Maciej Stachowiak <[email protected]>
  *         Ettore Perazzoli <[email protected]>
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index d0dcaf5f..b80230cd 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  */
 
 #include <config.h>
diff --git a/src/caja-location-dialog.h b/src/caja-location-dialog.h
index 08a302fc..45c018d1 100644
--- a/src/caja-location-dialog.h
+++ b/src/caja-location-dialog.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  */
 
 #ifndef CAJA_LOCATION_DIALOG_H
diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index c43129e8..fac59e44 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Maciej Stachowiak <[email protected]>
  *         Ettore Perazzoli <[email protected]>
diff --git a/src/caja-location-entry.h b/src/caja-location-entry.h
index c115a18f..cac45553 100644
--- a/src/caja-location-entry.h
+++ b/src/caja-location-entry.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Maciej Stachowiak <[email protected]>
  *         Ettore Perazzoli <[email protected]>
diff --git a/src/caja-main.c b/src/caja-main.c
index 0a414ef5..4e6f27f1 100644
--- a/src/caja-main.c
+++ b/src/caja-main.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: Elliot Lee <[email protected]>,
  *          Darin Adler <[email protected]>,
diff --git a/src/caja-main.h b/src/caja-main.h
index fa93357e..c3ddf82a 100644
--- a/src/caja-main.h
+++ b/src/caja-main.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /* caja-main.c
diff --git a/src/caja-navigation-action.c b/src/caja-navigation-action.c
index 93a43435..bb3f87bb 100644
--- a/src/caja-navigation-action.c
+++ b/src/caja-navigation-action.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Based on ephy-navigation-action.h from Epiphany
  *
diff --git a/src/caja-navigation-action.h b/src/caja-navigation-action.h
index 59927585..2b3a9b88 100644
--- a/src/caja-navigation-action.h
+++ b/src/caja-navigation-action.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *
  *  Based on ephy-navigation-action.h from Epiphany
diff --git a/src/caja-navigation-bar.c b/src/caja-navigation-bar.c
index 3f0c9945..45434e89 100644
--- a/src/caja-navigation-bar.c
+++ b/src/caja-navigation-bar.c
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Maciej Stachowiak <[email protected]>
  */
diff --git a/src/caja-navigation-bar.h b/src/caja-navigation-bar.h
index ee369b6a..8616a974 100644
--- a/src/caja-navigation-bar.h
+++ b/src/caja-navigation-bar.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Maciej Stachowiak <[email protected]>
  */
diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c
index 9e395bef..30c2e570 100644
--- a/src/caja-navigation-window-menus.c
+++ b/src/caja-navigation-window-menus.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Author: John Sullivan <[email protected]>
  */
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index e2e6541a..9b69cba8 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Holger Berndt <[email protected]>
 */
diff --git a/src/caja-navigation-window-pane.h b/src/caja-navigation-window-pane.h
index 8824332f..5d5e0af2 100644
--- a/src/caja-navigation-window-pane.h
+++ b/src/caja-navigation-window-pane.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Holger Berndt <[email protected]>
 */
diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c
index 4bf28447..703cca90 100644
--- a/src/caja-navigation-window-slot.c
+++ b/src/caja-navigation-window-slot.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Christian Neumair <[email protected]>
 */
diff --git a/src/caja-navigation-window-slot.h b/src/caja-navigation-window-slot.h
index f8cfbec8..6766b201 100644
--- a/src/caja-navigation-window-slot.h
+++ b/src/caja-navigation-window-slot.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Christian Neumair <[email protected]>
 */
diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c
index bbbd4320..ee6de1c1 100644
--- a/src/caja-navigation-window.c
+++ b/src/caja-navigation-window.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *  	     John Sullivan <[email protected]>
diff --git a/src/caja-navigation-window.h b/src/caja-navigation-window.h
index bff5d561..18c713bd 100644
--- a/src/caja-navigation-window.h
+++ b/src/caja-navigation-window.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *           Darin Adler <[email protected]>
diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c
index 0ae29348..dc2df7fd 100644
--- a/src/caja-notes-viewer.c
+++ b/src/caja-notes-viewer.c
@@ -17,7 +17,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.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Andy Hertzfeld <[email protected]>
  *
diff --git a/src/caja-notes-viewer.h b/src/caja-notes-viewer.h
index 1bcac54c..b5a4d7c7 100644
--- a/src/caja-notes-viewer.h
+++ b/src/caja-notes-viewer.h
@@ -18,7 +18,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.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Andy Hertzfeld <[email protected]>
  *           Alexander Larsson <[email protected]>
diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c
index 5a431b1c..1e43bd35 100644
--- a/src/caja-pathbar.c
+++ b/src/caja-pathbar.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.
  */
 
 #include <config.h>
diff --git a/src/caja-pathbar.h b/src/caja-pathbar.h
index 2a2ad90e..fc6f684d 100644
--- a/src/caja-pathbar.h
+++ b/src/caja-pathbar.h
@@ -12,8 +12,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/caja-places-sidebar.c b/src/caja-places-sidebar.c
index 81805845..dff9618a 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.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.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author : Mr Jamie McCracken (jamiemcc at blueyonder dot co dot uk)
  *
diff --git a/src/caja-places-sidebar.h b/src/caja-places-sidebar.h
index 6faef394..81527524 100644
--- a/src/caja-places-sidebar.h
+++ b/src/caja-places-sidebar.h
@@ -16,7 +16,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.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author : Mr Jamie McCracken (jamiemcc at blueyonder dot co dot uk)
  *
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index aa7b29f2..5c5830d3 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  */
diff --git a/src/caja-property-browser.h b/src/caja-property-browser.h
index e5becc39..0ccfe66a 100644
--- a/src/caja-property-browser.h
+++ b/src/caja-property-browser.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  */
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index dc2bb0ae..dab9e329 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Alexander Larsson <[email protected]>
  *
diff --git a/src/caja-query-editor.h b/src/caja-query-editor.h
index bd1982b7..8a7f71b9 100644
--- a/src/caja-query-editor.h
+++ b/src/caja-query-editor.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Alexander Larsson <[email protected]>
  *
diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c
index 6d40239f..86bd1f0a 100644
--- a/src/caja-search-bar.c
+++ b/src/caja-search-bar.c
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/src/caja-search-bar.h b/src/caja-search-bar.h
index a3946c9f..35fce4d9 100644
--- a/src/caja-search-bar.h
+++ b/src/caja-search-bar.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; see the file COPYING.  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.
  *
  * Author: Anders Carlsson <[email protected]>
  *
diff --git a/src/caja-self-check-functions.c b/src/caja-self-check-functions.c
index 92bb7a3e..ff25f62f 100644
--- a/src/caja-self-check-functions.c
+++ b/src/caja-self-check-functions.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Author: Darin Adler <[email protected]>
  */
diff --git a/src/caja-self-check-functions.h b/src/caja-self-check-functions.h
index cc6e364e..398999bf 100644
--- a/src/caja-self-check-functions.h
+++ b/src/caja-self-check-functions.h
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Author: Darin Adler <[email protected]>
  */
diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c
index 0037a0fb..0566e81d 100644
--- a/src/caja-side-pane.c
+++ b/src/caja-side-pane.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Dave Camp <[email protected]>
  */
diff --git a/src/caja-side-pane.h b/src/caja-side-pane.h
index ebb6d8cf..e4ea145d 100644
--- a/src/caja-side-pane.h
+++ b/src/caja-side-pane.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Dave Camp <[email protected]>
  */
diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c
index 0ad228b5..1e334677 100644
--- a/src/caja-sidebar-title.c
+++ b/src/caja-sidebar-title.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  */
diff --git a/src/caja-sidebar-title.h b/src/caja-sidebar-title.h
index 14d56a3a..a677fdfc 100644
--- a/src/caja-sidebar-title.h
+++ b/src/caja-sidebar-title.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  */
diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c
index 9f148f53..db023d0a 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *  	     John Sullivan <[email protected]>
diff --git a/src/caja-spatial-window.h b/src/caja-spatial-window.h
index 0e3ba745..f877aaf1 100644
--- a/src/caja-spatial-window.h
+++ b/src/caja-spatial-window.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 /* caja-window.h: Interface of the main window object */
diff --git a/src/caja-trash-bar.c b/src/caja-trash-bar.c
index 48ac3dfb..77e60f88 100644
--- a/src/caja-trash-bar.c
+++ b/src/caja-trash-bar.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.
  *
  * Authors: Paolo Borelli <[email protected]>
  *
diff --git a/src/caja-trash-bar.h b/src/caja-trash-bar.h
index 93b86986..f7849891 100644
--- a/src/caja-trash-bar.h
+++ b/src/caja-trash-bar.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: Paolo Borelli <[email protected]>
  *
diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c
index c7077e8a..645d8057 100644
--- a/src/caja-view-as-action.c
+++ b/src/caja-view-as-action.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Alexander Larsson <[email protected]>
  *
diff --git a/src/caja-view-as-action.h b/src/caja-view-as-action.h
index 815f7abd..c9252ac3 100644
--- a/src/caja-view-as-action.h
+++ b/src/caja-view-as-action.h
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Alexander Larsson <[email protected]>
  *
diff --git a/src/caja-window-bookmarks.c b/src/caja-window-bookmarks.c
index d16f04e9..02ce3a64 100644
--- a/src/caja-window-bookmarks.c
+++ b/src/caja-window-bookmarks.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Author: John Sullivan <[email protected]>
  *         Alexander Larsson <[email protected]>
diff --git a/src/caja-window-bookmarks.h b/src/caja-window-bookmarks.h
index 48969a33..fb79b269 100644
--- a/src/caja-window-bookmarks.h
+++ b/src/caja-window-bookmarks.h
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Author:  Alexander Larsson <[email protected]>
  */
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
index df36f821..f9f6600e 100644
--- a/src/caja-window-manage-views.c
+++ b/src/caja-window-manage-views.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *           John Sullivan <[email protected]>
diff --git a/src/caja-window-manage-views.h b/src/caja-window-manage-views.h
index 76c4eeee..dbed9345 100644
--- a/src/caja-window-manage-views.h
+++ b/src/caja-window-manage-views.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Author: Darin Adler <[email protected]>
  *
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index 968ac37e..01fd7291 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Author: John Sullivan <[email protected]>
  */
diff --git a/src/caja-window-pane.c b/src/caja-window-pane.c
index fde98201..0d2ddae8 100644
--- a/src/caja-window-pane.c
+++ b/src/caja-window-pane.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Holger Berndt <[email protected]>
 */
diff --git a/src/caja-window-pane.h b/src/caja-window-pane.h
index 2aecb478..4f68b9eb 100644
--- a/src/caja-window-pane.h
+++ b/src/caja-window-pane.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Holger Berndt <[email protected]>
 */
diff --git a/src/caja-window-private.h b/src/caja-window-private.h
index 62c2b3ba..83a6da0f 100644
--- a/src/caja-window-private.h
+++ b/src/caja-window-private.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *           Darin Adler <[email protected]>
diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c
index 61355af2..e82bcb00 100644
--- a/src/caja-window-slot.c
+++ b/src/caja-window-slot.c
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Christian Neumair <[email protected]>
 */
diff --git a/src/caja-window-slot.h b/src/caja-window-slot.h
index 64f6349f..f25bdf41 100644
--- a/src/caja-window-slot.h
+++ b/src/caja-window-slot.h
@@ -16,8 +16,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.
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
    Author: Christian Neumair <[email protected]>
 */
diff --git a/src/caja-window-toolbars.c b/src/caja-window-toolbars.c
index 90c40269..d777ab41 100644
--- a/src/caja-window-toolbars.c
+++ b/src/caja-window-toolbars.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Author: John Sullivan <[email protected]>
  */
diff --git a/src/caja-window.c b/src/caja-window.c
index 72575f63..520787b0 100644
--- a/src/caja-window.c
+++ b/src/caja-window.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.
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *  	     John Sullivan <[email protected]>
diff --git a/src/caja-window.h b/src/caja-window.h
index 55083446..95fecc36 100644
--- a/src/caja-window.h
+++ b/src/caja-window.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Elliot Lee <[email protected]>
  *           Darin Adler <[email protected]>
diff --git a/src/caja-x-content-bar.c b/src/caja-x-content-bar.c
index a936bb3e..392fdb73 100644
--- a/src/caja-x-content-bar.c
+++ b/src/caja-x-content-bar.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: David Zeuthen <[email protected]>
  *          Paolo Borelli <[email protected]>
diff --git a/src/caja-x-content-bar.h b/src/caja-x-content-bar.h
index fb844a82..a6ae116f 100644
--- a/src/caja-x-content-bar.h
+++ b/src/caja-x-content-bar.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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Authors: David Zeuthen <[email protected]>
  *          Paolo Borelli <[email protected]>
diff --git a/src/caja-zoom-action.c b/src/caja-zoom-action.c
index 690042e0..4f1ea786 100644
--- a/src/caja-zoom-action.c
+++ b/src/caja-zoom-action.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Alexander Larsson <[email protected]>
  *
diff --git a/src/caja-zoom-action.h b/src/caja-zoom-action.h
index 263b64a2..2e3c182d 100644
--- a/src/caja-zoom-action.h
+++ b/src/caja-zoom-action.h
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Alexander Larsson <[email protected]>
  *
diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c
index a11ca9e9..8ba974c4 100644
--- a/src/caja-zoom-control.c
+++ b/src/caja-zoom-control.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  *         Alexander Larsson <[email protected]>
diff --git a/src/caja-zoom-control.h b/src/caja-zoom-control.h
index d24d062c..623add8a 100644
--- a/src/caja-zoom-control.h
+++ b/src/caja-zoom-control.h
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Author: Andy Hertzfeld <[email protected]>
  *
diff --git a/src/file-manager/fm-actions.h b/src/file-manager/fm-actions.h
index 17782322..5d333168 100644
--- a/src/file-manager/fm-actions.h
+++ b/src/file-manager/fm-actions.h
@@ -16,8 +16,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors: Alexander Larsson < [email protected]>
  */
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 4a1bab93..65ee3e12 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -16,8 +16,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: Mike Engber <[email protected]>
    	    Gene Z. Ragan <[email protected]>
diff --git a/src/file-manager/fm-desktop-icon-view.h b/src/file-manager/fm-desktop-icon-view.h
index f5702296..f0ed0f1f 100644
--- a/src/file-manager/fm-desktop-icon-view.h
+++ b/src/file-manager/fm-desktop-icon-view.h
@@ -16,8 +16,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: Mike Engber <[email protected]>
 */
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 32905c84..a6598e2e 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -17,8 +17,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors: Ettore Perazzoli,
  *          John Sullivan <[email protected]>,
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index f38cbad1..70718866 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -16,8 +16,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors: Ettore Perazzoli
  * 	    Darin Adler <[email protected]>
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index af88b753..52958feb 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.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.
  *
  *  Authors: James Willcox <[email protected]>
  *
diff --git a/src/file-manager/fm-ditem-page.h b/src/file-manager/fm-ditem-page.h
index bf55d002..47f71ab0 100644
--- a/src/file-manager/fm-ditem-page.h
+++ b/src/file-manager/fm-ditem-page.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.
  *
  *  Authors: James Willcox <[email protected]>
  *
diff --git a/src/file-manager/fm-empty-view.c b/src/file-manager/fm-empty-view.c
index d85c702c..36d76d9d 100644
--- a/src/file-manager/fm-empty-view.c
+++ b/src/file-manager/fm-empty-view.c
@@ -16,8 +16,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: Christian Neumair <[email protected]>
 */
diff --git a/src/file-manager/fm-empty-view.h b/src/file-manager/fm-empty-view.h
index 795dd27a..2a6c4184 100644
--- a/src/file-manager/fm-empty-view.h
+++ b/src/file-manager/fm-empty-view.h
@@ -16,8 +16,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: Christian Neumair <[email protected]>
 */
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index f301e9a9..db950307 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.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.
 
    Authors: John Sullivan <[email protected]>
 */
diff --git a/src/file-manager/fm-error-reporting.h b/src/file-manager/fm-error-reporting.h
index 556e5ae2..ed1b371c 100644
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.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.
 
    Authors: John Sullivan <[email protected]>
 */
diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index 86e54669..8cd3d357 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -16,8 +16,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.
 
    Author: Michael Meeks <[email protected]>
 */
diff --git a/src/file-manager/fm-icon-container.h b/src/file-manager/fm-icon-container.h
index a0527acf..9d8e90a5 100644
--- a/src/file-manager/fm-icon-container.h
+++ b/src/file-manager/fm-icon-container.h
@@ -16,8 +16,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.
 
    Author: Michael Meeks <[email protected]>
 */
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 7d8687a2..3bd24bd3 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -16,8 +16,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: John Sullivan <[email protected]>
 */
diff --git a/src/file-manager/fm-icon-view.h b/src/file-manager/fm-icon-view.h
index 2ef11a56..dfd2a171 100644
--- a/src/file-manager/fm-icon-view.h
+++ b/src/file-manager/fm-icon-view.h
@@ -16,8 +16,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: John Sullivan <[email protected]>
 */
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index b5e12da2..f7288fe2 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.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: Anders Carlsson <[email protected]>, Soeren Sandmann ([email protected]), Dave Camp <[email protected]>
 */
diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h
index 49f39078..a44fb28a 100644
--- a/src/file-manager/fm-list-model.h
+++ b/src/file-manager/fm-list-model.h
@@ -16,8 +16,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: Anders Carlsson <[email protected]>
 */
diff --git a/src/file-manager/fm-list-view-private.h b/src/file-manager/fm-list-view-private.h
index 2225cfca..976fed27 100644
--- a/src/file-manager/fm-list-view-private.h
+++ b/src/file-manager/fm-list-view-private.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.
 
    Authors: Rebecca Schulman <[email protected]>
 
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 259ecd08..487f3023 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.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.
 
    Authors: John Sullivan <[email protected]>
             Anders Carlsson <[email protected]>
diff --git a/src/file-manager/fm-list-view.h b/src/file-manager/fm-list-view.h
index 2defc6ca..a7621441 100644
--- a/src/file-manager/fm-list-view.h
+++ b/src/file-manager/fm-list-view.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.
 
    Authors: John Sullivan <[email protected]>
             Anders Carlsson <[email protected]>
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 6310b407..935cdfac 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -16,8 +16,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 <[email protected]>
 */
diff --git a/src/file-manager/fm-properties-window.h b/src/file-manager/fm-properties-window.h
index 6044e8b9..38eb0e15 100644
--- a/src/file-manager/fm-properties-window.h
+++ b/src/file-manager/fm-properties-window.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.
 
    Authors: Darin Adler <[email protected]>
 */
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index 6356db90..bbcdbb42 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -17,8 +17,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors: Anders Carlsson <[email protected]>
  *          Darin Adler <[email protected]>
diff --git a/src/file-manager/fm-tree-model.h b/src/file-manager/fm-tree-model.h
index f74ce06c..bfca06e4 100644
--- a/src/file-manager/fm-tree-model.h
+++ b/src/file-manager/fm-tree-model.h
@@ -16,8 +16,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Author: Anders Carlsson <[email protected]>
  */
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 2a6cbd60..53b1f85a 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -17,8 +17,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors:
  *       Maciej Stachowiak <[email protected]>
diff --git a/src/file-manager/fm-tree-view.h b/src/file-manager/fm-tree-view.h
index a1bbe458..d78d85e3 100644
--- a/src/file-manager/fm-tree-view.h
+++ b/src/file-manager/fm-tree-view.h
@@ -16,8 +16,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors: Maciej Stachowiak <[email protected]>
  *          Anders Carlsson <[email protected]>