[gcr] Updated FSF's address

From: Daniel Mustieles García <dmustieles src gnome org>
To: commits-list gnome org
Cc:
Subject: [gcr] Updated FSF's address
Date: Fri, 31 Jan 2014 13:34:36 +0000 (UTC)
commit 4b4ee9b566069b5ff2b27941e599871dc9ad6ae1
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Thu Jan 23 12:59:43 2014 +0100

    Updated FSF's address

 egg/egg-armor.c                       |    3 +--
 egg/egg-armor.h                       |    3 +--
 egg/egg-asn1-defs.c                   |    3 +--
 egg/egg-asn1-defs.h                   |    3 +--
 egg/egg-asn1x.c                       |    3 +--
 egg/egg-asn1x.h                       |    3 +--
 egg/egg-buffer.c                      |    3 +--
 egg/egg-buffer.h                      |    3 +--
 egg/egg-decimal.c                     |    4 +---
 egg/egg-decimal.h                     |    4 +---
 egg/egg-dh.c                          |    4 +---
 egg/egg-dh.h                          |    4 +---
 egg/egg-dn.c                          |    3 +--
 egg/egg-dn.h                          |    3 +--
 egg/egg-error.h                       |    4 +---
 egg/egg-hex.c                         |    4 +---
 egg/egg-hex.h                         |    4 +---
 egg/egg-hkdf.c                        |    4 +---
 egg/egg-hkdf.h                        |    4 +---
 egg/egg-libgcrypt.c                   |    4 +---
 egg/egg-libgcrypt.h                   |    4 +---
 egg/egg-oid.c                         |    3 +--
 egg/egg-oid.h                         |    3 +--
 egg/egg-openssl.c                     |    3 +--
 egg/egg-openssl.h                     |    3 +--
 egg/egg-padding.c                     |    4 +---
 egg/egg-padding.h                     |    4 +---
 egg/egg-secure-memory.c               |    3 +--
 egg/egg-secure-memory.h               |    3 +--
 egg/egg-symkey.c                      |    4 +---
 egg/egg-symkey.h                      |    4 +---
 egg/egg-testing.c                     |    4 +---
 egg/egg-testing.h                     |    4 +---
 egg/egg-timegm.c                      |    3 +--
 egg/egg-timegm.h                      |    3 +--
 egg/tests/test-armor.c                |    3 +--
 egg/tests/test-asn1.c                 |    3 +--
 egg/tests/test-asn1x.c                |    3 +--
 egg/tests/test-decimal.c              |    3 +--
 egg/tests/test-dh.c                   |    3 +--
 egg/tests/test-dn.c                   |    3 +--
 egg/tests/test-hex.c                  |    3 +--
 egg/tests/test-hkdf.c                 |    3 +--
 egg/tests/test-oid.c                  |    3 +--
 egg/tests/test-openssl.c              |    3 +--
 egg/tests/test-padding.c              |    3 +--
 egg/tests/test-secmem.c               |    3 +--
 egg/tests/test-symkey.c               |    3 +--
 gck/gck-attributes.c                  |    3 +--
 gck/gck-call.c                        |    3 +--
 gck/gck-deprecated.h                  |    3 +--
 gck/gck-dump.c                        |    3 +--
 gck/gck-enumerator.c                  |    3 +--
 gck/gck-interaction.c                 |    3 +--
 gck/gck-misc.c                        |    3 +--
 gck/gck-mock.c                        |    4 +---
 gck/gck-mock.h                        |    4 +---
 gck/gck-module.c                      |    3 +--
 gck/gck-modules.c                     |    3 +--
 gck/gck-object-cache.c                |    3 +--
 gck/gck-object.c                      |    3 +--
 gck/gck-password.c                    |    3 +--
 gck/gck-private.h                     |    3 +--
 gck/gck-session.c                     |    3 +--
 gck/gck-slot.c                        |    3 +--
 gck/gck-test.c                        |    4 +---
 gck/gck-test.h                        |    4 +---
 gck/gck-uri.c                         |    3 +--
 gck/gck-version.h.in                  |    4 +---
 gck/gck.h                             |    3 +--
 gck/pkcs11i.h                         |    3 +--
 gck/tests/mock-interaction.c          |    3 +--
 gck/tests/mock-interaction.h          |    3 +--
 gck/tests/test-gck-attributes.c       |    3 +--
 gck/tests/test-gck-crypto.c           |    3 +--
 gck/tests/test-gck-enumerator.c       |    3 +--
 gck/tests/test-gck-module.c           |    3 +--
 gck/tests/test-gck-modules.c          |    3 +--
 gck/tests/test-gck-object.c           |    3 +--
 gck/tests/test-gck-session.c          |    3 +--
 gck/tests/test-gck-slot.c             |    3 +--
 gck/tests/test-gck-uri.c              |    3 +--
 gcr/gcr-base.h                        |    4 +---
 gcr/gcr-callback-output-stream.c      |    4 +---
 gcr/gcr-callback-output-stream.h      |    4 +---
 gcr/gcr-certificate-chain.c           |    4 +---
 gcr/gcr-certificate-chain.h           |    4 +---
 gcr/gcr-certificate-extensions.c      |    4 +---
 gcr/gcr-certificate-extensions.h      |    4 +---
 gcr/gcr-certificate-request.c         |    4 +---
 gcr/gcr-certificate-request.h         |    4 +---
 gcr/gcr-certificate.c                 |    4 +---
 gcr/gcr-certificate.h                 |    4 +---
 gcr/gcr-collection.c                  |    4 +---
 gcr/gcr-collection.h                  |    4 +---
 gcr/gcr-column.c                      |    4 +---
 gcr/gcr-column.h                      |    4 +---
 gcr/gcr-comparable.c                  |    4 +---
 gcr/gcr-comparable.h                  |    4 +---
 gcr/gcr-dbus-constants.h              |    4 +---
 gcr/gcr-deprecated-base.h             |    4 +---
 gcr/gcr-filter-collection.c           |    4 +---
 gcr/gcr-filter-collection.h           |    4 +---
 gcr/gcr-fingerprint.c                 |    4 +---
 gcr/gcr-fingerprint.h                 |    4 +---
 gcr/gcr-gnupg-collection.c            |    4 +---
 gcr/gcr-gnupg-collection.h            |    4 +---
 gcr/gcr-gnupg-importer.c              |    4 +---
 gcr/gcr-gnupg-importer.h              |    4 +---
 gcr/gcr-gnupg-key.c                   |    4 +---
 gcr/gcr-gnupg-key.h                   |    4 +---
 gcr/gcr-gnupg-process.c               |    4 +---
 gcr/gcr-gnupg-process.h               |    4 +---
 gcr/gcr-gnupg-records.c               |    4 +---
 gcr/gcr-gnupg-records.h               |    4 +---
 gcr/gcr-gnupg-util.c                  |    4 +---
 gcr/gcr-gnupg-util.h                  |    4 +---
 gcr/gcr-icons.c                       |    4 +---
 gcr/gcr-icons.h                       |    4 +---
 gcr/gcr-import-interaction.c          |    4 +---
 gcr/gcr-import-interaction.h          |    4 +---
 gcr/gcr-importer.c                    |    4 +---
 gcr/gcr-importer.h                    |    4 +---
 gcr/gcr-internal.h                    |    4 +---
 gcr/gcr-key-mechanisms.c              |    4 +---
 gcr/gcr-key-mechanisms.h              |    4 +---
 gcr/gcr-library.c                     |    4 +---
 gcr/gcr-library.h                     |    4 +---
 gcr/gcr-memory-icon.c                 |    4 +---
 gcr/gcr-memory-icon.h                 |    4 +---
 gcr/gcr-mock-prompter.c               |    4 +---
 gcr/gcr-mock-prompter.h               |    4 +---
 gcr/gcr-openpgp.c                     |    4 +---
 gcr/gcr-openpgp.h                     |    4 +---
 gcr/gcr-openssh.c                     |    4 +---
 gcr/gcr-openssh.h                     |    4 +---
 gcr/gcr-parser.c                      |    4 +---
 gcr/gcr-parser.h                      |    4 +---
 gcr/gcr-pkcs11-certificate.c          |    4 +---
 gcr/gcr-pkcs11-certificate.h          |    4 +---
 gcr/gcr-pkcs11-importer.c             |    4 +---
 gcr/gcr-pkcs11-importer.h             |    4 +---
 gcr/gcr-prompt.c                      |    4 +---
 gcr/gcr-prompt.h                      |    4 +---
 gcr/gcr-record.c                      |    4 +---
 gcr/gcr-record.h                      |    4 +---
 gcr/gcr-secret-exchange.c             |    4 +---
 gcr/gcr-secret-exchange.h             |    4 +---
 gcr/gcr-secure-memory.c               |    3 +--
 gcr/gcr-secure-memory.h               |    3 +--
 gcr/gcr-simple-certificate.c          |    4 +---
 gcr/gcr-simple-certificate.h          |    4 +---
 gcr/gcr-simple-collection.c           |    4 +---
 gcr/gcr-simple-collection.h           |    4 +---
 gcr/gcr-single-collection.c           |    4 +---
 gcr/gcr-single-collection.h           |    4 +---
 gcr/gcr-subject-public-key.c          |    4 +---
 gcr/gcr-subject-public-key.h          |    4 +---
 gcr/gcr-system-prompt.c               |    4 +---
 gcr/gcr-system-prompt.h               |    4 +---
 gcr/gcr-system-prompter.c             |    4 +---
 gcr/gcr-system-prompter.h             |    4 +---
 gcr/gcr-trust.c                       |    4 +---
 gcr/gcr-trust.h                       |    4 +---
 gcr/gcr-types.h                       |    4 +---
 gcr/gcr-union-collection.c            |    4 +---
 gcr/gcr-union-collection.h            |    4 +---
 gcr/gcr-unlock-options.h              |    4 +---
 gcr/gcr-util.c                        |    4 +---
 gcr/gcr-util.h                        |    4 +---
 gcr/gcr-version.h.in                  |    4 +---
 gcr/gcr.h                             |    4 +---
 gcr/tests/console-interaction.c       |    4 +---
 gcr/tests/console-interaction.h       |    4 +---
 gcr/tests/frob-certificate-request.c  |    4 +---
 gcr/tests/frob-openpgp.c              |    4 +---
 gcr/tests/frob-parser.c               |    4 +---
 gcr/tests/test-certificate-chain.c    |    3 +--
 gcr/tests/test-certificate.c          |    3 +--
 gcr/tests/test-filter-collection.c    |    3 +--
 gcr/tests/test-fingerprint.c          |    3 +--
 gcr/tests/test-gnupg-collection.c     |    3 +--
 gcr/tests/test-gnupg-key.c            |    3 +--
 gcr/tests/test-gnupg-process.c        |    3 +--
 gcr/tests/test-memory-icon.c          |    3 +--
 gcr/tests/test-openpgp.c              |    3 +--
 gcr/tests/test-openssh.c              |    3 +--
 gcr/tests/test-parser.c               |    3 +--
 gcr/tests/test-pkcs11-certificate.c   |    3 +--
 gcr/tests/test-record.c               |    3 +--
 gcr/tests/test-secret-exchange.c      |    3 +--
 gcr/tests/test-secure-memory.c        |    3 +--
 gcr/tests/test-simple-certificate.c   |    3 +--
 gcr/tests/test-subject-public-key.c   |    3 +--
 gcr/tests/test-system-prompt.c        |    3 +--
 gcr/tests/test-trust.c                |    3 +--
 gcr/tests/test-util.c                 |    3 +--
 ui/gcr-certificate-basics-widget.c    |    4 +---
 ui/gcr-certificate-basics-widget.h    |    4 +---
 ui/gcr-certificate-details-widget.c   |    4 +---
 ui/gcr-certificate-details-widget.h   |    4 +---
 ui/gcr-certificate-exporter.c         |    4 +---
 ui/gcr-certificate-exporter.h         |    4 +---
 ui/gcr-certificate-renderer-private.h |    4 +---
 ui/gcr-certificate-renderer.c         |    4 +---
 ui/gcr-certificate-renderer.h         |    4 +---
 ui/gcr-certificate-request-renderer.c |    4 +---
 ui/gcr-certificate-request-renderer.h |    4 +---
 ui/gcr-certificate-widget.c           |    4 +---
 ui/gcr-certificate-widget.h           |    4 +---
 ui/gcr-collection-model.c             |    4 +---
 ui/gcr-collection-model.h             |    4 +---
 ui/gcr-combo-selector.c               |    4 +---
 ui/gcr-combo-selector.h               |    4 +---
 ui/gcr-deprecated.h                   |    4 +---
 ui/gcr-dialog-util.c                  |    4 +---
 ui/gcr-dialog-util.h                  |    4 +---
 ui/gcr-display-scrolled.c             |    4 +---
 ui/gcr-display-scrolled.h             |    4 +---
 ui/gcr-display-view.c                 |    4 +---
 ui/gcr-display-view.h                 |    4 +---
 ui/gcr-failure-renderer.c             |    4 +---
 ui/gcr-failure-renderer.h             |    4 +---
 ui/gcr-gnupg-renderer.c               |    4 +---
 ui/gcr-gnupg-renderer.h               |    4 +---
 ui/gcr-import-button.c                |    4 +---
 ui/gcr-import-button.h                |    4 +---
 ui/gcr-key-renderer.c                 |    4 +---
 ui/gcr-key-renderer.h                 |    4 +---
 ui/gcr-key-widget.c                   |    4 +---
 ui/gcr-key-widget.h                   |    4 +---
 ui/gcr-list-selector-private.h        |    4 +---
 ui/gcr-list-selector.c                |    4 +---
 ui/gcr-list-selector.h                |    4 +---
 ui/gcr-pkcs11-import-dialog.c         |    4 +---
 ui/gcr-pkcs11-import-dialog.h         |    4 +---
 ui/gcr-pkcs11-import-interaction.c    |    4 +---
 ui/gcr-pkcs11-import-interaction.h    |    4 +---
 ui/gcr-prompt-dialog.c                |    4 +---
 ui/gcr-prompt-dialog.h                |    4 +---
 ui/gcr-prompter-tool.c                |    3 +--
 ui/gcr-renderer.c                     |    4 +---
 ui/gcr-renderer.h                     |    4 +---
 ui/gcr-secure-entry-buffer.c          |    3 +--
 ui/gcr-secure-entry-buffer.h          |    3 +--
 ui/gcr-tree-selector.c                |    4 +---
 ui/gcr-tree-selector.h                |    4 +---
 ui/gcr-ui.h                           |    4 +---
 ui/gcr-unlock-options-widget.c        |    4 +---
 ui/gcr-unlock-options-widget.h        |    4 +---
 ui/gcr-unlock-renderer.c              |    4 +---
 ui/gcr-unlock-renderer.h              |    4 +---
 ui/gcr-viewer-tool.c                  |    3 +--
 ui/gcr-viewer-widget.c                |    3 +--
 ui/gcr-viewer-widget.h                |    3 +--
 ui/gcr-viewer-window.c                |    3 +--
 ui/gcr-viewer-window.h                |    3 +--
 ui/gcr-viewer.c                       |    4 +---
 ui/gcr-viewer.h                       |    4 +---
 ui/tests/frob-certificate.c           |    4 +---
 ui/tests/frob-gnupg-selector.c        |    4 +---
 ui/tests/frob-import-button.c         |    4 +---
 ui/tests/frob-key.c                   |    4 +---
 ui/tests/frob-prompt.c                |    4 +---
 ui/tests/frob-request.c               |    4 +---
 ui/tests/frob-system-prompt.c         |    4 +---
 ui/tests/frob-unlock-options.c        |    4 +---
 ui/tests/frob-unlock.c                |    4 +---
 268 files changed, 268 insertions(+), 714 deletions(-)
