Bug 578877 – Update FSF address

70 files changed, 136 insertions, 136 deletions

diff --git a/backends/evoldap-backend.c b/backends/evoldap-backend.c
index 53d0ce9d..872c60e8 100644
--- a/backends/evoldap-backend.c
+++ b/backends/evoldap-backend.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/backends/gconf-merge-tree.c b/backends/gconf-merge-tree.c
index f1b6102d..f715c236 100644
--- a/backends/gconf-merge-tree.c
+++ b/backends/gconf-merge-tree.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  * Authors:
  *     Mark McLoughlin <mark@skynet.ie>
diff --git a/backends/markup-backend.c b/backends/markup-backend.c
index a8e3ade5..9622c6bc 100644
--- a/backends/markup-backend.c
+++ b/backends/markup-backend.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/backends/markup-tree.c b/backends/markup-tree.c
index 0bfab306..0f9bb898 100644
--- a/backends/markup-tree.c
+++ b/backends/markup-tree.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/backends/markup-tree.h b/backends/markup-tree.h
index 6f1d0ad8..cda6bd8c 100644
--- a/backends/markup-tree.h
+++ b/backends/markup-tree.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef MARKUP_TREE_H
diff --git a/backends/xml-backend.c b/backends/xml-backend.c
index a327bd6d..e34e2624 100644
--- a/backends/xml-backend.c
+++ b/backends/xml-backend.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/backends/xml-cache.c b/backends/xml-cache.c
index 261ad55c..ff9890d8 100644
--- a/backends/xml-cache.c
+++ b/backends/xml-cache.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/backends/xml-cache.h b/backends/xml-cache.h
index ce49d43a..78a2937f 100644
--- a/backends/xml-cache.h
+++ b/backends/xml-cache.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_XML_CACHE_H
diff --git a/backends/xml-dir.c b/backends/xml-dir.c
index 5b1d5b30..92805f96 100644
--- a/backends/xml-dir.c
+++ b/backends/xml-dir.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/backends/xml-dir.h b/backends/xml-dir.h
index 688e3fc1..2daab88a 100644
--- a/backends/xml-dir.h
+++ b/backends/xml-dir.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_XML_DIR_H
diff --git a/backends/xml-entry.c b/backends/xml-entry.c
index 9d2ccaed..871017ba 100644
--- a/backends/xml-entry.c
+++ b/backends/xml-entry.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/backends/xml-entry.h b/backends/xml-entry.h
index 622b4858..131b260b 100644
--- a/backends/xml-entry.h
+++ b/backends/xml-entry.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_XML_ENTRY_H
diff --git a/backends/xml-test.c b/backends/xml-test.c
index 05973beb..3252c3ed 100644
--- a/backends/xml-test.c
+++ b/backends/xml-test.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/defaults/gconf-defaults-main.c b/defaults/gconf-defaults-main.c
index bd229029..05705979 100644
--- a/defaults/gconf-defaults-main.c
+++ b/defaults/gconf-defaults-main.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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/defaults/gconf-defaults.c b/defaults/gconf-defaults.c
index 2df939f7..df4536dc 100644
--- a/defaults/gconf-defaults.c
+++ b/defaults/gconf-defaults.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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/defaults/gconf-defaults.h b/defaults/gconf-defaults.h
index d7c4bcc1..719eb399 100644
--- a/defaults/gconf-defaults.h
+++ b/defaults/gconf-defaults.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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
diff --git a/examples/basic-gconf-app.c b/examples/basic-gconf-app.c
index 6de58e55..bb88a53c 100644
--- a/examples/basic-gconf-app.c
+++ b/examples/basic-gconf-app.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /* This program demonstrates how to use GConf.  The key thing is that
diff --git a/examples/complex-gconf-app.c b/examples/complex-gconf-app.c
index a361c2d8..567989cc 100644
--- a/examples/complex-gconf-app.c
+++ b/examples/complex-gconf-app.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/examples/simple-controller.c b/examples/simple-controller.c
index f436688c..467313ed 100644
--- a/examples/simple-controller.c
+++ b/examples/simple-controller.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /* A very simple program that sets a single key value when you type
diff --git a/examples/simple-view.c b/examples/simple-view.c
index 41822d89..0052ed25 100644
--- a/examples/simple-view.c
+++ b/examples/simple-view.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /* A very simple program that monitors a single key for changes. */
diff --git a/gconf/dllmain.c b/gconf/dllmain.c
index ed9ccd20..f78ede03 100644
--- a/gconf/dllmain.c
+++ b/gconf/dllmain.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <windows.h>
diff --git a/gconf/gconf-backend.c b/gconf/gconf-backend.c
index 4957b26f..1cc5ce2d 100644
--- a/gconf/gconf-backend.c
+++ b/gconf/gconf-backend.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-backend.h b/gconf/gconf-backend.h
index 70107111..e30d06a0 100644
--- a/gconf/gconf-backend.h
+++ b/gconf/gconf-backend.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONFBACKEND_H
diff --git a/gconf/gconf-changeset.c b/gconf/gconf-changeset.c
index cc2dd52e..770090ff 100644
--- a/gconf/gconf-changeset.c
+++ b/gconf/gconf-changeset.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-changeset.h b/gconf/gconf-changeset.h
index 1b8fc4f6..33f2a8a9 100644
--- a/gconf/gconf-changeset.h
+++ b/gconf/gconf-changeset.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_CHANGESET_H
diff --git a/gconf/gconf-client.c b/gconf/gconf-client.c
index cb052cd5..cca04767 100644
--- a/gconf/gconf-client.c
+++ b/gconf/gconf-client.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-client.h b/gconf/gconf-client.h
index ffa63e86..e142b0ca 100644
--- a/gconf/gconf-client.h
+++ b/gconf/gconf-client.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_CLIENT_H
diff --git a/gconf/gconf-database.c b/gconf/gconf-database.c
index 51998893..d04b875e 100644
--- a/gconf/gconf-database.c
+++ b/gconf/gconf-database.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-database.h b/gconf/gconf-database.h
index 67f47aa6..604b8197 100644
--- a/gconf/gconf-database.h
+++ b/gconf/gconf-database.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_DATABASE_H
diff --git a/gconf/gconf-engine.h b/gconf/gconf-engine.h
index 7ee72266..4185d96b 100644
--- a/gconf/gconf-engine.h
+++ b/gconf/gconf-engine.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_ENGINE_H
diff --git a/gconf/gconf-error.c b/gconf/gconf-error.c
index 2c2bfdb3..cc04fd69 100644
--- a/gconf/gconf-error.c
+++ b/gconf/gconf-error.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-error.h b/gconf/gconf-error.h
index 26e080f4..65f2bdb3 100644
--- a/gconf/gconf-error.h
+++ b/gconf/gconf-error.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_ERROR_H
diff --git a/gconf/gconf-glib.c b/gconf/gconf-glib.c
index 002248de..db732afb 100644
--- a/gconf/gconf-glib.c
+++ b/gconf/gconf-glib.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 607dcba1..c9e258cf 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-internals.h b/gconf/gconf-internals.h
index dc8d35ef..ab66408f 100644
--- a/gconf/gconf-internals.h
+++ b/gconf/gconf-internals.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_INTERNALS_H
diff --git a/gconf/gconf-listeners.c b/gconf/gconf-listeners.c
index b1193918..710cf283 100644
--- a/gconf/gconf-listeners.c
+++ b/gconf/gconf-listeners.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-listeners.h b/gconf/gconf-listeners.h
index 8821801d..69f7bad8 100644
--- a/gconf/gconf-listeners.h
+++ b/gconf/gconf-listeners.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_LISTENERS_H
diff --git a/gconf/gconf-locale.c b/gconf/gconf-locale.c
index c885f921..c6f1066b 100644
--- a/gconf/gconf-locale.c
+++ b/gconf/gconf-locale.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-locale.h b/gconf/gconf-locale.h
index 6332a2e3..f40de148 100644
--- a/gconf/gconf-locale.h
+++ b/gconf/gconf-locale.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_LOCALE_H
diff --git a/gconf/gconf-sanity-check.c b/gconf/gconf-sanity-check.c
index e466960f..42f4d322 100644
--- a/gconf/gconf-sanity-check.c
+++ b/gconf/gconf-sanity-check.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-schema.c b/gconf/gconf-schema.c
index 6c8c0a26..a8cc4e97 100644
--- a/gconf/gconf-schema.c
+++ b/gconf/gconf-schema.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-schema.h b/gconf/gconf-schema.h
index 59217357..fe6975c6 100644
--- a/gconf/gconf-schema.h
+++ b/gconf/gconf-schema.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_SCHEMA_H
diff --git a/gconf/gconf-sources.c b/gconf/gconf-sources.c
index 3f10957f..dca5528f 100644
--- a/gconf/gconf-sources.c
+++ b/gconf/gconf-sources.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-sources.h b/gconf/gconf-sources.h
index fc050c83..7caa0c78 100644
--- a/gconf/gconf-sources.h
+++ b/gconf/gconf-sources.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_SOURCES_H
diff --git a/gconf/gconf-value.c b/gconf/gconf-value.c
index f03e241c..615b384e 100644
--- a/gconf/gconf-value.c
+++ b/gconf/gconf-value.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gconf-value.h b/gconf/gconf-value.h
index d6174a4c..53b56e4d 100644
--- a/gconf/gconf-value.h
+++ b/gconf/gconf-value.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_VALUE_H
diff --git a/gconf/gconf.c b/gconf/gconf.c
index b6fccd8f..b39c33fc 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "GConfX.h"
diff --git a/gconf/gconf.h b/gconf/gconf.h
index 1b128abf..acd5135b 100644
--- a/gconf/gconf.h
+++ b/gconf/gconf.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_H
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 2e7183b8..fe5d18a1 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/gconf/gconfd.h b/gconf/gconfd.h
index e5b37fb8..10712596 100644
--- a/gconf/gconfd.h
+++ b/gconf/gconfd.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONFD_H
diff --git a/gconf/gconftool.c b/gconf/gconftool.c
index 21f73e7a..137bae91 100644
--- a/gconf/gconftool.c
+++ b/gconf/gconftool.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/gnome-testclient.c b/gconf/gnome-testclient.c
index c4804379..df61d700 100644
--- a/gconf/gnome-testclient.c
+++ b/gconf/gnome-testclient.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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  * USA
  */
 
