diff --git a/Makefile.in b/Makefile.in
index 4f4dfb865..b81206d40 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,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 Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
 #
diff --git a/doc_src/license.hdr b/doc_src/license.hdr
index 64bab10f0..c07a94ad2 100644
--- a/doc_src/license.hdr
+++ b/doc_src/license.hdr
@@ -17,7 +17,7 @@ Version 2, June 1991
 
 <PRE>
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@@ -995,7 +995,7 @@ Version 2, June 1991
 
 <PRE>
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
diff --git a/fish.cpp b/fish.cpp
index ca5d50e90..57d268d72 100644
--- a/fish.cpp
+++ b/fish.cpp
@@ -12,7 +12,7 @@ GNU General Public License for more details.
 
 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 Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 
diff --git a/fish_indent.cpp b/fish_indent.cpp
index c4d6d81cd..4560bb961 100644
--- a/fish_indent.cpp
+++ b/fish_indent.cpp
@@ -12,7 +12,7 @@ GNU General Public License for more details.
 
 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 Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
 
diff --git a/xdgmime.cpp b/xdgmime.cpp
index 39d0a1894..633d0b0a5 100644
--- a/xdgmime.cpp
+++ b/xdgmime.cpp
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xdgmime.h b/xdgmime.h
index b552be7b7..9c53bb11a 100644
--- a/xdgmime.h
+++ b/xdgmime.h
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA
  */
 
 
diff --git a/xdgmimealias.cpp b/xdgmimealias.cpp
index 05a5e3579..e556d4e64 100644
--- a/xdgmimealias.cpp
+++ b/xdgmimealias.cpp
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xdgmimealias.h b/xdgmimealias.h
index 384d12769..13933642d 100644
--- a/xdgmimealias.h
+++ b/xdgmimealias.h
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifndef __XDG_MIME_ALIAS_H__
diff --git a/xdgmimeglob.cpp b/xdgmimeglob.cpp
index 49d098bf0..4182f3c97 100644
--- a/xdgmimeglob.cpp
+++ b/xdgmimeglob.cpp
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xdgmimeglob.h b/xdgmimeglob.h
index 7f2ea1d3f..136e49a39 100644
--- a/xdgmimeglob.h
+++ b/xdgmimeglob.h
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifndef __XDG_MIME_GLOB_H__
diff --git a/xdgmimeint.cpp b/xdgmimeint.cpp
index a7847141a..7e8ea31ca 100644
--- a/xdgmimeint.cpp
+++ b/xdgmimeint.cpp
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xdgmimeint.h b/xdgmimeint.h
index 33116df1d..5e825dab3 100644
--- a/xdgmimeint.h
+++ b/xdgmimeint.h
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifndef __XDG_MIME_INT_H__
diff --git a/xdgmimemagic.cpp b/xdgmimemagic.cpp
index 8bcca9488..aecca8822 100644
--- a/xdgmimemagic.cpp
+++ b/xdgmimemagic.cpp
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xdgmimemagic.h b/xdgmimemagic.h
index 61e9d20db..1a747583a 100644
--- a/xdgmimemagic.h
+++ b/xdgmimemagic.h
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifndef __XDG_MIME_MAGIC_H__
diff --git a/xdgmimeparent.cpp b/xdgmimeparent.cpp
index 3e51c295c..d0fa617dc 100644
--- a/xdgmimeparent.cpp
+++ b/xdgmimeparent.cpp
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/xdgmimeparent.h b/xdgmimeparent.h
index 9baf44a3e..ca6e85267 100644
--- a/xdgmimeparent.h
+++ b/xdgmimeparent.h
@@ -21,8 +21,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 Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
  */
 
 #ifndef __XDG_MIME_PARENT_H__