---
diff --git a/egg/egg-armor.c b/egg/egg-armor.c
index 02e7646..a6930d3 100644
--- a/egg/egg-armor.c
+++ b/egg/egg-armor.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-armor.h b/egg/egg-armor.h
index e32d44d..c26abca 100644
--- a/egg/egg-armor.h
+++ b/egg/egg-armor.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-asn1-defs.c b/egg/egg-asn1-defs.c
index e1a6d1e..7ee1ff3 100644
--- a/egg/egg-asn1-defs.c
+++ b/egg/egg-asn1-defs.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/egg/egg-asn1-defs.h b/egg/egg-asn1-defs.h
index ec47287..aeed791 100644
--- a/egg/egg-asn1-defs.h
+++ b/egg/egg-asn1-defs.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
index 0a4b655..7ea1685 100644
--- a/egg/egg-asn1x.c
+++ b/egg/egg-asn1x.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-asn1x.h b/egg/egg-asn1x.h
index 8d8970e..0cda783 100644
--- a/egg/egg-asn1x.h
+++ b/egg/egg-asn1x.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-buffer.c b/egg/egg-buffer.c
index d5f9d49..e108bda 100644
--- a/egg/egg-buffer.c
+++ b/egg/egg-buffer.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-buffer.h b/egg/egg-buffer.h
index 5604dd6..6291f1b 100644
--- a/egg/egg-buffer.h
+++ b/egg/egg-buffer.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-decimal.c b/egg/egg-decimal.c
index 422ec0c..ee3a806 100644
--- a/egg/egg-decimal.c
+++ b/egg/egg-decimal.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/egg/egg-decimal.h b/egg/egg-decimal.h
index eaf1760..adfb602 100644
--- a/egg/egg-decimal.h
+++ b/egg/egg-decimal.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/egg/egg-dh.c b/egg/egg-dh.c
index 8377d92..b8b4d39 100644
--- a/egg/egg-dh.c
+++ b/egg/egg-dh.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-dh.h b/egg/egg-dh.h
index 6c001db..5d180a9 100644
--- a/egg/egg-dh.h
+++ b/egg/egg-dh.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_DH_H_
diff --git a/egg/egg-dn.c b/egg/egg-dn.c
index 43bd772..601dccc 100644
--- a/egg/egg-dn.c
+++ b/egg/egg-dn.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-dn.h b/egg/egg-dn.h
index bdf6b92..eb07736 100644
--- a/egg/egg-dn.h
+++ b/egg/egg-dn.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-error.h b/egg/egg-error.h
index acf1fda..3f82c39 100644
--- a/egg/egg-error.h
+++ b/egg/egg-error.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_ERROR_H_
diff --git a/egg/egg-hex.c b/egg/egg-hex.c
index fdc234a..d7d05fc 100644
--- a/egg/egg-hex.c
+++ b/egg/egg-hex.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-hex.h b/egg/egg-hex.h
index 4575a43..d5baea6 100644
--- a/egg/egg-hex.h
+++ b/egg/egg-hex.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_HEX_H_
diff --git a/egg/egg-hkdf.c b/egg/egg-hkdf.c
index c6559de..123b988 100644
--- a/egg/egg-hkdf.c
+++ b/egg/egg-hkdf.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/egg/egg-hkdf.h b/egg/egg-hkdf.h
index 91689e9..d501641 100644
--- a/egg/egg-hkdf.h
+++ b/egg/egg-hkdf.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c
index 0ba84fe..eaa4240 100644
--- a/egg/egg-libgcrypt.c
+++ b/egg/egg-libgcrypt.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-libgcrypt.h b/egg/egg-libgcrypt.h
index db1093c..9e33c9a 100644
--- a/egg/egg-libgcrypt.h
+++ b/egg/egg-libgcrypt.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_LIBGCRYPT_H_
diff --git a/egg/egg-oid.c b/egg/egg-oid.c
index 688faf7..75d909e 100644
--- a/egg/egg-oid.c
+++ b/egg/egg-oid.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-oid.h b/egg/egg-oid.h
index 5b9b588..330a9f3 100644
--- a/egg/egg-oid.h
+++ b/egg/egg-oid.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-openssl.c b/egg/egg-openssl.c
index 5515be1..60f4d8f 100644
--- a/egg/egg-openssl.c
+++ b/egg/egg-openssl.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-openssl.h b/egg/egg-openssl.h
index 6c94a7b..37f232b 100644
--- a/egg/egg-openssl.h
+++ b/egg/egg-openssl.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-padding.c b/egg/egg-padding.c
index ee694c8..f2577fe 100644
--- a/egg/egg-padding.c
+++ b/egg/egg-padding.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-padding.h b/egg/egg-padding.h
index 12b9950..67df74c 100644
--- a/egg/egg-padding.h
+++ b/egg/egg-padding.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_PADDING_H_
diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
index 9e605ff..bcc067e 100644
--- a/egg/egg-secure-memory.c
+++ b/egg/egg-secure-memory.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-secure-memory.h b/egg/egg-secure-memory.h
index 5181551..4554aef 100644
--- a/egg/egg-secure-memory.h
+++ b/egg/egg-secure-memory.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/egg-symkey.c b/egg/egg-symkey.c
index c6f69ad..a0b08a3 100644
--- a/egg/egg-symkey.c
+++ b/egg/egg-symkey.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/egg/egg-symkey.h b/egg/egg-symkey.h
index f4938f6..d565cf1 100644
--- a/egg/egg-symkey.h
+++ b/egg/egg-symkey.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_SYMKEY_H_
diff --git a/egg/egg-testing.c b/egg/egg-testing.c
index f581bfe..df6e4ee 100644
--- a/egg/egg-testing.c
+++ b/egg/egg-testing.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Stef Walter <stefw collabora co uk>
  */
diff --git a/egg/egg-testing.h b/egg/egg-testing.h
index 44c7fb3..73939b3 100644
--- a/egg/egg-testing.h
+++ b/egg/egg-testing.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/egg/egg-timegm.c b/egg/egg-timegm.c
index b42ced9..a075d25 100644
--- a/egg/egg-timegm.c
+++ b/egg/egg-timegm.c
@@ -13,8 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C 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.  */
+   see <http://www.gnu.org/licenses/>.  */
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
diff --git a/egg/egg-timegm.h b/egg/egg-timegm.h
index 37a816a..ad68d23 100644
--- a/egg/egg-timegm.h
+++ b/egg/egg-timegm.h
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C 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.  */
+   see <http://www.gnu.org/licenses/>.  */
 
 /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
 
diff --git a/egg/tests/test-armor.c b/egg/tests/test-armor.c
index 7435a10..eecb285 100644
--- a/egg/tests/test-armor.c
+++ b/egg/tests/test-armor.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw gnome org>
 */
diff --git a/egg/tests/test-asn1.c b/egg/tests/test-asn1.c
index c4b3dd7..36912f8 100644
--- a/egg/tests/test-asn1.c
+++ b/egg/tests/test-asn1.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-asn1x.c b/egg/tests/test-asn1x.c
index 78810de..f4d8e33 100644
--- a/egg/tests/test-asn1x.c
+++ b/egg/tests/test-asn1x.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-decimal.c b/egg/tests/test-decimal.c
index 4996caf..051a95e 100644
--- a/egg/tests/test-decimal.c
+++ b/egg/tests/test-decimal.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/egg/tests/test-dh.c b/egg/tests/test-dh.c
index a676f93..c95f479 100644
--- a/egg/tests/test-dh.c
+++ b/egg/tests/test-dh.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-dn.c b/egg/tests/test-dn.c
index 6494679..3cc0561 100644
--- a/egg/tests/test-dn.c
+++ b/egg/tests/test-dn.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-hex.c b/egg/tests/test-hex.c
index 992f0aa..6bb8c5b 100644
--- a/egg/tests/test-hex.c
+++ b/egg/tests/test-hex.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-hkdf.c b/egg/tests/test-hkdf.c
index d8002f4..14d7fd2 100644
--- a/egg/tests/test-hkdf.c
+++ b/egg/tests/test-hkdf.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef collabora co uk>
 */
diff --git a/egg/tests/test-oid.c b/egg/tests/test-oid.c
index 37b0e2e..21ae128 100644
--- a/egg/tests/test-oid.c
+++ b/egg/tests/test-oid.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-openssl.c b/egg/tests/test-openssl.c
index 562f200..cf3fd4c 100644
--- a/egg/tests/test-openssl.c
+++ b/egg/tests/test-openssl.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-padding.c b/egg/tests/test-padding.c
index 5e10304..d6c0443 100644
--- a/egg/tests/test-padding.c
+++ b/egg/tests/test-padding.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-secmem.c b/egg/tests/test-secmem.c
index e0b6e24..8a63983 100644
--- a/egg/tests/test-secmem.c
+++ b/egg/tests/test-secmem.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/egg/tests/test-symkey.c b/egg/tests/test-symkey.c
index 783eebb..f363681 100644
--- a/egg/tests/test-symkey.c
+++ b/egg/tests/test-symkey.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/gck/gck-attributes.c b/gck/gck-attributes.c
index 480509a..066564e 100644
--- a/gck/gck-attributes.c
+++ b/gck/gck-attributes.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-call.c b/gck/gck-call.c
index fa17b48..8e1a276 100644
--- a/gck/gck-call.c
+++ b/gck/gck-call.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-deprecated.h b/gck/gck-deprecated.h
index 0e3b67a..9314db7 100644
--- a/gck/gck-deprecated.h
+++ b/gck/gck-deprecated.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/gck-dump.c b/gck/gck-dump.c
index 0f1e1fb..58ca5d5 100644
--- a/gck/gck-dump.c
+++ b/gck/gck-dump.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/gck-enumerator.c b/gck/gck-enumerator.c
index 16e851c..36b188a 100644
--- a/gck/gck-enumerator.c
+++ b/gck/gck-enumerator.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-interaction.c b/gck/gck-interaction.c
index ef61e6b..ebbdc77 100644
--- a/gck/gck-interaction.c
+++ b/gck/gck-interaction.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/gck-misc.c b/gck/gck-misc.c
index e21ccba..0e3586b 100644
--- a/gck/gck-misc.c
+++ b/gck/gck-misc.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-mock.c b/gck/gck-mock.c
index 23f4c4d..30b5462 100644
--- a/gck/gck-mock.c
+++ b/gck/gck-mock.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gck/gck-mock.h b/gck/gck-mock.h
index c1e56e3..da08a31 100644
--- a/gck/gck-mock.h
+++ b/gck/gck-mock.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/gck/gck-module.c b/gck/gck-module.c
index 1808cab..257e88b 100644
--- a/gck/gck-module.c
+++ b/gck/gck-module.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-modules.c b/gck/gck-modules.c
index d55666c..64ee63d 100644
--- a/gck/gck-modules.c
+++ b/gck/gck-modules.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/gck/gck-object-cache.c b/gck/gck-object-cache.c
index 07a4dbc..2325bfa 100644
--- a/gck/gck-object-cache.c
+++ b/gck/gck-object-cache.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/gck-object.c b/gck/gck-object.c
index 87c0e7b..cc7753e 100644
--- a/gck/gck-object.c
+++ b/gck/gck-object.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-password.c b/gck/gck-password.c
index f5edfc7..90926c9 100644
--- a/gck/gck-password.c
+++ b/gck/gck-password.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/gck-private.h b/gck/gck-private.h
index 884be22..dc4c44b 100644
--- a/gck/gck-private.h
+++ b/gck/gck-private.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-session.c b/gck/gck-session.c
index b726b4a..5df0020 100644
--- a/gck/gck-session.c
+++ b/gck/gck-session.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-slot.c b/gck/gck-slot.c
index 5b3580a..7218d0e 100644
--- a/gck/gck-slot.c
+++ b/gck/gck-slot.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/gck-test.c b/gck/gck-test.c
index b411ef9..0e14928 100644
--- a/gck/gck-test.c
+++ b/gck/gck-test.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gck/gck-test.h b/gck/gck-test.h
index 0bc3cdf..dfefbb0 100644
--- a/gck/gck-test.h
+++ b/gck/gck-test.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/gck/gck-uri.c b/gck/gck-uri.c
index d8665fa..6ab71b7 100644
--- a/gck/gck-uri.c
+++ b/gck/gck-uri.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/gck/gck-version.h.in b/gck/gck-version.h.in
index ed3ef86..012e236 100644
--- a/gck/gck-version.h.in
+++ b/gck/gck-version.h.in
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw gnome org>
  */
diff --git a/gck/gck.h b/gck/gck.h
index d8b8b5b..1af1e22 100644
--- a/gck/gck.h
+++ b/gck/gck.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <nielsen memberwebs com>
 */
diff --git a/gck/pkcs11i.h b/gck/pkcs11i.h
index c66d9a7..14291d7 100644
--- a/gck/pkcs11i.h
+++ b/gck/pkcs11i.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/gck/tests/mock-interaction.c b/gck/tests/mock-interaction.c
index ed25a47..c431454 100644
--- a/gck/tests/mock-interaction.c
+++ b/gck/tests/mock-interaction.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/mock-interaction.h b/gck/tests/mock-interaction.h
index 0747f4b..5053cd2 100644
--- a/gck/tests/mock-interaction.h
+++ b/gck/tests/mock-interaction.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-attributes.c b/gck/tests/test-gck-attributes.c
index f3c532b..0cfd95e 100644
--- a/gck/tests/test-gck-attributes.c
+++ b/gck/tests/test-gck-attributes.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-crypto.c b/gck/tests/test-gck-crypto.c
index 492ad06..f2bd7f9 100644
--- a/gck/tests/test-gck-crypto.c
+++ b/gck/tests/test-gck-crypto.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-enumerator.c b/gck/tests/test-gck-enumerator.c
index 25197f5..9d01c4c 100644
--- a/gck/tests/test-gck-enumerator.c
+++ b/gck/tests/test-gck-enumerator.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-module.c b/gck/tests/test-gck-module.c
index 10c7606..068423f 100644
--- a/gck/tests/test-gck-module.c
+++ b/gck/tests/test-gck-module.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-modules.c b/gck/tests/test-gck-modules.c
index 80cdb95..4307408 100644
--- a/gck/tests/test-gck-modules.c
+++ b/gck/tests/test-gck-modules.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-object.c b/gck/tests/test-gck-object.c
index 9cd316d..9622bb2 100644
--- a/gck/tests/test-gck-object.c
+++ b/gck/tests/test-gck-object.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-session.c b/gck/tests/test-gck-session.c
index 1bd2569..19c3361 100644
--- a/gck/tests/test-gck-session.c
+++ b/gck/tests/test-gck-session.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-slot.c b/gck/tests/test-gck-slot.c
index a8f66db..4661d49 100644
--- a/gck/tests/test-gck-slot.c
+++ b/gck/tests/test-gck-slot.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gck/tests/test-gck-uri.c b/gck/tests/test-gck-uri.c
index db44442..39ef9f1 100644
--- a/gck/tests/test-gck-uri.c
+++ b/gck/tests/test-gck-uri.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/gcr-base.h b/gcr/gcr-base.h
index fab99ec..6664845 100644
--- a/gcr/gcr-base.h
+++ b/gcr/gcr-base.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-callback-output-stream.c b/gcr/gcr-callback-output-stream.c
index 94fc4c3..a621505 100644
--- a/gcr/gcr-callback-output-stream.c
+++ b/gcr/gcr-callback-output-stream.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-callback-output-stream.h b/gcr/gcr-callback-output-stream.h
index a8db5df..63a48dd 100644
--- a/gcr/gcr-callback-output-stream.h
+++ b/gcr/gcr-callback-output-stream.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-certificate-chain.c b/gcr/gcr-certificate-chain.c
index 4c7de1c..42a83f0 100644
--- a/gcr/gcr-certificate-chain.c
+++ b/gcr/gcr-certificate-chain.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-certificate-chain.h b/gcr/gcr-certificate-chain.h
index ef8bdcf..c057108 100644
--- a/gcr/gcr-certificate-chain.h
+++ b/gcr/gcr-certificate-chain.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-certificate-extensions.c b/gcr/gcr-certificate-extensions.c
index e1856a7..63d1eda 100644
--- a/gcr/gcr-certificate-extensions.c
+++ b/gcr/gcr-certificate-extensions.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-certificate-extensions.h b/gcr/gcr-certificate-extensions.h
index 7325df2..3f0849c 100644
--- a/gcr/gcr-certificate-extensions.h
+++ b/gcr/gcr-certificate-extensions.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-certificate-request.c b/gcr/gcr-certificate-request.c
index d772ac9..5e946aa 100644
--- a/gcr/gcr-certificate-request.c
+++ b/gcr/gcr-certificate-request.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-certificate-request.h b/gcr/gcr-certificate-request.h
index 9081e7c..8128efc 100644
--- a/gcr/gcr-certificate-request.h
+++ b/gcr/gcr-certificate-request.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-certificate.c b/gcr/gcr-certificate.c
index 7f51630..ef26bff 100644
--- a/gcr/gcr-certificate.c
+++ b/gcr/gcr-certificate.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-certificate.h b/gcr/gcr-certificate.h
index 6645ee0..52aa553 100644
--- a/gcr/gcr-certificate.h
+++ b/gcr/gcr-certificate.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/gcr/gcr-collection.c b/gcr/gcr-collection.c
index 4975c3c..576ba4c 100644
--- a/gcr/gcr-collection.c
+++ b/gcr/gcr-collection.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-collection.h b/gcr/gcr-collection.h
index 2616394..6a1d193 100644
--- a/gcr/gcr-collection.h
+++ b/gcr/gcr-collection.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_COLLECTION_H__
diff --git a/gcr/gcr-column.c b/gcr/gcr-column.c
index 254f55c..e7e1b6e 100644
--- a/gcr/gcr-column.c
+++ b/gcr/gcr-column.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-column.h b/gcr/gcr-column.h
index 65ee6a6..a6eb75b 100644
--- a/gcr/gcr-column.h
+++ b/gcr/gcr-column.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_COLUMN_H__
diff --git a/gcr/gcr-comparable.c b/gcr/gcr-comparable.c
index c378c28..5c4304d 100644
--- a/gcr/gcr-comparable.c
+++ b/gcr/gcr-comparable.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-comparable.h b/gcr/gcr-comparable.h
index 39f1d8a..5a8e28f 100644
--- a/gcr/gcr-comparable.h
+++ b/gcr/gcr-comparable.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_COMPARABLE_H__
diff --git a/gcr/gcr-dbus-constants.h b/gcr/gcr-dbus-constants.h
index c08871e..e4303d9 100644
--- a/gcr/gcr-dbus-constants.h
+++ b/gcr/gcr-dbus-constants.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/gcr/gcr-deprecated-base.h b/gcr/gcr-deprecated-base.h
index 6ecfd90..ef761e7 100644
--- a/gcr/gcr-deprecated-base.h
+++ b/gcr/gcr-deprecated-base.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-filter-collection.c b/gcr/gcr-filter-collection.c
index 3a29dfb..25e97ec 100644
--- a/gcr/gcr-filter-collection.c
+++ b/gcr/gcr-filter-collection.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-filter-collection.h b/gcr/gcr-filter-collection.h
index 8679e79..9666a92 100644
--- a/gcr/gcr-filter-collection.h
+++ b/gcr/gcr-filter-collection.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-fingerprint.c b/gcr/gcr-fingerprint.c
index 79343ff..fc024d1 100644
--- a/gcr/gcr-fingerprint.c
+++ b/gcr/gcr-fingerprint.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-fingerprint.h b/gcr/gcr-fingerprint.h
index 70cf93c..299f087 100644
--- a/gcr/gcr-fingerprint.h
+++ b/gcr/gcr-fingerprint.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-collection.c b/gcr/gcr-gnupg-collection.c
index fe730a2..f16f7f7 100644
--- a/gcr/gcr-gnupg-collection.c
+++ b/gcr/gcr-gnupg-collection.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-collection.h b/gcr/gcr-gnupg-collection.h
index a2b631e..e0b4367 100644
--- a/gcr/gcr-gnupg-collection.h
+++ b/gcr/gcr-gnupg-collection.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-importer.c b/gcr/gcr-gnupg-importer.c
index d77db87..bee2c1b 100644
--- a/gcr/gcr-gnupg-importer.c
+++ b/gcr/gcr-gnupg-importer.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-importer.h b/gcr/gcr-gnupg-importer.h
index 8511af8..5b37ea0 100644
--- a/gcr/gcr-gnupg-importer.h
+++ b/gcr/gcr-gnupg-importer.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-key.c b/gcr/gcr-gnupg-key.c
index b6dc271..606434e 100644
--- a/gcr/gcr-gnupg-key.c
+++ b/gcr/gcr-gnupg-key.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-key.h b/gcr/gcr-gnupg-key.h
index 2c120af..7f546c0 100644
--- a/gcr/gcr-gnupg-key.h
+++ b/gcr/gcr-gnupg-key.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-process.c b/gcr/gcr-gnupg-process.c
index 4677b46..3435bce 100644
--- a/gcr/gcr-gnupg-process.c
+++ b/gcr/gcr-gnupg-process.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-process.h b/gcr/gcr-gnupg-process.h
index da86dc3..4fab849 100644
--- a/gcr/gcr-gnupg-process.h
+++ b/gcr/gcr-gnupg-process.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-records.c b/gcr/gcr-gnupg-records.c
index 2e3be1a..f8ee6bb 100644
--- a/gcr/gcr-gnupg-records.c
+++ b/gcr/gcr-gnupg-records.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-records.h b/gcr/gcr-gnupg-records.h
index 4a61ff9..4f4e673 100644
--- a/gcr/gcr-gnupg-records.h
+++ b/gcr/gcr-gnupg-records.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-util.c b/gcr/gcr-gnupg-util.c
index 5f8a6ed..687108d 100644
--- a/gcr/gcr-gnupg-util.c
+++ b/gcr/gcr-gnupg-util.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-gnupg-util.h b/gcr/gcr-gnupg-util.h
index 5910bfb..300cda8 100644
--- a/gcr/gcr-gnupg-util.h
+++ b/gcr/gcr-gnupg-util.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-icons.c b/gcr/gcr-icons.c
index 5fe787c..7183c70 100644
--- a/gcr/gcr-icons.c
+++ b/gcr/gcr-icons.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-icons.h b/gcr/gcr-icons.h
index db3fe83..f4b981a 100644
--- a/gcr/gcr-icons.h
+++ b/gcr/gcr-icons.h
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/gcr/gcr-import-interaction.c b/gcr/gcr-import-interaction.c
index 50060f3..c8e7585 100644
--- a/gcr/gcr-import-interaction.c
+++ b/gcr/gcr-import-interaction.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-import-interaction.h b/gcr/gcr-import-interaction.h
index 4ab95a2..79d615b 100644
--- a/gcr/gcr-import-interaction.h
+++ b/gcr/gcr-import-interaction.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-importer.c b/gcr/gcr-importer.c
index 833c0c3..bad45e9 100644
--- a/gcr/gcr-importer.c
+++ b/gcr/gcr-importer.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-importer.h b/gcr/gcr-importer.h
index d915940..7a1bcc1 100644
--- a/gcr/gcr-importer.h
+++ b/gcr/gcr-importer.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-internal.h b/gcr/gcr-internal.h
index 9f62f62..729aab7 100644
--- a/gcr/gcr-internal.h
+++ b/gcr/gcr-internal.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-key-mechanisms.c b/gcr/gcr-key-mechanisms.c
index b21ccbb..a23ee4d 100644
--- a/gcr/gcr-key-mechanisms.c
+++ b/gcr/gcr-key-mechanisms.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-key-mechanisms.h b/gcr/gcr-key-mechanisms.h
index f856cee..37cf46c 100644
--- a/gcr/gcr-key-mechanisms.h
+++ b/gcr/gcr-key-mechanisms.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index 585bd87..b0f009a 100644
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-library.h b/gcr/gcr-library.h
index 617a580..9650497 100644
--- a/gcr/gcr-library.h
+++ b/gcr/gcr-library.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-memory-icon.c b/gcr/gcr-memory-icon.c
index 3971359..e1c62f3 100644
--- a/gcr/gcr-memory-icon.c
+++ b/gcr/gcr-memory-icon.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-memory-icon.h b/gcr/gcr-memory-icon.h
index 71da9e5..579db93 100644
--- a/gcr/gcr-memory-icon.h
+++ b/gcr/gcr-memory-icon.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-mock-prompter.c b/gcr/gcr-mock-prompter.c
index fa5155e..81a14c3 100644
--- a/gcr/gcr-mock-prompter.c
+++ b/gcr/gcr-mock-prompter.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stfew collabora co uk>
  */