diff --git a/gconf/testclient.c b/gconf/testclient.c
index 24a0cbb7..a9b1e1db 100644
--- a/gconf/testclient.c
+++ b/gconf/testclient.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/gconf/testgconfclient.c b/gconf/testgconfclient.c
index 2a60a22d..4e44f0ac 100644
--- a/gconf/testgconfclient.c
+++ b/gconf/testgconfclient.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
diff --git a/tests/testaddress.c b/tests/testaddress.c
index 5c05be02..b0f656e7 100644
--- a/tests/testaddress.c
+++ b/tests/testaddress.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/tests/testbackend.c b/tests/testbackend.c
index 46d42735..a91ec137 100644
--- a/tests/testbackend.c
+++ b/tests/testbackend.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <gconf/gconf-backend.h>
diff --git a/tests/testchangeset.c b/tests/testchangeset.c
index faddb6cc..fa835015 100644
--- a/tests/testchangeset.c
+++ b/tests/testchangeset.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/tests/testdirlist.c b/tests/testdirlist.c
index d16cd6c1..4ea3f041 100644
--- a/tests/testdirlist.c
+++ b/tests/testdirlist.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/tests/testencode.c b/tests/testencode.c
index a7d8a1f8..84bd3ef7 100644
--- a/tests/testencode.c
+++ b/tests/testencode.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <gconf/gconf.h>
diff --git a/tests/testgconf.c b/tests/testgconf.c
index 080e684b..8304c37a 100644
--- a/tests/testgconf.c
+++ b/tests/testgconf.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/tests/testlisteners.c b/tests/testlisteners.c
index 019055d4..57c9e76c 100644
--- a/tests/testlisteners.c
+++ b/tests/testlisteners.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <gconf/gconf-listeners.h>
diff --git a/tests/testpersistence.c b/tests/testpersistence.c
index f2753ab6..d709e9ce 100644
--- a/tests/testpersistence.c
+++ b/tests/testpersistence.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/tests/testschemas.c b/tests/testschemas.c
index 0b871782..388bf5f9 100644
--- a/tests/testschemas.c
+++ b/tests/testschemas.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/tests/testunique.c b/tests/testunique.c
index 22d14bc2..9586b878 100644
--- a/tests/testunique.c
+++ b/tests/testunique.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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /* This isn't an automated test */
diff --git a/wrappers/cxx/gconf-cxx.cc b/wrappers/cxx/gconf-cxx.cc
index 9100623d..ff159f11 100644
--- a/wrappers/cxx/gconf-cxx.cc
+++ b/wrappers/cxx/gconf-cxx.cc
@@ -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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "gconf-cxx.h"
diff --git a/wrappers/cxx/gconf-cxx.h b/wrappers/cxx/gconf-cxx.h
index 93e68329..a90a26cd 100644
--- a/wrappers/cxx/gconf-cxx.h
+++ b/wrappers/cxx/gconf-cxx.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef GCONF_GCONF_CXX_H
diff --git a/wrappers/guile/gconf-guile.c b/wrappers/guile/gconf-guile.c
index d89c6b27..c6016e80 100644
--- a/wrappers/guile/gconf-guile.c
+++ b/wrappers/guile/gconf-guile.c
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/wrappers/guile/scm-gconf-private.h b/wrappers/guile/scm-gconf-private.h
index ae3e4f59..fa4dda7d 100644
--- a/wrappers/guile/scm-gconf-private.h
+++ b/wrappers/guile/scm-gconf-private.h
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
diff --git a/wrappers/guile/scm-gconf.c b/wrappers/guile/scm-gconf.c
index 999e577c..4efe4c08 100644
--- a/wrappers/guile/scm-gconf.c
+++ b/wrappers/guile/scm-gconf.c
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include "scm-gconf.h"
diff --git a/wrappers/guile/scm-gconf.h b/wrappers/guile/scm-gconf.h
index 0d4e0e5f..106597a2 100644
--- a/wrappers/guile/scm-gconf.h
+++ b/wrappers/guile/scm-gconf.h
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */