Fixed incorrect fsf addresses. Closes #28.

114 files changed, 172 insertions, 172 deletions

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]>