diff --git a/gcr/gcr-mock-prompter.h b/gcr/gcr-mock-prompter.h
index f89f762..369fd5f 100644
--- a/gcr/gcr-mock-prompter.h
+++ b/gcr/gcr-mock-prompter.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-openpgp.c b/gcr/gcr-openpgp.c
index 8c87561..0687430 100644
--- a/gcr/gcr-openpgp.c
+++ b/gcr/gcr-openpgp.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-openpgp.h b/gcr/gcr-openpgp.h
index 70a1855..f4825e1 100644
--- a/gcr/gcr-openpgp.h
+++ b/gcr/gcr-openpgp.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-openssh.c b/gcr/gcr-openssh.c
index 4903a94..b8a0b39 100644
--- a/gcr/gcr-openssh.c
+++ b/gcr/gcr-openssh.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-openssh.h b/gcr/gcr-openssh.h
index 52e8e91..a179afa 100644
--- a/gcr/gcr-openssh.h
+++ b/gcr/gcr-openssh.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index 13e1556..d64758e 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-parser.h b/gcr/gcr-parser.h
index caffdb4..4f53a78 100644
--- a/gcr/gcr-parser.h
+++ b/gcr/gcr-parser.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/gcr/gcr-pkcs11-certificate.c b/gcr/gcr-pkcs11-certificate.c
index f726ec9..a89d7c5 100644
--- a/gcr/gcr-pkcs11-certificate.c
+++ b/gcr/gcr-pkcs11-certificate.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-pkcs11-certificate.h b/gcr/gcr-pkcs11-certificate.h
index 04c15b3..5928a87 100644
--- a/gcr/gcr-pkcs11-certificate.h
+++ b/gcr/gcr-pkcs11-certificate.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-pkcs11-importer.c b/gcr/gcr-pkcs11-importer.c
index 85dcba5..0a9ce75 100644
--- a/gcr/gcr-pkcs11-importer.c
+++ b/gcr/gcr-pkcs11-importer.c
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-pkcs11-importer.h b/gcr/gcr-pkcs11-importer.h
index 5f66f7b..20f0381 100644
--- a/gcr/gcr-pkcs11-importer.h
+++ b/gcr/gcr-pkcs11-importer.h
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-prompt.c b/gcr/gcr-prompt.c
index 3b7be73..d1e71a4 100644
--- a/gcr/gcr-prompt.c
+++ b/gcr/gcr-prompt.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/gcr/gcr-prompt.h b/gcr/gcr-prompt.h
index 67735c3..56b9339 100644
--- a/gcr/gcr-prompt.h
+++ b/gcr/gcr-prompt.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/gcr/gcr-record.c b/gcr/gcr-record.c
index 157d255..c4549e0 100644
--- a/gcr/gcr-record.c
+++ b/gcr/gcr-record.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-record.h b/gcr/gcr-record.h
index 37201ce..755de10 100644
--- a/gcr/gcr-record.h
+++ b/gcr/gcr-record.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-secret-exchange.c b/gcr/gcr-secret-exchange.c
index c418575..360c329 100644
--- a/gcr/gcr-secret-exchange.c
+++ b/gcr/gcr-secret-exchange.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-secret-exchange.h b/gcr/gcr-secret-exchange.h
index aa95c0f..bf8a876 100644
--- a/gcr/gcr-secret-exchange.h
+++ b/gcr/gcr-secret-exchange.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-secure-memory.c b/gcr/gcr-secure-memory.c
index 7a1e99d..f1668e9 100644
--- a/gcr/gcr-secure-memory.c
+++ b/gcr/gcr-secure-memory.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw gnome org>
 */
diff --git a/gcr/gcr-secure-memory.h b/gcr/gcr-secure-memory.h
index eaf1a13..2d562fc 100644
--- a/gcr/gcr-secure-memory.h
+++ b/gcr/gcr-secure-memory.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw gnome org>
 */
diff --git a/gcr/gcr-simple-certificate.c b/gcr/gcr-simple-certificate.c
index fc30d40..4007639 100644
--- a/gcr/gcr-simple-certificate.c
+++ b/gcr/gcr-simple-certificate.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-simple-certificate.h b/gcr/gcr-simple-certificate.h
index a9491f9..9e6d2fc 100644
--- a/gcr/gcr-simple-certificate.h
+++ b/gcr/gcr-simple-certificate.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/gcr/gcr-simple-collection.c b/gcr/gcr-simple-collection.c
index f843a7c..def00f0 100644
--- a/gcr/gcr-simple-collection.c
+++ b/gcr/gcr-simple-collection.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-simple-collection.h b/gcr/gcr-simple-collection.h
index 151da2a..4799b62 100644
--- a/gcr/gcr-simple-collection.h
+++ b/gcr/gcr-simple-collection.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_SIMPLE_COLLECTION_H__
diff --git a/gcr/gcr-single-collection.c b/gcr/gcr-single-collection.c
index 942d47d..85a0ebb 100644
--- a/gcr/gcr-single-collection.c
+++ b/gcr/gcr-single-collection.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gcr/gcr-single-collection.h b/gcr/gcr-single-collection.h
index 328474e..a2392f5 100644
--- a/gcr/gcr-single-collection.h
+++ b/gcr/gcr-single-collection.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-subject-public-key.c b/gcr/gcr-subject-public-key.c
index 7896531..8ac4f59 100644
--- a/gcr/gcr-subject-public-key.c
+++ b/gcr/gcr-subject-public-key.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-subject-public-key.h b/gcr/gcr-subject-public-key.h
index bfee315..4a45bd0 100644
--- a/gcr/gcr-subject-public-key.h
+++ b/gcr/gcr-subject-public-key.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-system-prompt.c b/gcr/gcr-system-prompt.c
index e5d153f..a6d8f95 100644
--- a/gcr/gcr-system-prompt.c
+++ b/gcr/gcr-system-prompt.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/gcr/gcr-system-prompt.h b/gcr/gcr-system-prompt.h
index 275c0ea..4a6f9ef 100644
--- a/gcr/gcr-system-prompt.h
+++ b/gcr/gcr-system-prompt.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/gcr/gcr-system-prompter.c b/gcr/gcr-system-prompter.c
index ba16dcc..8727ca1 100644
--- a/gcr/gcr-system-prompter.c
+++ b/gcr/gcr-system-prompter.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/gcr/gcr-system-prompter.h b/gcr/gcr-system-prompter.h
index 189ab83..66fafd9 100644
--- a/gcr/gcr-system-prompter.h
+++ b/gcr/gcr-system-prompter.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/gcr/gcr-trust.c b/gcr/gcr-trust.c
index a77dc8f..bc96428 100644
--- a/gcr/gcr-trust.c
+++ b/gcr/gcr-trust.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-trust.h b/gcr/gcr-trust.h
index 078bd3b..379f363 100644
--- a/gcr/gcr-trust.h
+++ b/gcr/gcr-trust.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/gcr/gcr-types.h b/gcr/gcr-types.h
index 3c924df..f600454 100644
--- a/gcr/gcr-types.h
+++ b/gcr/gcr-types.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-union-collection.c b/gcr/gcr-union-collection.c
index ce7e465..13a416c 100644
--- a/gcr/gcr-union-collection.c
+++ b/gcr/gcr-union-collection.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-union-collection.h b/gcr/gcr-union-collection.h
index f558ba9..bae1a58 100644
--- a/gcr/gcr-union-collection.h
+++ b/gcr/gcr-union-collection.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-unlock-options.h b/gcr/gcr-unlock-options.h
index 953a2c4..f44f1bf 100644
--- a/gcr/gcr-unlock-options.h
+++ b/gcr/gcr-unlock-options.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_UNLOCK_OPTIONS_H__
diff --git a/gcr/gcr-util.c b/gcr/gcr-util.c
index e8345e6..7497ca2 100644
--- a/gcr/gcr-util.c
+++ b/gcr/gcr-util.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-util.h b/gcr/gcr-util.h
index a104a8e..a5358fc 100644
--- a/gcr/gcr-util.h
+++ b/gcr/gcr-util.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/gcr-version.h.in b/gcr/gcr-version.h.in
index 1a3e261..81a5b4a 100644
--- a/gcr/gcr-version.h.in
+++ b/gcr/gcr-version.h.in
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw gnome org>
  */
diff --git a/gcr/gcr.h b/gcr/gcr.h
index 490772c..966163a 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/tests/console-interaction.c b/gcr/tests/console-interaction.c
index c642798..bc3b7dc 100644
--- a/gcr/tests/console-interaction.c
+++ b/gcr/tests/console-interaction.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * 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.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/tests/console-interaction.h b/gcr/tests/console-interaction.h
index b767421..ffd0f0f 100644
--- a/gcr/tests/console-interaction.h
+++ b/gcr/tests/console-interaction.h
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * 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.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/tests/frob-certificate-request.c b/gcr/tests/frob-certificate-request.c
index ef6d456..6801b8c 100644
--- a/gcr/tests/frob-certificate-request.c
+++ b/gcr/tests/frob-certificate-request.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/tests/frob-openpgp.c b/gcr/tests/frob-openpgp.c
index cd54f72..433056b 100644
--- a/gcr/tests/frob-openpgp.c
+++ b/gcr/tests/frob-openpgp.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/tests/frob-parser.c b/gcr/tests/frob-parser.c
index fa1e3ae..6b311ab 100644
--- a/gcr/tests/frob-parser.c
+++ b/gcr/tests/frob-parser.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/gcr/tests/test-certificate-chain.c b/gcr/tests/test-certificate-chain.c
index 2fa42d9..45c929a 100644
--- a/gcr/tests/test-certificate-chain.c
+++ b/gcr/tests/test-certificate-chain.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-certificate.c b/gcr/tests/test-certificate.c
index a90bd1d..71f43ba 100644
--- a/gcr/tests/test-certificate.c
+++ b/gcr/tests/test-certificate.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-filter-collection.c b/gcr/tests/test-filter-collection.c
index 8520bff..3710ea8 100644
--- a/gcr/tests/test-filter-collection.c
+++ b/gcr/tests/test-filter-collection.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-fingerprint.c b/gcr/tests/test-fingerprint.c
index 589862c..4bbdfe3 100644
--- a/gcr/tests/test-fingerprint.c
+++ b/gcr/tests/test-fingerprint.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-gnupg-collection.c b/gcr/tests/test-gnupg-collection.c
index 55b518d..9a721ef 100644
--- a/gcr/tests/test-gnupg-collection.c
+++ b/gcr/tests/test-gnupg-collection.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-gnupg-key.c b/gcr/tests/test-gnupg-key.c
index 1bf4dfc..1d86907 100644
--- a/gcr/tests/test-gnupg-key.c
+++ b/gcr/tests/test-gnupg-key.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-gnupg-process.c b/gcr/tests/test-gnupg-process.c
index 76048ec..b7dcb12 100644
--- a/gcr/tests/test-gnupg-process.c
+++ b/gcr/tests/test-gnupg-process.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-memory-icon.c b/gcr/tests/test-memory-icon.c
index abcb265..39f1a0a 100644
--- a/gcr/tests/test-memory-icon.c
+++ b/gcr/tests/test-memory-icon.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-openpgp.c b/gcr/tests/test-openpgp.c
index 6c9d8fa..f33da5e 100644
--- a/gcr/tests/test-openpgp.c
+++ b/gcr/tests/test-openpgp.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-openssh.c b/gcr/tests/test-openssh.c
index c9e84a3..bde412a 100644
--- a/gcr/tests/test-openssh.c
+++ b/gcr/tests/test-openssh.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-parser.c b/gcr/tests/test-parser.c
index c387b85..a2e6aac 100644
--- a/gcr/tests/test-parser.c
+++ b/gcr/tests/test-parser.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/gcr/tests/test-pkcs11-certificate.c b/gcr/tests/test-pkcs11-certificate.c
index 16572a8..ad70542 100644
--- a/gcr/tests/test-pkcs11-certificate.c
+++ b/gcr/tests/test-pkcs11-certificate.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-record.c b/gcr/tests/test-record.c
index 79c0829..c560544 100644
--- a/gcr/tests/test-record.c
+++ b/gcr/tests/test-record.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-secret-exchange.c b/gcr/tests/test-secret-exchange.c
index dba396e..1b60742 100644
--- a/gcr/tests/test-secret-exchange.c
+++ b/gcr/tests/test-secret-exchange.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-secure-memory.c b/gcr/tests/test-secure-memory.c
index 12fa35a..812f213 100644
--- a/gcr/tests/test-secure-memory.c
+++ b/gcr/tests/test-secure-memory.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw gnome org>
 */
diff --git a/gcr/tests/test-simple-certificate.c b/gcr/tests/test-simple-certificate.c
index 3a0344e..48a509a 100644
--- a/gcr/tests/test-simple-certificate.c
+++ b/gcr/tests/test-simple-certificate.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-subject-public-key.c b/gcr/tests/test-subject-public-key.c
index 3a92f85..90ff36a 100644
--- a/gcr/tests/test-subject-public-key.c
+++ b/gcr/tests/test-subject-public-key.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-system-prompt.c b/gcr/tests/test-system-prompt.c
index 4f24d0d..b2d384c 100644
--- a/gcr/tests/test-system-prompt.c
+++ b/gcr/tests/test-system-prompt.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/gcr/tests/test-trust.c b/gcr/tests/test-trust.c
index e650e05..d24d011 100644
--- a/gcr/tests/test-trust.c
+++ b/gcr/tests/test-trust.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/gcr/tests/test-util.c b/gcr/tests/test-util.c
index 3e40e56..76bc948 100644
--- a/gcr/tests/test-util.c
+++ b/gcr/tests/test-util.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/ui/gcr-certificate-basics-widget.c b/ui/gcr-certificate-basics-widget.c
index b1bc3c6..6646134 100644
--- a/ui/gcr-certificate-basics-widget.c
+++ b/ui/gcr-certificate-basics-widget.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-certificate-basics-widget.h b/ui/gcr-certificate-basics-widget.h
index aaf91e2..66bd45b 100644
--- a/ui/gcr-certificate-basics-widget.h
+++ b/ui/gcr-certificate-basics-widget.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_CERTIFICATE_BASICS_WIDGET_H__
diff --git a/ui/gcr-certificate-details-widget.c b/ui/gcr-certificate-details-widget.c
index 1c164ac..79e215c 100644
--- a/ui/gcr-certificate-details-widget.c
+++ b/ui/gcr-certificate-details-widget.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-certificate-details-widget.h b/ui/gcr-certificate-details-widget.h
index b4ad638..27d6bb9 100644
--- a/ui/gcr-certificate-details-widget.h
+++ b/ui/gcr-certificate-details-widget.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_CERTIFICATE_DETAILS_WIDGET_H__
diff --git a/ui/gcr-certificate-exporter.c b/ui/gcr-certificate-exporter.c
index 41d455b..4b76815 100644
--- a/ui/gcr-certificate-exporter.c
+++ b/ui/gcr-certificate-exporter.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-certificate-exporter.h b/ui/gcr-certificate-exporter.h
index 2aab7c3..241bd95 100644
--- a/ui/gcr-certificate-exporter.h
+++ b/ui/gcr-certificate-exporter.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-certificate-renderer-private.h b/ui/gcr-certificate-renderer-private.h
index f7dadbf..53f3bda 100644
--- a/ui/gcr-certificate-renderer-private.h
+++ b/ui/gcr-certificate-renderer-private.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/ui/gcr-certificate-renderer.c b/ui/gcr-certificate-renderer.c
index 8233ca7..cea0f0e 100644
--- a/ui/gcr-certificate-renderer.c
+++ b/ui/gcr-certificate-renderer.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-certificate-renderer.h b/ui/gcr-certificate-renderer.h
index 1161166..3986124 100644
--- a/ui/gcr-certificate-renderer.h
+++ b/ui/gcr-certificate-renderer.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/ui/gcr-certificate-request-renderer.c b/ui/gcr-certificate-request-renderer.c
index 5d72da1..06aca3b 100644
--- a/ui/gcr-certificate-request-renderer.c
+++ b/ui/gcr-certificate-request-renderer.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-certificate-request-renderer.h b/ui/gcr-certificate-request-renderer.h
index 1292c63..e5ea514 100644
--- a/ui/gcr-certificate-request-renderer.h
+++ b/ui/gcr-certificate-request-renderer.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/ui/gcr-certificate-widget.c b/ui/gcr-certificate-widget.c
index 8f67eb6..aff1059 100644
--- a/ui/gcr-certificate-widget.c
+++ b/ui/gcr-certificate-widget.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-certificate-widget.h b/ui/gcr-certificate-widget.h
index 6e2ccf1..b967444 100644
--- a/ui/gcr-certificate-widget.h
+++ b/ui/gcr-certificate-widget.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/ui/gcr-collection-model.c b/ui/gcr-collection-model.c
index 91002f9..6e8db6c 100644
--- a/ui/gcr-collection-model.c
+++ b/ui/gcr-collection-model.c
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-collection-model.h b/ui/gcr-collection-model.h
index bc45db0..4241d3a 100644
--- a/ui/gcr-collection-model.h
+++ b/ui/gcr-collection-model.h
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-combo-selector.c b/ui/gcr-combo-selector.c
index 30a53ff..d225491 100644
--- a/ui/gcr-combo-selector.c
+++ b/ui/gcr-combo-selector.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-combo-selector.h b/ui/gcr-combo-selector.h
index 9723e61..d1b91d0 100644
--- a/ui/gcr-combo-selector.h
+++ b/ui/gcr-combo-selector.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_COMBO_SELECTOR_H__
diff --git a/ui/gcr-deprecated.h b/ui/gcr-deprecated.h
index f92b79d..39cf50c 100644
--- a/ui/gcr-deprecated.h
+++ b/ui/gcr-deprecated.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-dialog-util.c b/ui/gcr-dialog-util.c
index c142c35..b37aa63 100644
--- a/ui/gcr-dialog-util.c
+++ b/ui/gcr-dialog-util.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-dialog-util.h b/ui/gcr-dialog-util.h
index 4be48fd..b40b14c 100644
--- a/ui/gcr-dialog-util.h
+++ b/ui/gcr-dialog-util.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-display-scrolled.c b/ui/gcr-display-scrolled.c
index 49d2dd9..e4e63e1 100644
--- a/ui/gcr-display-scrolled.c
+++ b/ui/gcr-display-scrolled.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-display-scrolled.h b/ui/gcr-display-scrolled.h
index 8c4a4ae..9bf9fc1 100644
--- a/ui/gcr-display-scrolled.h
+++ b/ui/gcr-display-scrolled.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-display-view.c b/ui/gcr-display-view.c
index 39b1a93..140585a 100644
--- a/ui/gcr-display-view.c
+++ b/ui/gcr-display-view.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-display-view.h b/ui/gcr-display-view.h
index ac13150..415bff5 100644
--- a/ui/gcr-display-view.h
+++ b/ui/gcr-display-view.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_DISPLAY_VIEW_H__
diff --git a/ui/gcr-failure-renderer.c b/ui/gcr-failure-renderer.c
index baf6800..3ce049d 100644
--- a/ui/gcr-failure-renderer.c
+++ b/ui/gcr-failure-renderer.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-failure-renderer.h b/ui/gcr-failure-renderer.h
index 9b70f36..a7972d2 100644
--- a/ui/gcr-failure-renderer.h
+++ b/ui/gcr-failure-renderer.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-gnupg-renderer.c b/ui/gcr-gnupg-renderer.c
index 311691c..31559b1 100644
--- a/ui/gcr-gnupg-renderer.c
+++ b/ui/gcr-gnupg-renderer.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-gnupg-renderer.h b/ui/gcr-gnupg-renderer.h
index 3b75f86..f009a58 100644
--- a/ui/gcr-gnupg-renderer.h
+++ b/ui/gcr-gnupg-renderer.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-import-button.c b/ui/gcr-import-button.c
index f218f9f..7ac15be 100644
--- a/ui/gcr-import-button.c
+++ b/ui/gcr-import-button.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-import-button.h b/ui/gcr-import-button.h
index 2b116b6..01743e2 100644
--- a/ui/gcr-import-button.h
+++ b/ui/gcr-import-button.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-key-renderer.c b/ui/gcr-key-renderer.c
index ea854e9..a4dbdb9 100644
--- a/ui/gcr-key-renderer.c
+++ b/ui/gcr-key-renderer.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-key-renderer.h b/ui/gcr-key-renderer.h
index 70f129e..0ff592f 100644
--- a/ui/gcr-key-renderer.h
+++ b/ui/gcr-key-renderer.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/ui/gcr-key-widget.c b/ui/gcr-key-widget.c
index 65b5791..5f25501 100644
--- a/ui/gcr-key-widget.c
+++ b/ui/gcr-key-widget.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-key-widget.h b/ui/gcr-key-widget.h
index d7d9eb5..9384c08 100644
--- a/ui/gcr-key-widget.h
+++ b/ui/gcr-key-widget.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/ui/gcr-list-selector-private.h b/ui/gcr-list-selector-private.h
index 2668598..b1c4739 100644
--- a/ui/gcr-list-selector-private.h
+++ b/ui/gcr-list-selector-private.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-list-selector.c b/ui/gcr-list-selector.c
index 326e91b..c924e27 100644
--- a/ui/gcr-list-selector.c
+++ b/ui/gcr-list-selector.c
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-list-selector.h b/ui/gcr-list-selector.h
index 42ab5a9..d6454d9 100644
--- a/ui/gcr-list-selector.h
+++ b/ui/gcr-list-selector.h
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-pkcs11-import-dialog.c b/ui/gcr-pkcs11-import-dialog.c
index fbb5b3b..0157f0a 100644
--- a/ui/gcr-pkcs11-import-dialog.c
+++ b/ui/gcr-pkcs11-import-dialog.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-pkcs11-import-dialog.h b/ui/gcr-pkcs11-import-dialog.h
index f970c7c..07a0205 100644
--- a/ui/gcr-pkcs11-import-dialog.h
+++ b/ui/gcr-pkcs11-import-dialog.h
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-pkcs11-import-interaction.c b/ui/gcr-pkcs11-import-interaction.c
index 867dca6..52e9fe3 100644
--- a/ui/gcr-pkcs11-import-interaction.c
+++ b/ui/gcr-pkcs11-import-interaction.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-pkcs11-import-interaction.h b/ui/gcr-pkcs11-import-interaction.h
index 1ddc30f..041aaf5 100644
--- a/ui/gcr-pkcs11-import-interaction.h
+++ b/ui/gcr-pkcs11-import-interaction.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-prompt-dialog.c b/ui/gcr-prompt-dialog.c
index c8327bd..839d701 100644
--- a/ui/gcr-prompt-dialog.c
+++ b/ui/gcr-prompt-dialog.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/ui/gcr-prompt-dialog.h b/ui/gcr-prompt-dialog.h
index 306fab3..6181fa0 100644
--- a/ui/gcr-prompt-dialog.h
+++ b/ui/gcr-prompt-dialog.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stef thewalter net>
  */
diff --git a/ui/gcr-prompter-tool.c b/ui/gcr-prompter-tool.c
index dde4bdc..0ddd4a5 100644
--- a/ui/gcr-prompter-tool.c
+++ b/ui/gcr-prompter-tool.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/ui/gcr-renderer.c b/ui/gcr-renderer.c
index e66ed89..cba7492 100644
--- a/ui/gcr-renderer.c
+++ b/ui/gcr-renderer.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-renderer.h b/ui/gcr-renderer.h
index 8b6dc97..1b81469 100644
--- a/ui/gcr-renderer.h
+++ b/ui/gcr-renderer.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_RENDERER_H__
diff --git a/ui/gcr-secure-entry-buffer.c b/ui/gcr-secure-entry-buffer.c
index 77c9cd4..1d148d6 100644
--- a/ui/gcr-secure-entry-buffer.c
+++ b/ui/gcr-secure-entry-buffer.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/ui/gcr-secure-entry-buffer.h b/ui/gcr-secure-entry-buffer.h
index aa83da1..24399f4 100644
--- a/ui/gcr-secure-entry-buffer.h
+++ b/ui/gcr-secure-entry-buffer.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stef memberwebs com>
 */
diff --git a/ui/gcr-tree-selector.c b/ui/gcr-tree-selector.c
index b5324bb..78568b8 100644
--- a/ui/gcr-tree-selector.c
+++ b/ui/gcr-tree-selector.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-tree-selector.h b/ui/gcr-tree-selector.h
index 9e68e98..3355ca2 100644
--- a/ui/gcr-tree-selector.h
+++ b/ui/gcr-tree-selector.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_TREE_SELECTOR_H__
diff --git a/ui/gcr-ui.h b/ui/gcr-ui.h
index 23e9fd3..193398a 100644
--- a/ui/gcr-ui.h
+++ b/ui/gcr-ui.h
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-unlock-options-widget.c b/ui/gcr-unlock-options-widget.c
index 529b72a..c6b025d 100644
--- a/ui/gcr-unlock-options-widget.c
+++ b/ui/gcr-unlock-options-widget.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-unlock-options-widget.h b/ui/gcr-unlock-options-widget.h
index d3a17cc..3052f13 100644
--- a/ui/gcr-unlock-options-widget.h
+++ b/ui/gcr-unlock-options-widget.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #if !defined (__GCR_INSIDE_HEADER__) && !defined (GCR_COMPILATION)
diff --git a/ui/gcr-unlock-renderer.c b/ui/gcr-unlock-renderer.c
index 828b4ab..08b5ac5 100644
--- a/ui/gcr-unlock-renderer.c
+++ b/ui/gcr-unlock-renderer.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-unlock-renderer.h b/ui/gcr-unlock-renderer.h
index 57beb3c..02b1064 100644
--- a/ui/gcr-unlock-renderer.h
+++ b/ui/gcr-unlock-renderer.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/gcr-viewer-tool.c b/ui/gcr-viewer-tool.c
index ad4368c..37661a0 100644
--- a/ui/gcr-viewer-tool.c
+++ b/ui/gcr-viewer-tool.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/ui/gcr-viewer-widget.c b/ui/gcr-viewer-widget.c
index d83afce..f2c6e71 100644
--- a/ui/gcr-viewer-widget.c
+++ b/ui/gcr-viewer-widget.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/ui/gcr-viewer-widget.h b/ui/gcr-viewer-widget.h
index a9363df..72237c2 100644
--- a/ui/gcr-viewer-widget.h
+++ b/ui/gcr-viewer-widget.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/ui/gcr-viewer-window.c b/ui/gcr-viewer-window.c
index 5e09fb2..b9dd413 100644
--- a/ui/gcr-viewer-window.c
+++ b/ui/gcr-viewer-window.c
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/ui/gcr-viewer-window.h b/ui/gcr-viewer-window.h
index 3cabb54..b64a8b3 100644
--- a/ui/gcr-viewer-window.h
+++ b/ui/gcr-viewer-window.h
@@ -15,8 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome 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.
+   see <http://www.gnu.org/licenses/>.
 
    Author: Stef Walter <stefw collabora co uk>
 */
diff --git a/ui/gcr-viewer.c b/ui/gcr-viewer.c
index 9cc2cec..4f6b28f 100644
--- a/ui/gcr-viewer.c
+++ b/ui/gcr-viewer.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/ui/gcr-viewer.h b/ui/gcr-viewer.h
index 6b6c9f3..fe8df50 100644
--- a/ui/gcr-viewer.h
+++ b/ui/gcr-viewer.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GCR_VIEWER_H__
diff --git a/ui/tests/frob-certificate.c b/ui/tests/frob-certificate.c
index 794abea..df4495b 100644
--- a/ui/tests/frob-certificate.c
+++ b/ui/tests/frob-certificate.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/tests/frob-gnupg-selector.c b/ui/tests/frob-gnupg-selector.c
index 8e5b9f9..41b1977 100644
--- a/ui/tests/frob-gnupg-selector.c
+++ b/ui/tests/frob-gnupg-selector.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/tests/frob-import-button.c b/ui/tests/frob-import-button.c
index 75102c8..d3ca560 100644
--- a/ui/tests/frob-import-button.c
+++ b/ui/tests/frob-import-button.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw redhat com>
  */
diff --git a/ui/tests/frob-key.c b/ui/tests/frob-key.c
index d67a51e..7b62f11 100644
--- a/ui/tests/frob-key.c
+++ b/ui/tests/frob-key.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/tests/frob-prompt.c b/ui/tests/frob-prompt.c
index 2e9421d..20462f6 100644
--- a/ui/tests/frob-prompt.c
+++ b/ui/tests/frob-prompt.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/tests/frob-request.c b/ui/tests/frob-request.c
index af0233e..c4b8d53 100644
--- a/ui/tests/frob-request.c
+++ b/ui/tests/frob-request.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/tests/frob-system-prompt.c b/ui/tests/frob-system-prompt.c
index 21f1829..e08114f 100644
--- a/ui/tests/frob-system-prompt.c
+++ b/ui/tests/frob-system-prompt.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/tests/frob-unlock-options.c b/ui/tests/frob-unlock-options.c
index fdcf116..b9e5b09 100644
--- a/ui/tests/frob-unlock-options.c
+++ b/ui/tests/frob-unlock-options.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/ui/tests/frob-unlock.c b/ui/tests/frob-unlock.c
index dab7eb8..567b0b2 100644
--- a/ui/tests/frob-unlock.c
+++ b/ui/tests/frob-unlock.c
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]