[glib] Updated FSF's address



commit 078dbda148a81af1b3a76fbda72f089b963087f1
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Thu Jan 23 12:58:29 2014 +0100

    Updated FSF's address

 gio/data-to-c.pl                          |    4 +---
 gio/fam/fam-helper.c                      |    4 +---
 gio/fam/fam-helper.h                      |    4 +---
 gio/fam/fam-module.c                      |    4 +---
 gio/fam/gfamdirectorymonitor.c            |    4 +---
 gio/fam/gfamdirectorymonitor.h            |    4 +---
 gio/fam/gfamfilemonitor.c                 |    4 +---
 gio/fam/gfamfilemonitor.h                 |    4 +---
 gio/fen/fen-dump.c                        |    4 +---
 gio/fen/fen-dump.h                        |    4 +---
 gio/fen/fen-helper.c                      |    4 +---
 gio/fen/fen-helper.h                      |    4 +---
 gio/fen/fen-kernel.c                      |    4 +---
 gio/fen/fen-kernel.h                      |    4 +---
 gio/fen/fen-node.c                        |    4 +---
 gio/fen/fen-node.h                        |    4 +---
 gio/fen/gfendirectorymonitor.c            |    4 +---
 gio/fen/gfendirectorymonitor.h            |    4 +---
 gio/fen/gfenfilemonitor.c                 |    4 +---
 gio/fen/gfenfilemonitor.h                 |    4 +---
 gio/gaction.c                             |    4 +---
 gio/gaction.h                             |    4 +---
 gio/gactiongroup.c                        |    4 +---
 gio/gactiongroup.h                        |    4 +---
 gio/gactiongroupexporter.c                |    4 +---
 gio/gactiongroupexporter.h                |    4 +---
 gio/gactionmap.c                          |    4 +---
 gio/gactionmap.h                          |    4 +---
 gio/gappinfo.c                            |    4 +---
 gio/gappinfo.h                            |    4 +---
 gio/gappinfoprivate.h                     |    4 +---
 gio/gapplication-tool.c                   |    4 +---
 gio/gapplication.c                        |    4 +---
 gio/gapplication.h                        |    4 +---
 gio/gapplicationcommandline.c             |    4 +---
 gio/gapplicationcommandline.h             |    4 +---
 gio/gapplicationimpl-dbus.c               |    4 +---
 gio/gasynchelper.c                        |    4 +---
 gio/gasynchelper.h                        |    4 +---
 gio/gasyncinitable.c                      |    4 +---
 gio/gasyncinitable.h                      |    4 +---
 gio/gasyncresult.c                        |    4 +---
 gio/gasyncresult.h                        |    4 +---
 gio/gbufferedinputstream.c                |    4 +---
 gio/gbufferedinputstream.h                |    4 +---
 gio/gbufferedoutputstream.c               |    4 +---
 gio/gbufferedoutputstream.h               |    4 +---
 gio/gbytesicon.c                          |    4 +---
 gio/gbytesicon.h                          |    4 +---
 gio/gcancellable.c                        |    4 +---
 gio/gcancellable.h                        |    4 +---
 gio/gcharsetconverter.c                   |    4 +---
 gio/gcharsetconverter.h                   |    4 +---
 gio/gcontenttype-win32.c                  |    4 +---
 gio/gcontenttype.c                        |    4 +---
 gio/gcontenttype.h                        |    4 +---
 gio/gcontenttypeprivate.h                 |    4 +---
 gio/gconverter.c                          |    4 +---
 gio/gconverter.h                          |    4 +---
 gio/gconverterinputstream.c               |    4 +---
 gio/gconverterinputstream.h               |    4 +---
 gio/gconverteroutputstream.c              |    4 +---
 gio/gconverteroutputstream.h              |    4 +---
 gio/gcredentials.c                        |    4 +---
 gio/gcredentials.h                        |    4 +---
 gio/gcredentialsprivate.h                 |    4 +---
 gio/gdatainputstream.c                    |    4 +---
 gio/gdatainputstream.h                    |    4 +---
 gio/gdataoutputstream.c                   |    4 +---
 gio/gdataoutputstream.h                   |    4 +---
 gio/gdbus-2.0/codegen/__init__.py         |    4 +---
 gio/gdbus-2.0/codegen/codegen.py          |    4 +---
 gio/gdbus-2.0/codegen/codegen_docbook.py  |    4 +---
 gio/gdbus-2.0/codegen/codegen_main.py     |    4 +---
 gio/gdbus-2.0/codegen/config.py.in        |    4 +---
 gio/gdbus-2.0/codegen/dbustypes.py        |    4 +---
 gio/gdbus-2.0/codegen/gdbus-codegen.in    |    4 +---
 gio/gdbus-2.0/codegen/parser.py           |    4 +---
 gio/gdbus-2.0/codegen/utils.py            |    4 +---
 gio/gdbus-tool.c                          |    4 +---
 gio/gdbusactiongroup-private.h            |    4 +---
 gio/gdbusactiongroup.c                    |    4 +---
 gio/gdbusactiongroup.h                    |    4 +---
 gio/gdbusaddress.c                        |    4 +---
 gio/gdbusaddress.h                        |    4 +---
 gio/gdbusauth.c                           |    4 +---
 gio/gdbusauth.h                           |    4 +---
 gio/gdbusauthmechanism.c                  |    4 +---
 gio/gdbusauthmechanism.h                  |    4 +---
 gio/gdbusauthmechanismanon.c              |    4 +---
 gio/gdbusauthmechanismanon.h              |    4 +---
 gio/gdbusauthmechanismexternal.c          |    4 +---
 gio/gdbusauthmechanismexternal.h          |    4 +---
 gio/gdbusauthmechanismsha1.c              |    4 +---
 gio/gdbusauthmechanismsha1.h              |    4 +---
 gio/gdbusauthobserver.c                   |    4 +---
 gio/gdbusauthobserver.h                   |    4 +---
 gio/gdbusconnection.c                     |    4 +---
 gio/gdbusconnection.h                     |    4 +---
 gio/gdbuserror.c                          |    4 +---
 gio/gdbuserror.h                          |    4 +---
 gio/gdbusinterface.c                      |    4 +---
 gio/gdbusinterface.h                      |    4 +---
 gio/gdbusinterfaceskeleton.c              |    4 +---
 gio/gdbusinterfaceskeleton.h              |    4 +---
 gio/gdbusintrospection.c                  |    4 +---
 gio/gdbusintrospection.h                  |    4 +---
 gio/gdbusmenumodel.c                      |    4 +---
 gio/gdbusmenumodel.h                      |    4 +---
 gio/gdbusmessage.c                        |    4 +---
 gio/gdbusmessage.h                        |    4 +---
 gio/gdbusmethodinvocation.c               |    4 +---
 gio/gdbusmethodinvocation.h               |    4 +---
 gio/gdbusnameowning.c                     |    4 +---
 gio/gdbusnameowning.h                     |    4 +---
 gio/gdbusnamewatching.c                   |    4 +---
 gio/gdbusnamewatching.h                   |    4 +---
 gio/gdbusobject.c                         |    4 +---
 gio/gdbusobject.h                         |    4 +---
 gio/gdbusobjectmanager.c                  |    4 +---
 gio/gdbusobjectmanager.h                  |    4 +---
 gio/gdbusobjectmanagerclient.c            |    4 +---
 gio/gdbusobjectmanagerclient.h            |    4 +---
 gio/gdbusobjectmanagerserver.c            |    4 +---
 gio/gdbusobjectmanagerserver.h            |    4 +---
 gio/gdbusobjectproxy.c                    |    4 +---
 gio/gdbusobjectproxy.h                    |    4 +---
 gio/gdbusobjectskeleton.c                 |    4 +---
 gio/gdbusobjectskeleton.h                 |    4 +---
 gio/gdbusprivate.c                        |    4 +---
 gio/gdbusprivate.h                        |    4 +---
 gio/gdbusproxy.c                          |    4 +---
 gio/gdbusproxy.h                          |    4 +---
 gio/gdbusserver.c                         |    4 +---
 gio/gdbusserver.h                         |    4 +---
 gio/gdbusutils.c                          |    4 +---
 gio/gdbusutils.h                          |    4 +---
 gio/gdelayedsettingsbackend.c             |    4 +---
 gio/gdelayedsettingsbackend.h             |    4 +---
 gio/gdesktopappinfo.c                     |    4 +---
 gio/gdesktopappinfo.h                     |    4 +---
 gio/gdrive.c                              |    4 +---
 gio/gdrive.h                              |    4 +---
 gio/gdummyfile.c                          |    4 +---
 gio/gdummyfile.h                          |    4 +---
 gio/gdummyproxyresolver.c                 |    4 +---
 gio/gdummyproxyresolver.h                 |    4 +---
 gio/gdummytlsbackend.c                    |    4 +---
 gio/gdummytlsbackend.h                    |    4 +---
 gio/gemblem.c                             |    4 +---
 gio/gemblem.h                             |    4 +---
 gio/gemblemedicon.c                       |    4 +---
 gio/gemblemedicon.h                       |    4 +---
 gio/gfdonotificationbackend.c             |    4 +---
 gio/gfile.c                               |    4 +---
 gio/gfile.h                               |    4 +---
 gio/gfileattribute-priv.h                 |    4 +---
 gio/gfileattribute.c                      |    4 +---
 gio/gfileattribute.h                      |    4 +---
 gio/gfiledescriptorbased.c                |    4 +---
 gio/gfiledescriptorbased.h                |    4 +---
 gio/gfileenumerator.c                     |    4 +---
 gio/gfileenumerator.h                     |    4 +---
 gio/gfileicon.c                           |    4 +---
 gio/gfileicon.h                           |    4 +---
 gio/gfileinfo-priv.h                      |    4 +---
 gio/gfileinfo.c                           |    4 +---
 gio/gfileinfo.h                           |    4 +---
 gio/gfileinputstream.c                    |    4 +---
 gio/gfileinputstream.h                    |    4 +---
 gio/gfileiostream.c                       |    4 +---
 gio/gfileiostream.h                       |    4 +---
 gio/gfilemonitor.c                        |    4 +---
 gio/gfilemonitor.h                        |    4 +---
 gio/gfilenamecompleter.c                  |    4 +---
 gio/gfilenamecompleter.h                  |    4 +---
 gio/gfileoutputstream.c                   |    4 +---
 gio/gfileoutputstream.h                   |    4 +---
 gio/gfilterinputstream.c                  |    4 +---
 gio/gfilterinputstream.h                  |    4 +---
 gio/gfilteroutputstream.c                 |    4 +---
 gio/gfilteroutputstream.h                 |    4 +---
 gio/ggtknotificationbackend.c             |    4 +---
 gio/gicon.c                               |    4 +---
 gio/gicon.h                               |    4 +---
 gio/ginetaddress.c                        |    4 +---
 gio/ginetaddress.h                        |    4 +---
 gio/ginetaddressmask.c                    |    4 +---
 gio/ginetaddressmask.h                    |    4 +---
 gio/ginetsocketaddress.c                  |    4 +---
 gio/ginetsocketaddress.h                  |    4 +---
 gio/ginitable.c                           |    4 +---
 gio/ginitable.h                           |    4 +---
 gio/ginputstream.c                        |    4 +---
 gio/ginputstream.h                        |    4 +---
 gio/gio-querymodules.c                    |    4 +---
 gio/gio.h                                 |    4 +---
 gio/gioenums.h                            |    4 +---
 gio/gioerror.c                            |    4 +---
 gio/gioerror.h                            |    4 +---
 gio/giomodule-priv.h                      |    4 +---
 gio/giomodule.c                           |    4 +---
 gio/giomodule.h                           |    4 +---
 gio/gioprivate.h                          |    4 +---
 gio/gioscheduler.c                        |    4 +---
 gio/gioscheduler.h                        |    4 +---
 gio/giostream.c                           |    4 +---
 gio/giotypes.h                            |    4 +---
 gio/giowin32-priv.h                       |    4 +---
 gio/gkeyfilesettingsbackend.c             |    4 +---
 gio/glib-compile-resources.c              |    4 +---
 gio/glib-compile-schemas.c                |    4 +---
 gio/gloadableicon.c                       |    4 +---
 gio/gloadableicon.h                       |    4 +---
 gio/glocaldirectorymonitor.c              |    4 +---
 gio/glocaldirectorymonitor.h              |    4 +---
 gio/glocalfile.c                          |    4 +---
 gio/glocalfile.h                          |    4 +---
 gio/glocalfileenumerator.c                |    4 +---
 gio/glocalfileenumerator.h                |    4 +---
 gio/glocalfileinfo.c                      |    4 +---
 gio/glocalfileinfo.h                      |    4 +---
 gio/glocalfileinputstream.c               |    4 +---
 gio/glocalfileinputstream.h               |    4 +---
 gio/glocalfileiostream.c                  |    4 +---
 gio/glocalfileiostream.h                  |    4 +---
 gio/glocalfilemonitor.c                   |    4 +---
 gio/glocalfilemonitor.h                   |    4 +---
 gio/glocalfileoutputstream.c              |    4 +---
 gio/glocalfileoutputstream.h              |    4 +---
 gio/glocalvfs.c                           |    4 +---
 gio/glocalvfs.h                           |    4 +---
 gio/gmemoryinputstream.c                  |    4 +---
 gio/gmemoryinputstream.h                  |    4 +---
 gio/gmemoryoutputstream.c                 |    4 +---
 gio/gmemoryoutputstream.h                 |    4 +---
 gio/gmemorysettingsbackend.c              |    4 +---
 gio/gmenu.c                               |    4 +---
 gio/gmenu.h                               |    4 +---
 gio/gmenuexporter.c                       |    4 +---
 gio/gmenuexporter.h                       |    4 +---
 gio/gmenumodel.c                          |    4 +---
 gio/gmenumodel.h                          |    4 +---
 gio/gmount.c                              |    4 +---
 gio/gmount.h                              |    4 +---
 gio/gmountoperation.c                     |    4 +---
 gio/gmountoperation.h                     |    4 +---
 gio/gmountprivate.h                       |    4 +---
 gio/gnativevolumemonitor.c                |    4 +---
 gio/gnativevolumemonitor.h                |    4 +---
 gio/gnetworkaddress.c                     |    4 +---
 gio/gnetworkaddress.h                     |    4 +---
 gio/gnetworking.c                         |    4 +---
 gio/gnetworking.h.in                      |    4 +---
 gio/gnetworking.h.win32                   |    4 +---
 gio/gnetworkingprivate.h                  |    4 +---
 gio/gnetworkmonitor.c                     |    4 +---
 gio/gnetworkmonitor.h                     |    4 +---
 gio/gnetworkmonitorbase.c                 |    4 +---
 gio/gnetworkmonitorbase.h                 |    4 +---
 gio/gnetworkmonitornetlink.c              |    4 +---
 gio/gnetworkmonitornetlink.h              |    4 +---
 gio/gnetworkservice.c                     |    4 +---
 gio/gnetworkservice.h                     |    4 +---
 gio/gnextstepsettingsbackend.c            |    4 +---
 gio/gnotification-private.h               |    4 +---
 gio/gnotification.c                       |    4 +---
 gio/gnotification.h                       |    4 +---
 gio/gnotificationbackend.c                |    4 +---
 gio/gnotificationbackend.h                |    4 +---
 gio/gnullsettingsbackend.c                |    4 +---
 gio/goutputstream.c                       |    4 +---
 gio/goutputstream.h                       |    4 +---
 gio/gpermission.c                         |    4 +---
 gio/gpermission.h                         |    4 +---
 gio/gpollableinputstream.c                |    4 +---
 gio/gpollableinputstream.h                |    4 +---
 gio/gpollableoutputstream.c               |    4 +---
 gio/gpollableoutputstream.h               |    4 +---
 gio/gpollableutils.c                      |    4 +---
 gio/gpollableutils.h                      |    4 +---
 gio/gpollfilemonitor.c                    |    4 +---
 gio/gpollfilemonitor.h                    |    4 +---
 gio/gpropertyaction.c                     |    4 +---
 gio/gpropertyaction.h                     |    4 +---
 gio/gproxy.c                              |    4 +---
 gio/gproxy.h                              |    4 +---
 gio/gproxyaddress.c                       |    4 +---
 gio/gproxyaddress.h                       |    4 +---
 gio/gproxyaddressenumerator.c             |    4 +---
 gio/gproxyaddressenumerator.h             |    4 +---
 gio/gproxyresolver.c                      |    4 +---
 gio/gproxyresolver.h                      |    4 +---
 gio/gregistrysettingsbackend.c            |    4 +---
 gio/gregistrysettingsbackend.h            |    4 +---
 gio/gremoteactiongroup.c                  |    4 +---
 gio/gremoteactiongroup.h                  |    4 +---
 gio/gresolver.c                           |    4 +---
 gio/gresolver.h                           |    4 +---
 gio/gresource-tool.c                      |    4 +---
 gio/gresource.c                           |    4 +---
 gio/gresource.h                           |    4 +---
 gio/gresourcefile.c                       |    4 +---
 gio/gresourcefile.h                       |    4 +---
 gio/gseekable.c                           |    4 +---
 gio/gseekable.h                           |    4 +---
 gio/gsettings-mapping.c                   |    4 +---
 gio/gsettings-mapping.h                   |    4 +---
 gio/gsettings-tool.c                      |    4 +---
 gio/gsettings.c                           |    4 +---
 gio/gsettings.h                           |    4 +---
 gio/gsettingsbackend.c                    |    4 +---
 gio/gsettingsbackend.h                    |    4 +---
 gio/gsettingsbackendinternal.h            |    4 +---
 gio/gsettingsschema-internal.h            |    4 +---
 gio/gsettingsschema.c                     |    4 +---
 gio/gsettingsschema.h                     |    4 +---
 gio/gsimpleaction.c                       |    4 +---
 gio/gsimpleaction.h                       |    4 +---
 gio/gsimpleactiongroup.c                  |    4 +---
 gio/gsimpleactiongroup.h                  |    4 +---
 gio/gsimpleasyncresult.c                  |    4 +---
 gio/gsimpleasyncresult.h                  |    4 +---
 gio/gsimplepermission.c                   |    4 +---
 gio/gsimplepermission.h                   |    4 +---
 gio/gsimpleproxyresolver.h                |    4 +---
 gio/gsocket.c                             |    4 +---
 gio/gsocket.h                             |    4 +---
 gio/gsocketaddress.c                      |    4 +---
 gio/gsocketaddress.h                      |    4 +---
 gio/gsocketaddressenumerator.c            |    4 +---
 gio/gsocketaddressenumerator.h            |    4 +---
 gio/gsocketclient.c                       |    4 +---
 gio/gsocketclient.h                       |    4 +---
 gio/gsocketconnectable.c                  |    4 +---
 gio/gsocketconnectable.h                  |    4 +---
 gio/gsocketconnection.c                   |    4 +---
 gio/gsocketconnection.h                   |    4 +---
 gio/gsocketcontrolmessage.h               |    4 +---
 gio/gsocketinputstream.c                  |    4 +---
 gio/gsocketlistener.c                     |    4 +---
 gio/gsocketlistener.h                     |    4 +---
 gio/gsocketoutputstream.c                 |    4 +---
 gio/gsocketservice.c                      |    4 +---
 gio/gsocketservice.h                      |    4 +---
 gio/gsocks4aproxy.c                       |    4 +---
 gio/gsocks4aproxy.h                       |    4 +---
 gio/gsocks4proxy.c                        |    4 +---
 gio/gsocks4proxy.h                        |    4 +---
 gio/gsocks5proxy.c                        |    4 +---
 gio/gsocks5proxy.h                        |    4 +---
 gio/gsrvtarget.c                          |    4 +---
 gio/gsrvtarget.h                          |    4 +---
 gio/gsubprocess.h                         |    4 +---
 gio/gsubprocesslauncher-private.h         |    4 +---
 gio/gsubprocesslauncher.h                 |    4 +---
 gio/gtask.c                               |    4 +---
 gio/gtask.h                               |    4 +---
 gio/gtcpconnection.h                      |    4 +---
 gio/gtcpwrapperconnection.c               |    4 +---
 gio/gtcpwrapperconnection.h               |    4 +---
 gio/gtestdbus.c                           |    4 +---
 gio/gtestdbus.h                           |    4 +---
 gio/gthemedicon.c                         |    4 +---
 gio/gthemedicon.h                         |    4 +---
 gio/gthreadedresolver.c                   |    4 +---
 gio/gthreadedresolver.h                   |    4 +---
 gio/gthreadedsocketservice.c              |    4 +---
 gio/gthreadedsocketservice.h              |    4 +---
 gio/gtlsbackend.c                         |    4 +---
 gio/gtlsbackend.h                         |    4 +---
 gio/gtlscertificate.c                     |    4 +---
 gio/gtlscertificate.h                     |    4 +---
 gio/gtlsclientconnection.c                |    4 +---
 gio/gtlsclientconnection.h                |    4 +---
 gio/gtlsconnection.c                      |    4 +---
 gio/gtlsconnection.h                      |    4 +---
 gio/gtlsdatabase.c                        |    4 +---
 gio/gtlsdatabase.h                        |    4 +---
 gio/gtlsfiledatabase.c                    |    4 +---
 gio/gtlsinteraction.c                     |    4 +---
 gio/gtlsinteraction.h                     |    4 +---
 gio/gtlspassword.c                        |    4 +---
 gio/gtlspassword.h                        |    4 +---
 gio/gtlsserverconnection.c                |    4 +---
 gio/gtlsserverconnection.h                |    4 +---
 gio/gunionvolumemonitor.c                 |    4 +---
 gio/gunionvolumemonitor.h                 |    4 +---
 gio/gunixconnection.h                     |    4 +---
 gio/gunixcredentialsmessage.h             |    4 +---
 gio/gunixfdlist.h                         |    4 +---
 gio/gunixfdmessage.h                      |    4 +---
 gio/gunixinputstream.c                    |    4 +---
 gio/gunixinputstream.h                    |    4 +---
 gio/gunixmount.c                          |    4 +---
 gio/gunixmount.h                          |    4 +---
 gio/gunixmounts.c                         |    4 +---
 gio/gunixmounts.h                         |    4 +---
 gio/gunixoutputstream.c                   |    4 +---
 gio/gunixoutputstream.h                   |    4 +---
 gio/gunixsocketaddress.c                  |    4 +---
 gio/gunixsocketaddress.h                  |    4 +---
 gio/gunixvolume.c                         |    4 +---
 gio/gunixvolume.h                         |    4 +---
 gio/gunixvolumemonitor.c                  |    4 +---
 gio/gunixvolumemonitor.h                  |    4 +---
 gio/gvdb/gvdb-builder.c                   |    4 +---
 gio/gvdb/gvdb-builder.h                   |    4 +---
 gio/gvdb/gvdb-format.h                    |    4 +---
 gio/gvdb/gvdb-reader.c                    |    4 +---
 gio/gvdb/gvdb-reader.h                    |    4 +---
 gio/gvfs.c                                |    4 +---
 gio/gvfs.h                                |    4 +---
 gio/gvolume.c                             |    4 +---
 gio/gvolume.h                             |    4 +---
 gio/gvolumemonitor.c                      |    4 +---
 gio/gvolumemonitor.h                      |    4 +---
 gio/gwin32appinfo.c                       |    4 +---
 gio/gwin32appinfo.h                       |    4 +---
 gio/gwin32inputstream.c                   |    4 +---
 gio/gwin32inputstream.h                   |    4 +---
 gio/gwin32mount.c                         |    4 +---
 gio/gwin32mount.h                         |    4 +---
 gio/gwin32outputstream.c                  |    4 +---
 gio/gwin32outputstream.h                  |    4 +---
 gio/gwin32volumemonitor.c                 |    4 +---
 gio/gwin32volumemonitor.h                 |    4 +---
 gio/gzlibcompressor.c                     |    4 +---
 gio/gzlibcompressor.h                     |    4 +---
 gio/gzlibdecompressor.c                   |    4 +---
 gio/gzlibdecompressor.h                   |    4 +---
 gio/inotify/ginotifydirectorymonitor.c    |    4 +---
 gio/inotify/ginotifydirectorymonitor.h    |    4 +---
 gio/inotify/ginotifyfilemonitor.c         |    4 +---
 gio/inotify/ginotifyfilemonitor.h         |    4 +---
 gio/inotify/inotify-helper.c              |    3 +--
 gio/inotify/inotify-helper.h              |    3 +--
 gio/inotify/inotify-kernel.c              |    3 +--
 gio/inotify/inotify-kernel.h              |    3 +--
 gio/inotify/inotify-missing.c             |    3 +--
 gio/inotify/inotify-missing.h             |    3 +--
 gio/inotify/inotify-path.c                |    3 +--
 gio/inotify/inotify-path.h                |    3 +--
 gio/inotify/inotify-sub.c                 |    3 +--
 gio/inotify/inotify-sub.h                 |    3 +--
 gio/strinfo.c                             |    4 +---
 gio/tests/cancellable.c                   |    4 +---
 gio/tests/dbus-appinfo.c                  |    4 +---
 gio/tests/desktop-app-info.c              |    4 +---
 gio/tests/filter-cat.c                    |    4 +---
 gio/tests/gdbus-addresses.c               |    4 +---
 gio/tests/gdbus-auth.c                    |    4 +---
 gio/tests/gdbus-bz627724.c                |    4 +---
 gio/tests/gdbus-close-pending.c           |    4 +---
 gio/tests/gdbus-connection-flush-helper.c |    4 +---
 gio/tests/gdbus-connection-flush.c        |    4 +---
 gio/tests/gdbus-connection-loss.c         |    4 +---
 gio/tests/gdbus-connection-slow.c         |    4 +---
 gio/tests/gdbus-connection.c              |    4 +---
 gio/tests/gdbus-error.c                   |    4 +---
 gio/tests/gdbus-exit-on-close.c           |    4 +---
 gio/tests/gdbus-export.c                  |    4 +---
 gio/tests/gdbus-introspection.c           |    4 +---
 gio/tests/gdbus-message.c                 |    4 +---
 gio/tests/gdbus-names.c                   |    4 +---
 gio/tests/gdbus-non-socket.c              |    4 +---
 gio/tests/gdbus-overflow.c                |    4 +---
 gio/tests/gdbus-peer-object-manager.c     |    4 +---
 gio/tests/gdbus-peer.c                    |    4 +---
 gio/tests/gdbus-proxy-threads.c           |    4 +---
 gio/tests/gdbus-proxy-well-known-name.c   |    4 +---
 gio/tests/gdbus-proxy.c                   |    4 +---
 gio/tests/gdbus-serialization.c           |    4 +---
 gio/tests/gdbus-sessionbus.c              |    4 +---
 gio/tests/gdbus-sessionbus.h              |    4 +---
 gio/tests/gdbus-test-codegen.c            |    4 +---
 gio/tests/gdbus-tests.c                   |    4 +---
 gio/tests/gdbus-tests.h                   |    4 +---
 gio/tests/gdbus-threading.c               |    4 +---
 gio/tests/gnotification-server.c          |    4 +---
 gio/tests/gnotification-server.h          |    4 +---
 gio/tests/gnotification.c                 |    4 +---
 gio/tests/gtesttlsbackend.c               |    4 +---
 gio/tests/gtesttlsbackend.h               |    4 +---
 gio/tests/gtlsconsoleinteraction.c        |    4 +---
 gio/tests/gtlsconsoleinteraction.h        |    4 +---
 gio/tests/network-monitor.c               |    4 +---
 gio/tests/pollable.c                      |    4 +---
 gio/tests/proxy-test.c                    |    4 +---
 gio/tests/proxy.c                         |    4 +---
 gio/tests/resolver.c                      |    4 +---
 gio/tests/resources.c                     |    4 +---
 gio/tests/socket.c                        |    4 +---
 gio/tests/test-io-stream.c                |    4 +---
 gio/tests/test-io-stream.h                |    4 +---
 gio/tests/test-pipe-unix.c                |    4 +---
 gio/tests/test-pipe-unix.h                |    4 +---
 gio/tests/tls-certificate.c               |    4 +---
 gio/tests/tls-interaction.c               |    4 +---
 gio/thumbnail-verify.c                    |    4 +---
 gio/thumbnail-verify.h                    |    4 +---
 gio/win32/gwin32directorymonitor.c        |    4 +---
 gio/win32/gwin32directorymonitor.h        |    4 +---
 gio/win32/gwinhttpfile.c                  |    4 +---
 gio/win32/gwinhttpfile.h                  |    4 +---
 gio/win32/gwinhttpfileinputstream.c       |    4 +---
 gio/win32/gwinhttpfileinputstream.h       |    4 +---
 gio/win32/gwinhttpfileoutputstream.c      |    4 +---
 gio/win32/gwinhttpfileoutputstream.h      |    4 +---
 gio/win32/gwinhttpvfs.c                   |    4 +---
 gio/win32/gwinhttpvfs.h                   |    4 +---
 gio/xdgmime/xdgmime.c                     |    4 +---
 gio/xdgmime/xdgmime.h                     |    4 +---
 gio/xdgmime/xdgmimealias.c                |    4 +---
 gio/xdgmime/xdgmimealias.h                |    4 +---
 gio/xdgmime/xdgmimecache.c                |    4 +---
 gio/xdgmime/xdgmimecache.h                |    4 +---
 gio/xdgmime/xdgmimeglob.c                 |    4 +---
 gio/xdgmime/xdgmimeglob.h                 |    4 +---
 gio/xdgmime/xdgmimeicon.c                 |    4 +---
 gio/xdgmime/xdgmimeicon.h                 |    4 +---
 gio/xdgmime/xdgmimeint.c                  |    4 +---
 gio/xdgmime/xdgmimeint.h                  |    4 +---
 gio/xdgmime/xdgmimemagic.c                |    4 +---
 gio/xdgmime/xdgmimemagic.h                |    4 +---
 gio/xdgmime/xdgmimeparent.c               |    4 +---
 gio/xdgmime/xdgmimeparent.h               |    4 +---
 glib-gettextize.in                        |    3 +--
 glib/deprecated/gallocator.c              |    4 +---
 glib/deprecated/gallocator.h              |    4 +---
 glib/deprecated/gcache.c                  |    4 +---
 glib/deprecated/gcache.h                  |    4 +---
 glib/deprecated/gcompletion.c             |    4 +---
 glib/deprecated/gcompletion.h             |    4 +---
 glib/deprecated/gmain.h                   |    4 +---
 glib/deprecated/grel.h                    |    4 +---
 glib/deprecated/gthread-deprecated.c      |    4 +---
 glib/deprecated/gthread.h                 |    4 +---
 glib/docs.c                               |    4 +---
 glib/galloca.h                            |    4 +---
 glib/garray.c                             |    4 +---
 glib/garray.h                             |    4 +---
 glib/gasyncqueue.c                        |    4 +---
 glib/gasyncqueue.h                        |    4 +---
 glib/gasyncqueueprivate.h                 |    4 +---
 glib/gatomic.c                            |    4 +---
 glib/gatomic.h                            |    4 +---
 glib/gbacktrace.c                         |    4 +---
 glib/gbacktrace.h                         |    4 +---
 glib/gbase64.c                            |    4 +---
 glib/gbase64.h                            |    4 +---
 glib/gbitlock.c                           |    4 +---
 glib/gbitlock.h                           |    4 +---
 glib/gbytes.c                             |    4 +---
 glib/gbytes.h                             |    4 +---
 glib/gcharset.c                           |    4 +---
 glib/gcharset.h                           |    3 +--
 glib/gcharsetprivate.h                    |    4 +---
 glib/gchecksum.c                          |    4 +---
 glib/gchecksum.h                          |    4 +---
 glib/gconvert.c                           |    4 +---
 glib/gconvert.h                           |    4 +---
 glib/gdataset.c                           |    3 +--
 glib/gdataset.h                           |    4 +---
 glib/gdatasetprivate.h                    |    4 +---
 glib/gdate.c                              |    4 +---
 glib/gdate.h                              |    4 +---
 glib/gdir.c                               |    4 +---
 glib/gdir.h                               |    4 +---
 glib/gen-unicode-tables.pl                |    4 +---
 glib/genviron.c                           |    4 +---
 glib/genviron.h                           |    4 +---
 glib/gerror.c                             |    4 +---
 glib/gerror.h                             |    3 +--
 glib/gfileutils.c                         |    3 +--
 glib/gfileutils.h                         |    3 +--
 glib/ggettext.c                           |    4 +---
 glib/ggettext.h                           |    4 +---
 glib/ghash.c                              |    4 +---
 glib/ghash.h                              |    4 +---
 glib/ghmac.c                              |    4 +---
 glib/ghmac.h                              |    4 +---
 glib/ghook.c                              |    4 +---
 glib/ghook.h                              |    4 +---
 glib/ghostutils.c                         |    4 +---
 glib/ghostutils.h                         |    4 +---
 glib/gi18n-lib.h                          |    4 +---
 glib/gi18n.h                              |    4 +---
 glib/giochannel.c                         |    4 +---
 glib/giochannel.h                         |    4 +---
 glib/giounix.c                            |    4 +---
 glib/giowin32.c                           |    4 +---
 glib/gkeyfile.c                           |    3 +--
 glib/gkeyfile.h                           |    3 +--
 glib/glib-init.c                          |    4 +---
 glib/glib-init.h                          |    4 +---
 glib/glib-object.h                        |    4 +---
 glib/glib-private.c                       |    4 +---
 glib/glib-private.h                       |    4 +---
 glib/glib-unix.c                          |    4 +---
 glib/glib-unix.h                          |    4 +---
 glib/glib.h                               |    4 +---
 glib/glib_trace.h                         |    4 +---
 glib/glist.c                              |    4 +---
 glib/glist.h                              |    4 +---
 glib/gmacros.h                            |    4 +---
 glib/gmain-internal.h                     |    4 +---
 glib/gmain.c                              |    4 +---
 glib/gmain.h                              |    4 +---
 glib/gmappedfile.c                        |    4 +---
 glib/gmappedfile.h                        |    4 +---
 glib/gmarkup.c                            |    3 +--
 glib/gmarkup.h                            |    3 +--
 glib/gmem.c                               |    4 +---
 glib/gmem.h                               |    4 +---
 glib/gmessages.c                          |    4 +---
 glib/gmessages.h                          |    4 +---
 glib/gnode.c                              |    4 +---
 glib/gnode.h                              |    4 +---
 glib/gnulib/asnprintf.c                   |    4 +---
 glib/gnulib/g-gnulib.h                    |    4 +---
 glib/gnulib/printf-args.c                 |    4 +---
 glib/gnulib/printf-args.h                 |    4 +---
 glib/gnulib/printf-parse.c                |    4 +---
 glib/gnulib/printf-parse.h                |    4 +---
 glib/gnulib/printf.c                      |    4 +---
 glib/gnulib/printf.h                      |    4 +---
 glib/gnulib/vasnprintf.c                  |    4 +---
 glib/gnulib/vasnprintf.h                  |    4 +---
 glib/goption.c                            |    4 +---
 glib/goption.h                            |    4 +---
 glib/gpattern.c                           |    4 +---
 glib/gpattern.h                           |    4 +---
 glib/gpoll.c                              |    4 +---
 glib/gpoll.h                              |    4 +---
 glib/gprimes.c                            |    4 +---
 glib/gprimes.h                            |    4 +---
 glib/gprintf.c                            |    4 +---
 glib/gprintf.h                            |    4 +---
 glib/gprintfint.h                         |    4 +---
 glib/gqsort.c                             |    4 +---
 glib/gqsort.h                             |    4 +---
 glib/gquark.c                             |    3 +--
 glib/gquark.h                             |    4 +---
 glib/gqueue.c                             |    4 +---
 glib/gqueue.h                             |    4 +---
 glib/grand.c                              |    4 +---
 glib/grand.h                              |    4 +---
 glib/gscanner.c                           |    4 +---
 glib/gscanner.h                           |    4 +---
 glib/gsequence.c                          |    4 +---
 glib/gsequence.h                          |    4 +---
 glib/gslice.c                             |    4 +---
 glib/gslice.h                             |    4 +---
 glib/gslist.c                             |    4 +---
 glib/gslist.h                             |    4 +---
 glib/gstdio.c                             |    3 +--
 glib/gstdio.h                             |    3 +--
 glib/gstrfuncs.c                          |    4 +---
 glib/gstrfuncs.h                          |    4 +---
 glib/gstring.c                            |    4 +---
 glib/gstring.h                            |    4 +---
 glib/gstringchunk.c                       |    4 +---
 glib/gstringchunk.h                       |    4 +---
 glib/gtester-report                       |    4 +---
 glib/gtester.c                            |    4 +---
 glib/gtestutils.c                         |    4 +---
 glib/gtestutils.h                         |    4 +---
 glib/gthread-posix.c                      |    4 +---
 glib/gthread-win32.c                      |    4 +---
 glib/gthread.c                            |    4 +---
 glib/gthread.h                            |    4 +---
 glib/gthreadpool.c                        |    4 +---
 glib/gthreadpool.h                        |    4 +---
 glib/gthreadprivate.h                     |    3 +--
 glib/gtimer.c                             |    4 +---
 glib/gtimer.h                             |    4 +---
 glib/gtimezone.c                          |    4 +---
 glib/gtimezone.h                          |    4 +---
 glib/gtrashstack.c                        |    4 +---
 glib/gtrashstack.h                        |    4 +---
 glib/gtree.c                              |    4 +---
 glib/gtree.h                              |    4 +---
 glib/gtypes.h                             |    4 +---
 glib/gunibreak.c                          |    3 +--
 glib/gunicode.h                           |    3 +--
 glib/gunicodeprivate.h                    |    4 +---
 glib/gunicollate.c                        |    3 +--
 glib/gunidecomp.c                         |    3 +--
 glib/guniprop.c                           |    4 +---
 glib/gurifuncs.c                          |    4 +---
 glib/gurifuncs.h                          |    4 +---
 glib/gutf8.c                              |    4 +---
 glib/gutils.c                             |    4 +---
 glib/gutils.h                             |    4 +---
 glib/gvariant-core.c                      |    4 +---
 glib/gvariant-core.h                      |    4 +---
 glib/gvariant-internal.h                  |    4 +---
 glib/gvariant-parser.c                    |    4 +---
 glib/gvariant-serialiser.c                |    4 +---
 glib/gvariant-serialiser.h                |    4 +---
 glib/gvariant.c                           |    4 +---
 glib/gvariant.h                           |    4 +---
 glib/gvarianttype.c                       |    4 +---
 glib/gvarianttype.h                       |    4 +---
 glib/gvarianttypeinfo.c                   |    4 +---
 glib/gvarianttypeinfo.h                   |    4 +---
 glib/gversion.c                           |    4 +---
 glib/gversion.h                           |    4 +---
 glib/gversionmacros.h                     |    4 +---
 glib/gwakeup.c                            |    4 +---
 glib/gwakeup.h                            |    4 +---
 glib/gwin32.c                             |    4 +---
 glib/gwin32.h                             |    4 +---
 glib/libcharset/README                    |    4 +---
 glib/tests/array-test.c                   |    4 +---
 glib/tests/cache.c                        |    4 +---
 glib/tests/convert.c                      |    4 +---
 glib/tests/hash.c                         |    4 +---
 glib/tests/hostutils.c                    |    4 +---
 glib/tests/markups/valid-14.expected      |    3 +--
 glib/tests/markups/valid-14.gmarkup       |    3 +--
 glib/tests/node.c                         |    4 +---
 glib/tests/pattern.c                      |    4 +---
 glib/tests/regex.c                        |    4 +---
 glib/tests/scannerapi.c                   |    4 +---
 glib/tests/shell.c                        |    4 +---
 glib/tests/sort.c                         |    4 +---
 glib/tests/tree.c                         |    4 +---
 glib/tests/uri.c                          |    4 +---
 glib/tests/utf8-performance.c             |    4 +---
 glib/tests/utf8-pointer.c                 |    4 +---
 glib/tests/utf8-validate.c                |    4 +---
 gmodule/gmodule-ar.c                      |    4 +---
 gmodule/gmodule-dl.c                      |    4 +---
 gmodule/gmodule-dyld.c                    |    4 +---
 gmodule/gmodule-win32.c                   |    4 +---
 gmodule/gmodule.c                         |    4 +---
 gmodule/gmodule.h                         |    4 +---
 gmodule/gmoduleconf.h.in                  |    4 +---
 gmodule/gmoduleconf.h.win32               |    4 +---
 gobject/gatomicarray.c                    |    4 +---
 gobject/gatomicarray.h                    |    4 +---
 gobject/gbinding.c                        |    4 +---
 gobject/gbinding.h                        |    4 +---
 gobject/gboxed.c                          |    4 +---
 gobject/gboxed.h                          |    4 +---
 gobject/gclosure.c                        |    4 +---
 gobject/gclosure.h                        |    4 +---
 gobject/genums.c                          |    4 +---
 gobject/genums.h                          |    4 +---
 gobject/glib-genmarshal.c                 |    4 +---
 gobject/glib-types.h                      |    4 +---
 gobject/gobject-query.c                   |    4 +---
 gobject/gobject.c                         |    4 +---
 gobject/gobject.h                         |    4 +---
 gobject/gobject_trace.h                   |    4 +---
 gobject/gobjectnotifyqueue.c              |    4 +---
 gobject/gparam.c                          |    4 +---
 gobject/gparam.h                          |    4 +---
 gobject/gparamspecs.c                     |    4 +---
 gobject/gparamspecs.h                     |    4 +---
 gobject/gsignal.c                         |    4 +---
 gobject/gsignal.h                         |    4 +---
 gobject/gsourceclosure.c                  |    4 +---
 gobject/gsourceclosure.h                  |    4 +---
 gobject/gtype-private.h                   |    4 +---
 gobject/gtype.c                           |    4 +---
 gobject/gtype.h                           |    4 +---
 gobject/gtypemodule.c                     |    4 +---
 gobject/gtypemodule.h                     |    4 +---
 gobject/gtypeplugin.c                     |    4 +---
 gobject/gtypeplugin.h                     |    4 +---
 gobject/gvalue.c                          |    4 +---
 gobject/gvalue.h                          |    4 +---
 gobject/gvaluearray.c                     |    4 +---
 gobject/gvaluearray.h                     |    4 +---
 gobject/gvaluecollector.h                 |    4 +---
 gobject/gvaluetransform.c                 |    4 +---
 gobject/gvaluetypes.c                     |    4 +---
 gobject/gvaluetypes.h                     |    4 +---
 gobject/tests/ifaceproperties.c           |    4 +---
 gobject/tests/testcommon.h                |    4 +---
 gthread/gthread-impl.c                    |    4 +---
 po/po2tbl.sed.in                          |    3 +--
 tests/child-test.c                        |    4 +---
 tests/completion-test.c                   |    4 +---
 tests/dirname-test.c                      |    4 +---
 tests/env-test.c                          |    4 +---
 tests/file-test.c                         |    4 +---
 tests/gen-casefold-txt.pl                 |    4 +---
 tests/gen-casemap-txt.pl                  |    4 +---
 tests/gio-test.c                          |    4 +---
 tests/gobject/accumulator.c               |    4 +---
 tests/gobject/defaultiface.c              |    4 +---
 tests/gobject/deftype.c                   |    4 +---
 tests/gobject/dynamictype.c               |    4 +---
 tests/gobject/gvalue-test.c               |    4 +---
 tests/gobject/ifacecheck.c                |    4 +---
 tests/gobject/ifaceinherit.c              |    4 +---
 tests/gobject/ifaceinit.c                 |    4 +---
 tests/gobject/override.c                  |    4 +---
 tests/gobject/paramspec-test.c            |    4 +---
 tests/gobject/performance-threaded.c      |    4 +---
 tests/gobject/performance.c               |    4 +---
 tests/gobject/references.c                |    4 +---
 tests/gobject/signals.c                   |    4 +---
 tests/gobject/singleton.c                 |    4 +---
 tests/gobject/testcommon.h                |    4 +---
 tests/gobject/testgobject.c               |    4 +---
 tests/gobject/testmodule.c                |    4 +---
 tests/gobject/testmodule.h                |    4 +---
 tests/libmoduletestplugin_a.c             |    4 +---
 tests/libmoduletestplugin_b.c             |    4 +---
 tests/mapping-test.c                      |    4 +---
 tests/memchunks.c                         |    4 +---
 tests/module-test.c                       |    4 +---
 tests/relation-test.c                     |    4 +---
 tests/slice-color.c                       |    4 +---
 tests/slice-concurrent.c                  |    4 +---
 tests/slice-test.c                        |    4 +---
 tests/sources.c                           |    4 +---
 tests/spawn-test.c                        |    4 +---
 tests/testglib.c                          |    4 +---
 tests/type-test.c                         |    4 +---
 825 files changed, 825 insertions(+), 2444 deletions(-)
---
diff --git a/gio/data-to-c.pl b/gio/data-to-c.pl
old mode 100755
new mode 100644
index 20ba2fb..399d053
--- a/gio/data-to-c.pl
+++ b/gio/data-to-c.pl
@@ -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.
+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Kalev Lember <kalevlember gmail com>
 
diff --git a/gio/fam/fam-helper.c b/gio/fam/fam-helper.c
index 6cc7031..c02d392 100644
--- a/gio/fam/fam-helper.c
+++ b/gio/fam/fam-helper.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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fam/fam-helper.h b/gio/fam/fam-helper.h
index 05e67d1..030e315 100644
--- a/gio/fam/fam-helper.h
+++ b/gio/fam/fam-helper.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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fam/fam-module.c b/gio/fam/fam-module.c
index c25da33..71c62bd 100644
--- a/gio/fam/fam-module.c
+++ b/gio/fam/fam-module.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fam/gfamdirectorymonitor.c b/gio/fam/gfamdirectorymonitor.c
index 0bc69b5..627d232 100644
--- a/gio/fam/gfamdirectorymonitor.c
+++ b/gio/fam/gfamdirectorymonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fam/gfamdirectorymonitor.h b/gio/fam/gfamdirectorymonitor.h
index 8945da1..240412a 100644
--- a/gio/fam/gfamdirectorymonitor.h
+++ b/gio/fam/gfamdirectorymonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fam/gfamfilemonitor.c b/gio/fam/gfamfilemonitor.c
index 79983c7..acdbf22 100644
--- a/gio/fam/gfamfilemonitor.c
+++ b/gio/fam/gfamfilemonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fam/gfamfilemonitor.h b/gio/fam/gfamfilemonitor.h
index b1b101f..0d1fd63 100644
--- a/gio/fam/gfamfilemonitor.h
+++ b/gio/fam/gfamfilemonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fen/fen-dump.c b/gio/fen/fen-dump.c
index 7a34fa4..5c25662 100644
--- a/gio/fen/fen-dump.c
+++ b/gio/fen/fen-dump.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/fen-dump.h b/gio/fen/fen-dump.h
index ffac822..668e64f 100644
--- a/gio/fen/fen-dump.h
+++ b/gio/fen/fen-dump.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/fen-helper.c b/gio/fen/fen-helper.c
index f1c51da..724e314 100644
--- a/gio/fen/fen-helper.c
+++ b/gio/fen/fen-helper.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/fen-helper.h b/gio/fen/fen-helper.h
index 25df38f..85a980a 100644
--- a/gio/fen/fen-helper.h
+++ b/gio/fen/fen-helper.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/fen-kernel.c b/gio/fen/fen-kernel.c
index 8748a06..a724f2f 100644
--- a/gio/fen/fen-kernel.c
+++ b/gio/fen/fen-kernel.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/fen-kernel.h b/gio/fen/fen-kernel.h
index 6d2c49b..5a7eec0 100644
--- a/gio/fen/fen-kernel.h
+++ b/gio/fen/fen-kernel.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/fen-node.c b/gio/fen/fen-node.c
index 0a5f1e0..c26ff80 100644
--- a/gio/fen/fen-node.c
+++ b/gio/fen/fen-node.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/fen-node.h b/gio/fen/fen-node.h
index 7e99032..dd20a7e 100644
--- a/gio/fen/fen-node.h
+++ b/gio/fen/fen-node.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 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/>.
  *
  * Authors: Lin Ma <lin ma sun com>
  */
diff --git a/gio/fen/gfendirectorymonitor.c b/gio/fen/gfendirectorymonitor.c
index 055f52f..ffd80c6 100644
--- a/gio/fen/gfendirectorymonitor.c
+++ b/gio/fen/gfendirectorymonitor.c
@@ -18,9 +18,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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fen/gfendirectorymonitor.h b/gio/fen/gfendirectorymonitor.h
index a4d133d..0bb7096 100644
--- a/gio/fen/gfendirectorymonitor.h
+++ b/gio/fen/gfendirectorymonitor.h
@@ -18,9 +18,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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fen/gfenfilemonitor.c b/gio/fen/gfenfilemonitor.c
index 72394cf..185555b 100644
--- a/gio/fen/gfenfilemonitor.c
+++ b/gio/fen/gfenfilemonitor.c
@@ -18,9 +18,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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/fen/gfenfilemonitor.h b/gio/fen/gfenfilemonitor.h
index e44fd99..d7b4e53 100644
--- a/gio/fen/gfenfilemonitor.h
+++ b/gio/fen/gfenfilemonitor.h
@@ -18,9 +18,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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/gaction.c b/gio/gaction.c
index a477c9a..012c4f8 100644
--- a/gio/gaction.c
+++ b/gio/gaction.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gaction.h b/gio/gaction.h
index 79ae222..1fefd3e 100644
--- a/gio/gaction.h
+++ b/gio/gaction.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c
index 5fe1dc7..2fa0bd5 100644
--- a/gio/gactiongroup.c
+++ b/gio/gactiongroup.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gactiongroup.h b/gio/gactiongroup.h
index 9fc3b2b..647d6ac 100644
--- a/gio/gactiongroup.h
+++ b/gio/gactiongroup.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gactiongroupexporter.c b/gio/gactiongroupexporter.c
index 4871de0..2e045ed 100644
--- a/gio/gactiongroupexporter.c
+++ b/gio/gactiongroupexporter.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gactiongroupexporter.h b/gio/gactiongroupexporter.h
index 31f21f2..395f3d2 100644
--- a/gio/gactiongroupexporter.h
+++ b/gio/gactiongroupexporter.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gactionmap.c b/gio/gactionmap.c
index bd42224..866f98a 100644
--- a/gio/gactionmap.c
+++ b/gio/gactionmap.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gactionmap.h b/gio/gactionmap.h
index 93451a8..60c08e3 100644
--- a/gio/gactionmap.h
+++ b/gio/gactionmap.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 0789f5d..9db559c 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gappinfo.h b/gio/gappinfo.h
index 8b793ce..d08885a 100644
--- a/gio/gappinfo.h
+++ b/gio/gappinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gappinfoprivate.h b/gio/gappinfoprivate.h
index c987977..1f13f8c 100644
--- a/gio/gappinfoprivate.h
+++ b/gio/gappinfoprivate.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: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gapplication-tool.c b/gio/gapplication-tool.c
index 11fdce0..a1b9875 100644
--- a/gio/gapplication-tool.c
+++ b/gio/gapplication-tool.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gapplication.c b/gio/gapplication.c
index 106c19c..db9e165 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gapplication.h b/gio/gapplication.h
index d9c72df..7c91318 100644
--- a/gio/gapplication.h
+++ b/gio/gapplication.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c
index badd995..e809625 100644
--- a/gio/gapplicationcommandline.c
+++ b/gio/gapplicationcommandline.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gapplicationcommandline.h b/gio/gapplicationcommandline.h
index 5f70d65..874ce0a 100644
--- a/gio/gapplicationcommandline.h
+++ b/gio/gapplicationcommandline.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index a5b7bdb..a76156e 100644
--- a/gio/gapplicationimpl-dbus.c
+++ b/gio/gapplicationimpl-dbus.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c
index 07820b4..7cf86f1 100644
--- a/gio/gasynchelper.c
+++ b/gio/gasynchelper.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gasynchelper.h b/gio/gasynchelper.h
index 5b6cccd..5f7f5a3 100644
--- a/gio/gasynchelper.h
+++ b/gio/gasynchelper.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gasyncinitable.c b/gio/gasyncinitable.c
index 5cc60f2..0587575 100644
--- a/gio/gasyncinitable.c
+++ b/gio/gasyncinitable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gasyncinitable.h b/gio/gasyncinitable.h
index af5cfb1..43dda48 100644
--- a/gio/gasyncinitable.h
+++ b/gio/gasyncinitable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gasyncresult.c b/gio/gasyncresult.c
index 09b3f55..10a3b1e 100644
--- a/gio/gasyncresult.c
+++ b/gio/gasyncresult.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h
index 9c8184f..a80805f 100644
--- a/gio/gasyncresult.h
+++ b/gio/gasyncresult.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c
index 1053b1c..6b9829d 100644
--- a/gio/gbufferedinputstream.c
+++ b/gio/gbufferedinputstream.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 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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h
index a4f8ef0..004aea1 100644
--- a/gio/gbufferedinputstream.h
+++ b/gio/gbufferedinputstream.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gbufferedoutputstream.c b/gio/gbufferedoutputstream.c
index 6731b01..ac9b45f 100644
--- a/gio/gbufferedoutputstream.c
+++ b/gio/gbufferedoutputstream.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: Christian Kellner <gicmo gnome org> 
  */
diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h
index 49c0fa9..cce8f21 100644
--- a/gio/gbufferedoutputstream.h
+++ b/gio/gbufferedoutputstream.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gbytesicon.c b/gio/gbytesicon.c
index 2182f11..413e8bd 100644
--- a/gio/gbytesicon.c
+++ b/gio/gbytesicon.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: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gbytesicon.h b/gio/gbytesicon.h
index bf7753b..48b7f7b 100644
--- a/gio/gbytesicon.h
+++ b/gio/gbytesicon.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: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index 8f66e83..a6ef4ef 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcancellable.h b/gio/gcancellable.h
index e44bbad..fec7382 100644
--- a/gio/gcancellable.h
+++ b/gio/gcancellable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcharsetconverter.c b/gio/gcharsetconverter.c
index aa1c881..86be20e 100644
--- a/gio/gcharsetconverter.c
+++ b/gio/gcharsetconverter.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcharsetconverter.h b/gio/gcharsetconverter.h
index af9b989..c929dae 100644
--- a/gio/gcharsetconverter.h
+++ b/gio/gcharsetconverter.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcontenttype-win32.c b/gio/gcontenttype-win32.c
index e7e9785..24a02ed 100644
--- a/gio/gcontenttype-win32.c
+++ b/gio/gcontenttype-win32.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 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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index a4ecde2..49bd196 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.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 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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h
index 9ffbdeb..647c7d7 100644
--- a/gio/gcontenttype.h
+++ b/gio/gcontenttype.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcontenttypeprivate.h b/gio/gcontenttypeprivate.h
index a94d138..0e084c4 100644
--- a/gio/gcontenttypeprivate.h
+++ b/gio/gcontenttypeprivate.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gconverter.c b/gio/gconverter.c
index f02ff70..c397001 100644
--- a/gio/gconverter.c
+++ b/gio/gconverter.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gconverter.h b/gio/gconverter.h
index 4fea64d..62bc592 100644
--- a/gio/gconverter.h
+++ b/gio/gconverter.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gconverterinputstream.c b/gio/gconverterinputstream.c
index 6bc02d5..7e22aaa 100644
--- a/gio/gconverterinputstream.c
+++ b/gio/gconverterinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gconverterinputstream.h b/gio/gconverterinputstream.h
index 3a8f845..9f6d063 100644
--- a/gio/gconverterinputstream.h
+++ b/gio/gconverterinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gconverteroutputstream.c b/gio/gconverteroutputstream.c
index 8ae031a..6e17d55 100644
--- a/gio/gconverteroutputstream.c
+++ b/gio/gconverteroutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gconverteroutputstream.h b/gio/gconverteroutputstream.h
index 1f91001..cc7767d 100644
--- a/gio/gconverteroutputstream.h
+++ b/gio/gconverteroutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gcredentials.c b/gio/gcredentials.c
index dddf014..ccbd143 100644
--- a/gio/gcredentials.c
+++ b/gio/gcredentials.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gcredentials.h b/gio/gcredentials.h
index ff1ae4d..900dfdb 100644
--- a/gio/gcredentials.h
+++ b/gio/gcredentials.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gcredentialsprivate.h b/gio/gcredentialsprivate.h
index ee7d636..c747cc7 100644
--- a/gio/gcredentialsprivate.h
+++ b/gio/gcredentialsprivate.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/>.
  */
 
 #ifndef __G_CREDENTIALS_PRIVATE_H__
diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c
index b201314..0919cdd 100644
--- a/gio/gdatainputstream.c
+++ b/gio/gdatainputstream.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 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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h
index 3ebf67a..8304156 100644
--- a/gio/gdatainputstream.h
+++ b/gio/gdatainputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gdataoutputstream.c b/gio/gdataoutputstream.c
index 7657573..ea7deb1 100644
--- a/gio/gdataoutputstream.c
+++ b/gio/gdataoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gdataoutputstream.h b/gio/gdataoutputstream.h
index 12db684..ebd6a5b 100644
--- a/gio/gdataoutputstream.h
+++ b/gio/gdataoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gdbus-2.0/codegen/__init__.py b/gio/gdbus-2.0/codegen/__init__.py
index abfca81..ed3a570 100644
--- a/gio/gdbus-2.0/codegen/__init__.py
+++ b/gio/gdbus-2.0/codegen/__init__.py
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
index c711d44..43a6837 100644
--- a/gio/gdbus-2.0/codegen/codegen.py
+++ b/gio/gdbus-2.0/codegen/codegen.py
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py
index 94e07ed..18e3d00 100644
--- a/gio/gdbus-2.0/codegen/codegen_docbook.py
+++ b/gio/gdbus-2.0/codegen/codegen_docbook.py
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
old mode 100755
new mode 100644
index 69cf3e7..861df47
--- a/gio/gdbus-2.0/codegen/codegen_main.py
+++ b/gio/gdbus-2.0/codegen/codegen_main.py
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/config.py.in b/gio/gdbus-2.0/codegen/config.py.in
index ee1a308..38e0865 100644
--- a/gio/gdbus-2.0/codegen/config.py.in
+++ b/gio/gdbus-2.0/codegen/config.py.in
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/dbustypes.py b/gio/gdbus-2.0/codegen/dbustypes.py
index 38eb0c4..8787c92 100644
--- a/gio/gdbus-2.0/codegen/dbustypes.py
+++ b/gio/gdbus-2.0/codegen/dbustypes.py
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
index cfb512b..fd31a55 100644
--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py
index f8f022a..178d114 100644
--- a/gio/gdbus-2.0/codegen/parser.py
+++ b/gio/gdbus-2.0/codegen/parser.py
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
index 239b64e..c672dec 100644
--- a/gio/gdbus-2.0/codegen/utils.py
+++ b/gio/gdbus-2.0/codegen/utils.py
@@ -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 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: David Zeuthen <davidz redhat com>
 
diff --git a/gio/gdbus-tool.c b/gio/gdbus-tool.c
index 2d4f6b1..f6b709b 100644
--- a/gio/gdbus-tool.c
+++ b/gio/gdbus-tool.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusactiongroup-private.h b/gio/gdbusactiongroup-private.h
index 8c42b4d..6482014 100644
--- a/gio/gdbusactiongroup-private.h
+++ b/gio/gdbusactiongroup-private.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gdbusactiongroup.c b/gio/gdbusactiongroup.c
index 81fa13c..65bff2c 100644
--- a/gio/gdbusactiongroup.c
+++ b/gio/gdbusactiongroup.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gdbusactiongroup.h b/gio/gdbusactiongroup.h
index 4d8e168..9407d82 100644
--- a/gio/gdbusactiongroup.h
+++ b/gio/gdbusactiongroup.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index ef807f6..421b180 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusaddress.h b/gio/gdbusaddress.h
index 08773aa..fb62836 100644
--- a/gio/gdbusaddress.h
+++ b/gio/gdbusaddress.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
index a9418ec..a29f97e 100644
--- a/gio/gdbusauth.c
+++ b/gio/gdbusauth.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauth.h b/gio/gdbusauth.h
index 0eee95c..8fd16dd 100644
--- a/gio/gdbusauth.h
+++ b/gio/gdbusauth.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanism.c b/gio/gdbusauthmechanism.c
index 5b43dec..d00fc4c 100644
--- a/gio/gdbusauthmechanism.c
+++ b/gio/gdbusauthmechanism.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanism.h b/gio/gdbusauthmechanism.h
index 2373a88..f40aa99 100644
--- a/gio/gdbusauthmechanism.h
+++ b/gio/gdbusauthmechanism.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanismanon.c b/gio/gdbusauthmechanismanon.c
index cf9fc8b..f7c9917 100644
--- a/gio/gdbusauthmechanismanon.c
+++ b/gio/gdbusauthmechanismanon.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanismanon.h b/gio/gdbusauthmechanismanon.h
index f5d69a7..844f07c 100644
--- a/gio/gdbusauthmechanismanon.h
+++ b/gio/gdbusauthmechanismanon.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanismexternal.c b/gio/gdbusauthmechanismexternal.c
index f0bcfc3..c456ce2 100644
--- a/gio/gdbusauthmechanismexternal.c
+++ b/gio/gdbusauthmechanismexternal.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanismexternal.h b/gio/gdbusauthmechanismexternal.h
index b5f011f..eb065ff 100644
--- a/gio/gdbusauthmechanismexternal.h
+++ b/gio/gdbusauthmechanismexternal.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c
index 36b16fe..0b9db7f 100644
--- a/gio/gdbusauthmechanismsha1.c
+++ b/gio/gdbusauthmechanismsha1.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthmechanismsha1.h b/gio/gdbusauthmechanismsha1.h
index 7cb08f7..95dcf84 100644
--- a/gio/gdbusauthmechanismsha1.h
+++ b/gio/gdbusauthmechanismsha1.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c
index 0140c52..b15472b 100644
--- a/gio/gdbusauthobserver.c
+++ b/gio/gdbusauthobserver.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusauthobserver.h b/gio/gdbusauthobserver.h
index bc61c53..5e78976 100644
--- a/gio/gdbusauthobserver.h
+++ b/gio/gdbusauthobserver.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index f454693..e373579 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusconnection.h b/gio/gdbusconnection.h
index a669953..8f200ba 100644
--- a/gio/gdbusconnection.h
+++ b/gio/gdbusconnection.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c
index 685d853..369559c 100644
--- a/gio/gdbuserror.c
+++ b/gio/gdbuserror.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbuserror.h b/gio/gdbuserror.h
index cc90a9e..c6bc754 100644
--- a/gio/gdbuserror.h
+++ b/gio/gdbuserror.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusinterface.c b/gio/gdbusinterface.c
index 14f1326..f6872d9 100644
--- a/gio/gdbusinterface.c
+++ b/gio/gdbusinterface.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusinterface.h b/gio/gdbusinterface.h
index a82a757..d6316b3 100644
--- a/gio/gdbusinterface.h
+++ b/gio/gdbusinterface.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c
index 84492c0..32d9c95 100644
--- a/gio/gdbusinterfaceskeleton.c
+++ b/gio/gdbusinterfaceskeleton.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusinterfaceskeleton.h b/gio/gdbusinterfaceskeleton.h
index ca79c53..45307fe 100644
--- a/gio/gdbusinterfaceskeleton.h
+++ b/gio/gdbusinterfaceskeleton.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
index 0b61275..9a34f90 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusintrospection.h b/gio/gdbusintrospection.h
index 32ee784..edaf63e 100644
--- a/gio/gdbusintrospection.h
+++ b/gio/gdbusintrospection.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusmenumodel.c b/gio/gdbusmenumodel.c
index 16467d1..95cad80 100644
--- a/gio/gdbusmenumodel.c
+++ b/gio/gdbusmenumodel.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gdbusmenumodel.h b/gio/gdbusmenumodel.h
index e0ec520..05ae93b 100644
--- a/gio/gdbusmenumodel.h
+++ b/gio/gdbusmenumodel.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 341f4e7..f3bf064 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusmessage.h b/gio/gdbusmessage.h
index bf27f7a..f791889 100644
--- a/gio/gdbusmessage.h
+++ b/gio/gdbusmessage.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index c6cab91..cde3303 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/gio/gdbusmethodinvocation.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusmethodinvocation.h b/gio/gdbusmethodinvocation.h
index 7fd4aff..6354e41 100644
--- a/gio/gdbusmethodinvocation.h
+++ b/gio/gdbusmethodinvocation.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index 791d2f5..d1bef04 100644
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusnameowning.h b/gio/gdbusnameowning.h
index 6e69bff..a9cedcb 100644
--- a/gio/gdbusnameowning.h
+++ b/gio/gdbusnameowning.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index 12e8ed7..f7da5dd 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h
index 85607bf..bdc7d32 100644
--- a/gio/gdbusnamewatching.h
+++ b/gio/gdbusnamewatching.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobject.c b/gio/gdbusobject.c
index 52f003d..30b2e86 100644
--- a/gio/gdbusobject.c
+++ b/gio/gdbusobject.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobject.h b/gio/gdbusobject.h
index ad6c4d8..b408e2e 100644
--- a/gio/gdbusobject.h
+++ b/gio/gdbusobject.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectmanager.c b/gio/gdbusobjectmanager.c
index 3a7a5ec..e524728 100644
--- a/gio/gdbusobjectmanager.c
+++ b/gio/gdbusobjectmanager.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectmanager.h b/gio/gdbusobjectmanager.h
index bc00c5e..0ba8671 100644
--- a/gio/gdbusobjectmanager.h
+++ b/gio/gdbusobjectmanager.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index f33ca21..cb9d38f 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectmanagerclient.h b/gio/gdbusobjectmanagerclient.h
index 91d45a8..e7986b6 100644
--- a/gio/gdbusobjectmanagerclient.h
+++ b/gio/gdbusobjectmanagerclient.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c
index efbcc9d..20432f7 100644
--- a/gio/gdbusobjectmanagerserver.c
+++ b/gio/gdbusobjectmanagerserver.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectmanagerserver.h b/gio/gdbusobjectmanagerserver.h
index cd7bb4b..6debf59 100644
--- a/gio/gdbusobjectmanagerserver.h
+++ b/gio/gdbusobjectmanagerserver.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectproxy.c b/gio/gdbusobjectproxy.c
index 2ed1bb4..9788925 100644
--- a/gio/gdbusobjectproxy.c
+++ b/gio/gdbusobjectproxy.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectproxy.h b/gio/gdbusobjectproxy.h
index 8fe7416..147cde9 100644
--- a/gio/gdbusobjectproxy.h
+++ b/gio/gdbusobjectproxy.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectskeleton.c b/gio/gdbusobjectskeleton.c
index 063d4e8..d86cafd 100644
--- a/gio/gdbusobjectskeleton.c
+++ b/gio/gdbusobjectskeleton.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusobjectskeleton.h b/gio/gdbusobjectskeleton.h
index 3bce873..075b92b 100644
--- a/gio/gdbusobjectskeleton.h
+++ b/gio/gdbusobjectskeleton.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index b7d9336..762e676 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusprivate.h b/gio/gdbusprivate.h
index 1bc503c..0e38121 100644
--- a/gio/gdbusprivate.h
+++ b/gio/gdbusprivate.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index c870017..95b2feb 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusproxy.h b/gio/gdbusproxy.h
index 18a9138..3dbe9cf 100644
--- a/gio/gdbusproxy.h
+++ b/gio/gdbusproxy.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index e20f714..c18d86d 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusserver.h b/gio/gdbusserver.h
index 05557f0..f0beb85 100644
--- a/gio/gdbusserver.h
+++ b/gio/gdbusserver.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusutils.c b/gio/gdbusutils.c
index e6d9eaa..28ac518 100644
--- a/gio/gdbusutils.c
+++ b/gio/gdbusutils.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdbusutils.h b/gio/gdbusutils.h
index 6ef2ffd..fa64426 100644
--- a/gio/gdbusutils.h
+++ b/gio/gdbusutils.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gdelayedsettingsbackend.c b/gio/gdelayedsettingsbackend.c
index 20bcc37..2a45a0e 100644
--- a/gio/gdelayedsettingsbackend.c
+++ b/gio/gdelayedsettingsbackend.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gdelayedsettingsbackend.h b/gio/gdelayedsettingsbackend.h
index 92a4851..1f3c8f0 100644
--- a/gio/gdelayedsettingsbackend.h
+++ b/gio/gdelayedsettingsbackend.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 336b31e..caccef0 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.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 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: Alexander Larsson <alexl redhat com>
  *         Ryan Lortie <desrt desrt ca>
diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h
index dbf31db..979092b 100644
--- a/gio/gdesktopappinfo.h
+++ b/gio/gdesktopappinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gdrive.c b/gio/gdrive.c
index 32f7848..5d79286 100644
--- a/gio/gdrive.c
+++ b/gio/gdrive.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gdrive.h b/gio/gdrive.h
index 13c02ae..451e417 100644
--- a/gio/gdrive.h
+++ b/gio/gdrive.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gdummyfile.c b/gio/gdummyfile.c
index 8f22715..4ac3bd9 100644
--- a/gio/gdummyfile.c
+++ b/gio/gdummyfile.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gdummyfile.h b/gio/gdummyfile.h
index 791f233..580daf9 100644
--- a/gio/gdummyfile.h
+++ b/gio/gdummyfile.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gdummyproxyresolver.c b/gio/gdummyproxyresolver.c
index 8f3969e..4bf53b1 100644
--- a/gio/gdummyproxyresolver.c
+++ b/gio/gdummyproxyresolver.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gdummyproxyresolver.h b/gio/gdummyproxyresolver.h
index d5e091f..040e81b 100644
--- a/gio/gdummyproxyresolver.h
+++ b/gio/gdummyproxyresolver.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gdummytlsbackend.c b/gio/gdummytlsbackend.c
index 535942f..974da25 100644
--- a/gio/gdummytlsbackend.c
+++ b/gio/gdummytlsbackend.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gdummytlsbackend.h b/gio/gdummytlsbackend.h
index 40b5038..b9699c7 100644
--- a/gio/gdummytlsbackend.h
+++ b/gio/gdummytlsbackend.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/>.
  */
 
 #ifndef __G_DUMMY_TLS_BACKEND_H__
diff --git a/gio/gemblem.c b/gio/gemblem.c
index 2ce1fc1..ed35eb2 100644
--- a/gio/gemblem.c
+++ b/gio/gemblem.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/>.
  */
 
 #include <config.h>
diff --git a/gio/gemblem.h b/gio/gemblem.h
index d581abb..bbfbeaa 100644
--- a/gio/gemblem.h
+++ b/gio/gemblem.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/>.
  *
  */
 
diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c
index 556fbe8..6531c80 100644
--- a/gio/gemblemedicon.c
+++ b/gio/gemblemedicon.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 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: Matthias Clasen <mclasen redhat com>
  *         Clemens N. Buss <cebuzz gmail com>
diff --git a/gio/gemblemedicon.h b/gio/gemblemedicon.h
index 714fe39..1b1b109 100644
--- a/gio/gemblemedicon.h
+++ b/gio/gemblemedicon.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: Matthias Clasen <mclasen redhat com>
  *         Clemens N. Buss <cebuzz gmail com>
diff --git a/gio/gfdonotificationbackend.c b/gio/gfdonotificationbackend.c
index 8d4eec1..69ba230 100644
--- a/gio/gfdonotificationbackend.c
+++ b/gio/gfdonotificationbackend.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/gfile.c b/gio/gfile.c
index e319510..4f54a66 100644
--- a/gio/gfile.c
+++ b/gio/gfile.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 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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfile.h b/gio/gfile.h
index 0c77dc8..3b4d154 100644
--- a/gio/gfile.h
+++ b/gio/gfile.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileattribute-priv.h b/gio/gfileattribute-priv.h
index 731c50b..10cc850 100644
--- a/gio/gfileattribute-priv.h
+++ b/gio/gfileattribute-priv.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c
index 44a5128..78f94e6 100644
--- a/gio/gfileattribute.c
+++ b/gio/gfileattribute.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileattribute.h b/gio/gfileattribute.h
index 8ebdcd4..3cbdcd1 100644
--- a/gio/gfileattribute.h
+++ b/gio/gfileattribute.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfiledescriptorbased.c b/gio/gfiledescriptorbased.c
index 6d4ef13..a7829cf 100644
--- a/gio/gfiledescriptorbased.c
+++ b/gio/gfiledescriptorbased.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gfiledescriptorbased.h b/gio/gfiledescriptorbased.h
index cf045b4..9f7d2dc 100644
--- a/gio/gfiledescriptorbased.h
+++ b/gio/gfiledescriptorbased.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c
index a853540..9146b65 100644
--- a/gio/gfileenumerator.c
+++ b/gio/gfileenumerator.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileenumerator.h b/gio/gfileenumerator.h
index 7607002..ceb62a5 100644
--- a/gio/gfileenumerator.h
+++ b/gio/gfileenumerator.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileicon.c b/gio/gfileicon.c
index b40ef00..2eaec7b 100644
--- a/gio/gfileicon.c
+++ b/gio/gfileicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileicon.h b/gio/gfileicon.h
index 2e6f3d5..9042970 100644
--- a/gio/gfileicon.h
+++ b/gio/gfileicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileinfo-priv.h b/gio/gfileinfo-priv.h
index 938ec87..8a55d6b 100644
--- a/gio/gfileinfo-priv.h
+++ b/gio/gfileinfo-priv.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 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: Benjamin Otte <otte gnome org>
  */
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 81b15fb..dd2e2e2 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 99f0185..cec8872 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c
index 05eaa04..fb7a42e 100644
--- a/gio/gfileinputstream.c
+++ b/gio/gfileinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h
index 338ccae..4e37e07 100644
--- a/gio/gfileinputstream.h
+++ b/gio/gfileinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileiostream.c b/gio/gfileiostream.c
index 6fe45bc..d3cc55c 100644
--- a/gio/gfileiostream.c
+++ b/gio/gfileiostream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileiostream.h b/gio/gfileiostream.h
index 89a5536..4c3919a 100644
--- a/gio/gfileiostream.h
+++ b/gio/gfileiostream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c
index d8e974f..b63a230 100644
--- a/gio/gfilemonitor.c
+++ b/gio/gfilemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h
index e29ad0a..7b17f9f 100644
--- a/gio/gfilemonitor.h
+++ b/gio/gfilemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c
index f841c16..f1d9f8a 100644
--- a/gio/gfilenamecompleter.c
+++ b/gio/gfilenamecompleter.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfilenamecompleter.h b/gio/gfilenamecompleter.h
index 0745bbb..28e3168 100644
--- a/gio/gfilenamecompleter.h
+++ b/gio/gfilenamecompleter.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c
index 790224a..56fd66a 100644
--- a/gio/gfileoutputstream.c
+++ b/gio/gfileoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h
index 5e8a5fe..bec9f91 100644
--- a/gio/gfileoutputstream.h
+++ b/gio/gfileoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gfilterinputstream.c b/gio/gfilterinputstream.c
index d90dbac..326222a 100644
--- a/gio/gfilterinputstream.c
+++ b/gio/gfilterinputstream.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: Christian Kellner <gicmo gnome org> 
  */
diff --git a/gio/gfilterinputstream.h b/gio/gfilterinputstream.h
index afe15a5..a45b83e 100644
--- a/gio/gfilterinputstream.h
+++ b/gio/gfilterinputstream.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gfilteroutputstream.c b/gio/gfilteroutputstream.c
index ea181e7..abe9c07 100644
--- a/gio/gfilteroutputstream.c
+++ b/gio/gfilteroutputstream.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: Christian Kellner <gicmo gnome org> 
  */
diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h
index 7e29086..5f2faa7 100644
--- a/gio/gfilteroutputstream.h
+++ b/gio/gfilteroutputstream.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/ggtknotificationbackend.c b/gio/ggtknotificationbackend.c
index f02597d..c5ceced 100644
--- a/gio/ggtknotificationbackend.c
+++ b/gio/ggtknotificationbackend.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 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/>.
 *
 * Authors: Lars Uebernickel <lars uebernic de>
 */
diff --git a/gio/gicon.c b/gio/gicon.c
index 0e998b1..b4685ab 100644
--- a/gio/gicon.c
+++ b/gio/gicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gicon.h b/gio/gicon.h
index f378146..1e3ed9a 100644
--- a/gio/gicon.h
+++ b/gio/gicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/ginetaddress.c b/gio/ginetaddress.c
index 13f3757..8eac10b 100644
--- a/gio/ginetaddress.c
+++ b/gio/ginetaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/ginetaddress.h b/gio/ginetaddress.h
index 940b798..c1fdf69 100644
--- a/gio/ginetaddress.h
+++ b/gio/ginetaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/ginetaddressmask.c b/gio/ginetaddressmask.c
index 428ad8a..38fada0 100644
--- a/gio/ginetaddressmask.c
+++ b/gio/ginetaddressmask.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/>.
  */
 
 #include <config.h>
diff --git a/gio/ginetaddressmask.h b/gio/ginetaddressmask.h
index 05b0630..03db50d 100644
--- a/gio/ginetaddressmask.h
+++ b/gio/ginetaddressmask.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/>.
  */
 
 #ifndef __G_INET_ADDRESS_MASK_H__
diff --git a/gio/ginetsocketaddress.c b/gio/ginetsocketaddress.c
index 9d0f1cd..4dec469 100644
--- a/gio/ginetsocketaddress.c
+++ b/gio/ginetsocketaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/ginetsocketaddress.h b/gio/ginetsocketaddress.h
index 1865a3b..3a4fb58 100644
--- a/gio/ginetsocketaddress.h
+++ b/gio/ginetsocketaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/ginitable.c b/gio/ginitable.c
index 3205b2f..f64f634 100644
--- a/gio/ginitable.c
+++ b/gio/ginitable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/ginitable.h b/gio/ginitable.h
index c147013..2c8804b 100644
--- a/gio/ginitable.h
+++ b/gio/ginitable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/ginputstream.c b/gio/ginputstream.c
index c35dd0d..116457d 100644
--- a/gio/ginputstream.c
+++ b/gio/ginputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/ginputstream.h b/gio/ginputstream.h
index bedfba7..a9c269c 100644
--- a/gio/ginputstream.h
+++ b/gio/ginputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gio-querymodules.c b/gio/gio-querymodules.c
index ee60fef..8dc2421 100644
--- a/gio/gio-querymodules.c
+++ b/gio/gio-querymodules.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gio.h b/gio/gio.h
index a1c6804..3cc4af3 100644
--- a/gio/gio.h
+++ b/gio/gio.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gioenums.h b/gio/gioenums.h
index dc7341b..d83ea76 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gioerror.c b/gio/gioerror.c
index 3a7785f..053f13f 100644
--- a/gio/gioerror.c
+++ b/gio/gioerror.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gioerror.h b/gio/gioerror.h
index ed23df4..035e9e2 100644
--- a/gio/gioerror.h
+++ b/gio/gioerror.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/giomodule-priv.h b/gio/giomodule-priv.h
index 1591c06..2a51055 100644
--- a/gio/giomodule-priv.h
+++ b/gio/giomodule-priv.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/giomodule.c b/gio/giomodule.c
index 2498659..4b33136 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/giomodule.h b/gio/giomodule.h
index 712c4be..f67185b 100644
--- a/gio/giomodule.h
+++ b/gio/giomodule.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gioprivate.h b/gio/gioprivate.h
index ab07c6c..076259c 100644
--- a/gio/gioprivate.h
+++ b/gio/gioprivate.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/>.
  */
 
 #ifndef __G_IO_PRIVATE_H__
diff --git a/gio/gioscheduler.c b/gio/gioscheduler.c
index 182931d..ab8afa1 100644
--- a/gio/gioscheduler.c
+++ b/gio/gioscheduler.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gioscheduler.h b/gio/gioscheduler.h
index c044b82..d852a21 100644
--- a/gio/gioscheduler.h
+++ b/gio/gioscheduler.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/giostream.c b/gio/giostream.c
index 98f2247..a93a822 100644
--- a/gio/giostream.c
+++ b/gio/giostream.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Alexander Larsson <alexl redhat com>
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 61f78a0..7667b58 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/giowin32-priv.h b/gio/giowin32-priv.h
index b62b99b..7391a2a 100644
--- a/gio/giowin32-priv.h
+++ b/gio/giowin32-priv.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: Colin Walters <walters verbum org>
  */
diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
index 2246e78..0dd802b 100644
--- a/gio/gkeyfilesettingsbackend.c
+++ b/gio/gkeyfilesettingsbackend.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Vincent Untz <vuntz gnome org>
  *          Ryan Lortie <desrt desrt ca>
diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c
index 822262b..537ca78 100644
--- a/gio/glib-compile-resources.c
+++ b/gio/glib-compile-resources.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index d2ae81a..e42949b 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c
index 6bef162..ed1e63f 100644
--- a/gio/gloadableicon.c
+++ b/gio/gloadableicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h
index 5bdece8..d164ca0 100644
--- a/gio/gloadableicon.h
+++ b/gio/gloadableicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocaldirectorymonitor.c b/gio/glocaldirectorymonitor.c
index 942643e..d85d752 100644
--- a/gio/glocaldirectorymonitor.c
+++ b/gio/glocaldirectorymonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocaldirectorymonitor.h b/gio/glocaldirectorymonitor.h
index 94740bd..b873404 100644
--- a/gio/glocaldirectorymonitor.h
+++ b/gio/glocaldirectorymonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 1eb3750..846eedb 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfile.h b/gio/glocalfile.h
index 4d02084..8a8035b 100644
--- a/gio/glocalfile.h
+++ b/gio/glocalfile.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileenumerator.c b/gio/glocalfileenumerator.c
index 5cba475..60c9b9a 100644
--- a/gio/glocalfileenumerator.c
+++ b/gio/glocalfileenumerator.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileenumerator.h b/gio/glocalfileenumerator.h
index 1269be3..c718799 100644
--- a/gio/glocalfileenumerator.h
+++ b/gio/glocalfileenumerator.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index c5d9bba..f3b565b 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.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 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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileinfo.h b/gio/glocalfileinfo.h
index feb3c56..16eb43d 100644
--- a/gio/glocalfileinfo.h
+++ b/gio/glocalfileinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileinputstream.c b/gio/glocalfileinputstream.c
index ea2cfd1..2b79444 100644
--- a/gio/glocalfileinputstream.c
+++ b/gio/glocalfileinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileinputstream.h b/gio/glocalfileinputstream.h
index 28f28bf..6dddc92 100644
--- a/gio/glocalfileinputstream.h
+++ b/gio/glocalfileinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileiostream.c b/gio/glocalfileiostream.c
index 5e4792b..b55d2aa 100644
--- a/gio/glocalfileiostream.c
+++ b/gio/glocalfileiostream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileiostream.h b/gio/glocalfileiostream.h
index be7c786..62305f7 100644
--- a/gio/glocalfileiostream.h
+++ b/gio/glocalfileiostream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
index a4cbeae..818440b 100644
--- a/gio/glocalfilemonitor.c
+++ b/gio/glocalfilemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfilemonitor.h b/gio/glocalfilemonitor.h
index 74baaa4..aed2e9c 100644
--- a/gio/glocalfilemonitor.h
+++ b/gio/glocalfilemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
index a1cdc86..b8fd45c 100644
--- a/gio/glocalfileoutputstream.c
+++ b/gio/glocalfileoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalfileoutputstream.h b/gio/glocalfileoutputstream.h
index b8f062a..b4a5f17 100644
--- a/gio/glocalfileoutputstream.h
+++ b/gio/glocalfileoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalvfs.c b/gio/glocalvfs.c
index 9319be2..b0bae9c 100644
--- a/gio/glocalvfs.c
+++ b/gio/glocalvfs.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/glocalvfs.h b/gio/glocalvfs.h
index 5d9de2f..39acc5d 100644
--- a/gio/glocalvfs.h
+++ b/gio/glocalvfs.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c
index 2b1c56f..d822588 100644
--- a/gio/gmemoryinputstream.c
+++ b/gio/gmemoryinputstream.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: Christian Kellner <gicmo gnome org> 
  */
diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h
index 607c4bb..ee1be36 100644
--- a/gio/gmemoryinputstream.h
+++ b/gio/gmemoryinputstream.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c
index 6611ead..bef6397 100644
--- a/gio/gmemoryoutputstream.c
+++ b/gio/gmemoryoutputstream.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/>.
  *
  * Authors:
  *   Christian Kellner <gicmo gnome org>
diff --git a/gio/gmemoryoutputstream.h b/gio/gmemoryoutputstream.h
index b95d101..a7151f3 100644
--- a/gio/gmemoryoutputstream.h
+++ b/gio/gmemoryoutputstream.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: Christian Kellner <gicmo gnome org>
  */
diff --git a/gio/gmemorysettingsbackend.c b/gio/gmemorysettingsbackend.c
index 14e3fcd..b0d58b5 100644
--- a/gio/gmemorysettingsbackend.c
+++ b/gio/gmemorysettingsbackend.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gmenu.c b/gio/gmenu.c
index 68f23ab..e785db6 100644
--- a/gio/gmenu.c
+++ b/gio/gmenu.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gmenu.h b/gio/gmenu.h
index 68a974f..084b58a 100644
--- a/gio/gmenu.h
+++ b/gio/gmenu.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gmenuexporter.c b/gio/gmenuexporter.c
index fc5dffd..0d2418c 100644
--- a/gio/gmenuexporter.c
+++ b/gio/gmenuexporter.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 library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- *  USA.
+ *  License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gmenuexporter.h b/gio/gmenuexporter.h
index 1673b22..be06de3 100644
--- a/gio/gmenuexporter.h
+++ b/gio/gmenuexporter.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 library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- *  USA.
+ *  License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c
index 3d9d17e..b40905a 100644
--- a/gio/gmenumodel.c
+++ b/gio/gmenumodel.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gmenumodel.h b/gio/gmenumodel.h
index 7a2e27e..d34b232 100644
--- a/gio/gmenumodel.h
+++ b/gio/gmenumodel.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gmount.c b/gio/gmount.c
index ac0179e..6b17291 100644
--- a/gio/gmount.c
+++ b/gio/gmount.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gmount.h b/gio/gmount.h
index 58f5193..1339743 100644
--- a/gio/gmount.h
+++ b/gio/gmount.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c
index e04882a..d0ede5d 100644
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h
index 7f8baf1..f3155a5 100644
--- a/gio/gmountoperation.h
+++ b/gio/gmountoperation.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gmountprivate.h b/gio/gmountprivate.h
index 74e9852..2325c1f 100644
--- a/gio/gmountprivate.h
+++ b/gio/gmountprivate.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gnativevolumemonitor.c b/gio/gnativevolumemonitor.c
index 71e8936..163c5ae 100644
--- a/gio/gnativevolumemonitor.c
+++ b/gio/gnativevolumemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gnativevolumemonitor.h b/gio/gnativevolumemonitor.h
index e7f6d62..39162d2 100644
--- a/gio/gnativevolumemonitor.h
+++ b/gio/gnativevolumemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c
index 9586ffa..f2f414e 100644
--- a/gio/gnetworkaddress.c
+++ b/gio/gnetworkaddress.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 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/>.
  */
 
 #include "config.h"
diff --git a/gio/gnetworkaddress.h b/gio/gnetworkaddress.h
index 326ab21..a9800f4 100644
--- a/gio/gnetworkaddress.h
+++ b/gio/gnetworkaddress.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/>.
  */
 
 #ifndef __G_NETWORK_ADDRESS_H__
diff --git a/gio/gnetworking.c b/gio/gnetworking.c
index 24c4013..17eda38 100644
--- a/gio/gnetworking.c
+++ b/gio/gnetworking.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 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/>.
  */
 
 #include "config.h"
diff --git a/gio/gnetworking.h.in b/gio/gnetworking.h.in
index a1d4716..0b7a4dd 100644
--- a/gio/gnetworking.h.in
+++ b/gio/gnetworking.h.in
@@ -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/>.
  */
 
 #ifndef __G_NETWORKING_H__
diff --git a/gio/gnetworking.h.win32 b/gio/gnetworking.h.win32
index c5a8980..f62a9be 100644
--- a/gio/gnetworking.h.win32
+++ b/gio/gnetworking.h.win32
@@ -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/>.
  */
 
 #ifndef __G_NETWORKING_H__
diff --git a/gio/gnetworkingprivate.h b/gio/gnetworkingprivate.h
index 4341dc7..b28ff44 100644
--- a/gio/gnetworkingprivate.h
+++ b/gio/gnetworkingprivate.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/>.
  */
 
 #ifndef __G_NETWORKINGPRIVATE_H__
diff --git a/gio/gnetworkmonitor.c b/gio/gnetworkmonitor.c
index ef5389b..30233d2 100644
--- a/gio/gnetworkmonitor.c
+++ b/gio/gnetworkmonitor.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gnetworkmonitor.h b/gio/gnetworkmonitor.h
index 373934e..d81b13f 100644
--- a/gio/gnetworkmonitor.h
+++ b/gio/gnetworkmonitor.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/>.
  */
 
 #ifndef __G_NETWORK_MONITOR_H__
diff --git a/gio/gnetworkmonitorbase.c b/gio/gnetworkmonitorbase.c
index 85b7f53..c14e264 100644
--- a/gio/gnetworkmonitorbase.c
+++ b/gio/gnetworkmonitorbase.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gnetworkmonitorbase.h b/gio/gnetworkmonitorbase.h
index 225a1ba..7970f7c 100644
--- a/gio/gnetworkmonitorbase.h
+++ b/gio/gnetworkmonitorbase.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/>.
  */
 
 #ifndef __G_NETWORK_MONITOR_BASE_H__
diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c
index 9ce9f88..670969d 100644
--- a/gio/gnetworkmonitornetlink.c
+++ b/gio/gnetworkmonitornetlink.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gnetworkmonitornetlink.h b/gio/gnetworkmonitornetlink.h
index f6fa22a..5824791 100644
--- a/gio/gnetworkmonitornetlink.h
+++ b/gio/gnetworkmonitornetlink.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/>.
  */
 
 #ifndef __G_NETWORK_MONITOR_NETLINK_H__
diff --git a/gio/gnetworkservice.c b/gio/gnetworkservice.c
index 55f801e..744b3ca 100644
--- a/gio/gnetworkservice.c
+++ b/gio/gnetworkservice.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 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/>.
  */
 
 #include "config.h"
diff --git a/gio/gnetworkservice.h b/gio/gnetworkservice.h
index 082166d..678f055 100644
--- a/gio/gnetworkservice.h
+++ b/gio/gnetworkservice.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/>.
  */
 
 #ifndef __G_NETWORK_SERVICE_H__
diff --git a/gio/gnextstepsettingsbackend.c b/gio/gnextstepsettingsbackend.c
index 86af0e0..f9b808c 100644
--- a/gio/gnextstepsettingsbackend.c
+++ b/gio/gnextstepsettingsbackend.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: William Hua <william attente ca>
  */
diff --git a/gio/gnotification-private.h b/gio/gnotification-private.h
index af6ad83..8b65050 100644
--- a/gio/gnotification-private.h
+++ b/gio/gnotification-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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/gnotification.c b/gio/gnotification.c
index b61a198..9190b75 100644
--- a/gio/gnotification.c
+++ b/gio/gnotification.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/gnotification.h b/gio/gnotification.h
index c7e8277..11226fe 100644
--- a/gio/gnotification.h
+++ b/gio/gnotification.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/gnotificationbackend.c b/gio/gnotificationbackend.c
index 98b60bb..c1e009d 100644
--- a/gio/gnotificationbackend.c
+++ b/gio/gnotificationbackend.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/gnotificationbackend.h b/gio/gnotificationbackend.h
index 178331d..d26123a 100644
--- a/gio/gnotificationbackend.h
+++ b/gio/gnotificationbackend.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/gnullsettingsbackend.c b/gio/gnullsettingsbackend.c
index 523f074..9f8a34c 100644
--- a/gio/gnullsettingsbackend.c
+++ b/gio/gnullsettingsbackend.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index c2e651e..125c418 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/goutputstream.h b/gio/goutputstream.h
index 1bc5659..a530740 100644
--- a/gio/goutputstream.h
+++ b/gio/goutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gpermission.c b/gio/gpermission.c
index 421d63a..371e09d 100644
--- a/gio/gpermission.c
+++ b/gio/gpermission.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gpermission.h b/gio/gpermission.h
index 49c2991..7eb63a4 100644
--- a/gio/gpermission.h
+++ b/gio/gpermission.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gpollableinputstream.c b/gio/gpollableinputstream.c
index c59f9df..513bb48 100644
--- a/gio/gpollableinputstream.c
+++ b/gio/gpollableinputstream.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gpollableinputstream.h b/gio/gpollableinputstream.h
index a0b1574..f0a97ea 100644
--- a/gio/gpollableinputstream.h
+++ b/gio/gpollableinputstream.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/>.
  */
 
 #ifndef __G_POLLABLE_INPUT_STREAM_H__
diff --git a/gio/gpollableoutputstream.c b/gio/gpollableoutputstream.c
index b019e81..a3a8607 100644
--- a/gio/gpollableoutputstream.c
+++ b/gio/gpollableoutputstream.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gpollableoutputstream.h b/gio/gpollableoutputstream.h
index b6b3e54..f1c183b 100644
--- a/gio/gpollableoutputstream.h
+++ b/gio/gpollableoutputstream.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/>.
  */
 
 #ifndef __G_POLLABLE_OUTPUT_STREAM_H__
diff --git a/gio/gpollableutils.c b/gio/gpollableutils.c
index e794ac6..fbf3519 100644
--- a/gio/gpollableutils.c
+++ b/gio/gpollableutils.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gpollableutils.h b/gio/gpollableutils.h
index cb4612d..1401873 100644
--- a/gio/gpollableutils.h
+++ b/gio/gpollableutils.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/>.
  */
 
 #ifndef __G_POLLABLE_UTILS_H__
diff --git a/gio/gpollfilemonitor.c b/gio/gpollfilemonitor.c
index a3b1306..10c2d86 100644
--- a/gio/gpollfilemonitor.c
+++ b/gio/gpollfilemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gpollfilemonitor.h b/gio/gpollfilemonitor.h
index 6537f5a..4806af0 100644
--- a/gio/gpollfilemonitor.h
+++ b/gio/gpollfilemonitor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gpropertyaction.c b/gio/gpropertyaction.c
index 46a19b4..45532ee 100644
--- a/gio/gpropertyaction.c
+++ b/gio/gpropertyaction.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gpropertyaction.h b/gio/gpropertyaction.h
index 3a43af8..7765858 100644
--- a/gio/gpropertyaction.h
+++ b/gio/gpropertyaction.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gproxy.c b/gio/gproxy.c
index e1fadf7..cf0ed6b 100644
--- a/gio/gproxy.c
+++ b/gio/gproxy.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gproxy.h b/gio/gproxy.h
index b022335..73f9f66 100644
--- a/gio/gproxy.h
+++ b/gio/gproxy.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 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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gproxyaddress.c b/gio/gproxyaddress.c
index c03f648..1d0ab21 100644
--- a/gio/gproxyaddress.c
+++ b/gio/gproxyaddress.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/>.
  *
  * Authors: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gproxyaddress.h b/gio/gproxyaddress.h
index ed67f33..11942de 100644
--- a/gio/gproxyaddress.h
+++ b/gio/gproxyaddress.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/>.
  *
  * Authors: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gproxyaddressenumerator.c b/gio/gproxyaddressenumerator.c
index 2b3e297..c34fca9 100644
--- a/gio/gproxyaddressenumerator.c
+++ b/gio/gproxyaddressenumerator.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gproxyaddressenumerator.h b/gio/gproxyaddressenumerator.h
index 19bcd51..a607930 100644
--- a/gio/gproxyaddressenumerator.h
+++ b/gio/gproxyaddressenumerator.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c
index db2e475..0624c37 100644
--- a/gio/gproxyresolver.c
+++ b/gio/gproxyresolver.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gproxyresolver.h b/gio/gproxyresolver.h
index eaad834..97964b2 100644
--- a/gio/gproxyresolver.h
+++ b/gio/gproxyresolver.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c
index 1b4c119..396159c 100644
--- a/gio/gregistrysettingsbackend.c
+++ b/gio/gregistrysettingsbackend.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Sam Thursfield <ssssam gmail com>
  */
diff --git a/gio/gregistrysettingsbackend.h b/gio/gregistrysettingsbackend.h
index faba639..cae65d5 100644
--- a/gio/gregistrysettingsbackend.h
+++ b/gio/gregistrysettingsbackend.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Sam Thursfield <ssssam gmail com>
  */
diff --git a/gio/gremoteactiongroup.c b/gio/gremoteactiongroup.c
index e00d916..e4edef1 100644
--- a/gio/gremoteactiongroup.c
+++ b/gio/gremoteactiongroup.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gremoteactiongroup.h b/gio/gremoteactiongroup.h
index a9926ee..a4d0c30 100644
--- a/gio/gremoteactiongroup.h
+++ b/gio/gremoteactiongroup.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 919ee13..11f0196 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.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 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/>.
  */
 
 #include "config.h"
diff --git a/gio/gresolver.h b/gio/gresolver.h
index 454896c..2950c9d 100644
--- a/gio/gresolver.h
+++ b/gio/gresolver.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/>.
  */
 
 #ifndef __G_RESOLVER_H__
diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c
index d4e5699..f751f50 100644
--- a/gio/gresource-tool.c
+++ b/gio/gresource-tool.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Matthias Clasen
  */
diff --git a/gio/gresource.c b/gio/gresource.c
index ad40a78..04b34c2 100644
--- a/gio/gresource.c
+++ b/gio/gresource.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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gresource.h b/gio/gresource.h
index 2db343c..9c79db9 100644
--- a/gio/gresource.h
+++ b/gio/gresource.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gresourcefile.c b/gio/gresourcefile.c
index de26246..380095c 100644
--- a/gio/gresourcefile.c
+++ b/gio/gresourcefile.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gresourcefile.h b/gio/gresourcefile.h
index 2c792b0..919564d 100644
--- a/gio/gresourcefile.h
+++ b/gio/gresourcefile.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gseekable.c b/gio/gseekable.c
index f831c5e..3d89591 100644
--- a/gio/gseekable.c
+++ b/gio/gseekable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gseekable.h b/gio/gseekable.h
index 245eb07..fbfd9e1 100644
--- a/gio/gseekable.h
+++ b/gio/gseekable.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gsettings-mapping.c b/gio/gsettings-mapping.c
index 6a9c41b..12b7f34 100644
--- a/gio/gsettings-mapping.c
+++ b/gio/gsettings-mapping.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Vincent Untz <vuntz gnome org>
  */
diff --git a/gio/gsettings-mapping.h b/gio/gsettings-mapping.h
index ad8f59e..c7c3d82 100644
--- a/gio/gsettings-mapping.h
+++ b/gio/gsettings-mapping.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Vincent Untz <vuntz gnome org>
  */
diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
index 451dcf1..61aa863 100644
--- a/gio/gsettings-tool.c
+++ b/gio/gsettings-tool.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsettings.c b/gio/gsettings.c
index e3abb74..effa9fc 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsettings.h b/gio/gsettings.h
index cf3607a..3025667 100644
--- a/gio/gsettings.h
+++ b/gio/gsettings.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c
index bd5452b..8c1d267 100644
--- a/gio/gsettingsbackend.c
+++ b/gio/gsettingsbackend.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Matthias Clasen <mclasen redhat com>
diff --git a/gio/gsettingsbackend.h b/gio/gsettingsbackend.h
index 2c25355..fbec206 100644
--- a/gio/gsettingsbackend.h
+++ b/gio/gsettingsbackend.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Matthias Clasen <mclasen redhat com>
diff --git a/gio/gsettingsbackendinternal.h b/gio/gsettingsbackendinternal.h
index 0c22f90..c01fd8f 100644
--- a/gio/gsettingsbackendinternal.h
+++ b/gio/gsettingsbackendinternal.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Matthias Clasen <mclasen redhat com>
diff --git a/gio/gsettingsschema-internal.h b/gio/gsettingsschema-internal.h
index 9745a2b..c6a905f 100644
--- a/gio/gsettingsschema-internal.h
+++ b/gio/gsettingsschema-internal.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_SETTINGS_SCHEMA_INTERNAL_H__
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index eb1ac57..f3009c0 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gio/gsettingsschema.h b/gio/gsettingsschema.h
index 5555921..e1d153e 100644
--- a/gio/gsettingsschema.h
+++ b/gio/gsettingsschema.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_SETTINGS_SCHEMA_H__
diff --git a/gio/gsimpleaction.c b/gio/gsimpleaction.c
index adf81f6..dff8c90 100644
--- a/gio/gsimpleaction.c
+++ b/gio/gsimpleaction.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsimpleaction.h b/gio/gsimpleaction.h
index b89b1a9..3dd0fa9 100644
--- a/gio/gsimpleaction.h
+++ b/gio/gsimpleaction.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsimpleactiongroup.c b/gio/gsimpleactiongroup.c
index 717b2f6..c542251 100644
--- a/gio/gsimpleactiongroup.c
+++ b/gio/gsimpleactiongroup.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsimpleactiongroup.h b/gio/gsimpleactiongroup.h
index 197e30e..4cca76b 100644
--- a/gio/gsimpleactiongroup.h
+++ b/gio/gsimpleactiongroup.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c
index 2c7f2da..017e240 100644
--- a/gio/gsimpleasyncresult.c
+++ b/gio/gsimpleasyncresult.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h
index 7134f84..94412f4 100644
--- a/gio/gsimpleasyncresult.h
+++ b/gio/gsimpleasyncresult.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gsimplepermission.c b/gio/gsimplepermission.c
index e913d14..5f3161e 100644
--- a/gio/gsimplepermission.c
+++ b/gio/gsimplepermission.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsimplepermission.h b/gio/gsimplepermission.h
index 4cc336b..df5f381 100644
--- a/gio/gsimplepermission.h
+++ b/gio/gsimplepermission.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsimpleproxyresolver.h b/gio/gsimpleproxyresolver.h
index a451f99..8b32390 100644
--- a/gio/gsimpleproxyresolver.h
+++ b/gio/gsimpleproxyresolver.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/>.
  */
 
 #ifndef __G_SIMPLE_PROXY_RESOLVER_H__
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 6a7e092..49aceb2 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.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 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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocket.h b/gio/gsocket.h
index edc0292..8b49cc1 100644
--- a/gio/gsocket.h
+++ b/gio/gsocket.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketaddress.c b/gio/gsocketaddress.c
index c1298b3..676d94a 100644
--- a/gio/gsocketaddress.c
+++ b/gio/gsocketaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketaddress.h b/gio/gsocketaddress.h
index dce3139..95e86d5 100644
--- a/gio/gsocketaddress.h
+++ b/gio/gsocketaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c
index 35462af..7d645bb 100644
--- a/gio/gsocketaddressenumerator.c
+++ b/gio/gsocketaddressenumerator.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gsocketaddressenumerator.h b/gio/gsocketaddressenumerator.h
index bf415d1..78fd9c8 100644
--- a/gio/gsocketaddressenumerator.h
+++ b/gio/gsocketaddressenumerator.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/>.
  */
 
 #ifndef __G_SOCKET_ADDRESS_ENUMERATOR_H__
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 9e32248..4608c81 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Alexander Larsson <alexl redhat com>
diff --git a/gio/gsocketclient.h b/gio/gsocketclient.h
index 72bace7..f192d8a 100644
--- a/gio/gsocketclient.h
+++ b/gio/gsocketclient.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Alexander Larsson <alexl redhat com>
diff --git a/gio/gsocketconnectable.c b/gio/gsocketconnectable.c
index d4911e5..e9a4a89 100644
--- a/gio/gsocketconnectable.c
+++ b/gio/gsocketconnectable.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gsocketconnectable.h b/gio/gsocketconnectable.h
index 5a80ea8..f7db680 100644
--- a/gio/gsocketconnectable.h
+++ b/gio/gsocketconnectable.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/>.
  */
 
 #ifndef __G_SOCKET_CONNECTABLE_H__
diff --git a/gio/gsocketconnection.c b/gio/gsocketconnection.c
index 6127a84..50e50ba 100644
--- a/gio/gsocketconnection.c
+++ b/gio/gsocketconnection.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 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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketconnection.h b/gio/gsocketconnection.h
index b93201f..8d20068 100644
--- a/gio/gsocketconnection.h
+++ b/gio/gsocketconnection.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketcontrolmessage.h b/gio/gsocketcontrolmessage.h
index aaa7c93..37da11a 100644
--- a/gio/gsocketcontrolmessage.h
+++ b/gio/gsocketcontrolmessage.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gsocketinputstream.c b/gio/gsocketinputstream.c
index 85295bf..325428b 100644
--- a/gio/gsocketinputstream.c
+++ b/gio/gsocketinputstream.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 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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c
index 72eca31..1848900 100644
--- a/gio/gsocketlistener.c
+++ b/gio/gsocketlistener.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 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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketlistener.h b/gio/gsocketlistener.h
index 09f3985..157c2cd 100644
--- a/gio/gsocketlistener.h
+++ b/gio/gsocketlistener.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 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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketoutputstream.c b/gio/gsocketoutputstream.c
index 4dedff8..00b49ad 100644
--- a/gio/gsocketoutputstream.c
+++ b/gio/gsocketoutputstream.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 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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gsocketservice.c b/gio/gsocketservice.c
index c088390..934d60e 100644
--- a/gio/gsocketservice.c
+++ b/gio/gsocketservice.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Alexander Larsson <alexl redhat com>
diff --git a/gio/gsocketservice.h b/gio/gsocketservice.h
index d10b566..ec391d1 100644
--- a/gio/gsocketservice.h
+++ b/gio/gsocketservice.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Alexander Larsson <alexl redhat com>
diff --git a/gio/gsocks4aproxy.c b/gio/gsocks4aproxy.c
index e9b00f3..d54a816 100644
--- a/gio/gsocks4aproxy.c
+++ b/gio/gsocks4aproxy.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gsocks4aproxy.h b/gio/gsocks4aproxy.h
index e6c7b04..ab22b85 100644
--- a/gio/gsocks4aproxy.h
+++ b/gio/gsocks4aproxy.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gsocks4proxy.c b/gio/gsocks4proxy.c
index 05c74c8..b966141 100644
--- a/gio/gsocks4proxy.c
+++ b/gio/gsocks4proxy.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gsocks4proxy.h b/gio/gsocks4proxy.h
index 5b89d2d..715827b 100644
--- a/gio/gsocks4proxy.h
+++ b/gio/gsocks4proxy.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: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/gsocks5proxy.c b/gio/gsocks5proxy.c
index 0d6269e..d093c81 100644
--- a/gio/gsocks5proxy.c
+++ b/gio/gsocks5proxy.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 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:  Youness Alaoui <youness alaoui collabora co uk
  *
diff --git a/gio/gsocks5proxy.h b/gio/gsocks5proxy.h
index c55d603..711f5d6 100644
--- a/gio/gsocks5proxy.h
+++ b/gio/gsocks5proxy.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 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:  Youness Alaoui <youness alaoui collabora co uk
  *
diff --git a/gio/gsrvtarget.c b/gio/gsrvtarget.c
index 3422750..3f87c94 100644
--- a/gio/gsrvtarget.c
+++ b/gio/gsrvtarget.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 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/>.
  */
 
 #include "config.h"
diff --git a/gio/gsrvtarget.h b/gio/gsrvtarget.h
index 6135ef2..8d400e9 100644
--- a/gio/gsrvtarget.h
+++ b/gio/gsrvtarget.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/>.
  */
 
 #ifndef __G_SRV_TARGET_H__
diff --git a/gio/gsubprocess.h b/gio/gsubprocess.h
index 3fd6f18..3f3de7d 100644
--- a/gio/gsubprocess.h
+++ b/gio/gsubprocess.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: Colin Walters <walters verbum org>
  */
diff --git a/gio/gsubprocesslauncher-private.h b/gio/gsubprocesslauncher-private.h
index 538bf52..2b69335 100644
--- a/gio/gsubprocesslauncher-private.h
+++ b/gio/gsubprocesslauncher-private.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/>.
  */
 
 #ifndef __G_SUBPROCESS_CONTEXT_PRIVATE_H__
diff --git a/gio/gsubprocesslauncher.h b/gio/gsubprocesslauncher.h
index 611730e..ab4ad5e 100644
--- a/gio/gsubprocesslauncher.h
+++ b/gio/gsubprocesslauncher.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 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: Ryan Lortie <desrt desrt ca>
  * Author: Colin Walters <walters verbum org>
diff --git a/gio/gtask.c b/gio/gtask.c
index bc2744d..390e093 100644
--- a/gio/gtask.c
+++ b/gio/gtask.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gtask.h b/gio/gtask.h
index d5a2d77..a4fd77e 100644
--- a/gio/gtask.h
+++ b/gio/gtask.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/>.
  */
 
 #ifndef __G_TASK_H__
diff --git a/gio/gtcpconnection.h b/gio/gtcpconnection.h
index 3d02f3a..5d4e713 100644
--- a/gio/gtcpconnection.h
+++ b/gio/gtcpconnection.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gtcpwrapperconnection.c b/gio/gtcpwrapperconnection.c
index e62da8e..742abc1 100644
--- a/gio/gtcpwrapperconnection.c
+++ b/gio/gtcpwrapperconnection.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/>.
  *
  * Authors: Nicolas Dufresne <nicolas dufresne colllabora co uk>
  */
diff --git a/gio/gtcpwrapperconnection.h b/gio/gtcpwrapperconnection.h
index 43b1e3e..adf07c9 100644
--- a/gio/gtcpwrapperconnection.h
+++ b/gio/gtcpwrapperconnection.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 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/>.
  *
  * Authors: Nicolas Dufresne <nicolas dufresne collabora co uk>
  *
diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c
index a7410ac..7cb24f2 100644
--- a/gio/gtestdbus.c
+++ b/gio/gtestdbus.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 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/>.
  *
  * Authors: David Zeuthen <davidz redhat com>
  *          Xavier Claessens <xavier claessens collabora co uk>
diff --git a/gio/gtestdbus.h b/gio/gtestdbus.h
index 00644d6..0e82e33 100644
--- a/gio/gtestdbus.h
+++ b/gio/gtestdbus.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 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/>.
  *
  * Authors: David Zeuthen <davidz redhat com>
  *          Xavier Claessens <xavier claessens collabora co uk>
diff --git a/gio/gthemedicon.c b/gio/gthemedicon.c
index 37b7492..1b171c9 100644
--- a/gio/gthemedicon.c
+++ b/gio/gthemedicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gthemedicon.h b/gio/gthemedicon.h
index 4cbd29b..afe6796 100644
--- a/gio/gthemedicon.h
+++ b/gio/gthemedicon.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
index c009529..12a60e7 100644
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.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 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/>.
  */
 
 #include "config.h"
diff --git a/gio/gthreadedresolver.h b/gio/gthreadedresolver.h
index f11c76e..9509a48 100644
--- a/gio/gthreadedresolver.h
+++ b/gio/gthreadedresolver.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/>.
  */
 
 #ifndef __G_THREADED_RESOLVER_H__
diff --git a/gio/gthreadedsocketservice.c b/gio/gthreadedsocketservice.c
index 5316280..f18238c 100644
--- a/gio/gthreadedsocketservice.c
+++ b/gio/gthreadedsocketservice.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Alexander Larsson <alexl redhat com>
diff --git a/gio/gthreadedsocketservice.h b/gio/gthreadedsocketservice.h
index 229be7e..6b0168f 100644
--- a/gio/gthreadedsocketservice.h
+++ b/gio/gthreadedsocketservice.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  *          Alexander Larsson <alexl redhat com>
diff --git a/gio/gtlsbackend.c b/gio/gtlsbackend.c
index c77293d..f83515c 100644
--- a/gio/gtlsbackend.c
+++ b/gio/gtlsbackend.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gtlsbackend.h b/gio/gtlsbackend.h
index 19f08ad..8064636 100644
--- a/gio/gtlsbackend.h
+++ b/gio/gtlsbackend.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/>.
  */
 
 #ifndef __G_TLS_BACKEND_H__
diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c
index b8ee3fc..c6954ea 100644
--- a/gio/gtlscertificate.c
+++ b/gio/gtlscertificate.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gtlscertificate.h b/gio/gtlscertificate.h
index dd6c3a1..d0c727b 100644
--- a/gio/gtlscertificate.h
+++ b/gio/gtlscertificate.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/>.
  */
 
 #ifndef __G_TLS_CERTIFICATE_H__
diff --git a/gio/gtlsclientconnection.c b/gio/gtlsclientconnection.c
index 8dbae1e..80ede34 100644
--- a/gio/gtlsclientconnection.c
+++ b/gio/gtlsclientconnection.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gtlsclientconnection.h b/gio/gtlsclientconnection.h
index aa216f4..b711a47 100644
--- a/gio/gtlsclientconnection.h
+++ b/gio/gtlsclientconnection.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/>.
  */
 
 #ifndef __G_TLS_CLIENT_CONNECTION_H__
diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c
index b6da848..4135b02 100644
--- a/gio/gtlsconnection.c
+++ b/gio/gtlsconnection.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gtlsconnection.h b/gio/gtlsconnection.h
index 465c936..15b29aa 100644
--- a/gio/gtlsconnection.h
+++ b/gio/gtlsconnection.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/>.
  */
 
 #ifndef __G_TLS_CONNECTION_H__
diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c
index 538a013..9485587 100644
--- a/gio/gtlsdatabase.c
+++ b/gio/gtlsdatabase.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/gio/gtlsdatabase.h b/gio/gtlsdatabase.h
index c11ca7a..34a8d3b 100644
--- a/gio/gtlsdatabase.h
+++ b/gio/gtlsdatabase.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/gio/gtlsfiledatabase.c b/gio/gtlsfiledatabase.c
index 874d285..e68846e 100644
--- a/gio/gtlsfiledatabase.c
+++ b/gio/gtlsfiledatabase.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/gio/gtlsinteraction.c b/gio/gtlsinteraction.c
index 8059dc3..1df2494 100644
--- a/gio/gtlsinteraction.c
+++ b/gio/gtlsinteraction.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/gio/gtlsinteraction.h b/gio/gtlsinteraction.h
index bb3df32..99d7274 100644
--- a/gio/gtlsinteraction.h
+++ b/gio/gtlsinteraction.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/gio/gtlspassword.c b/gio/gtlspassword.c
index 38280d9..a8cbe16 100644
--- a/gio/gtlspassword.c
+++ b/gio/gtlspassword.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/gio/gtlspassword.h b/gio/gtlspassword.h
index 3db365d..61b3a29 100644
--- a/gio/gtlspassword.h
+++ b/gio/gtlspassword.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/gio/gtlsserverconnection.c b/gio/gtlsserverconnection.c
index 55af49a..6c46407 100644
--- a/gio/gtlsserverconnection.c
+++ b/gio/gtlsserverconnection.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/>.
  */
 
 #include "config.h"
diff --git a/gio/gtlsserverconnection.h b/gio/gtlsserverconnection.h
index 6550d19..a0051cc 100644
--- a/gio/gtlsserverconnection.h
+++ b/gio/gtlsserverconnection.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/>.
  */
 
 #ifndef __G_TLS_SERVER_CONNECTION_H__
diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c
index cd814ad..4c3049b 100644
--- a/gio/gunionvolumemonitor.c
+++ b/gio/gunionvolumemonitor.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gunionvolumemonitor.h b/gio/gunionvolumemonitor.h
index 2924b66..fc1d6fa 100644
--- a/gio/gunionvolumemonitor.h
+++ b/gio/gunionvolumemonitor.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gunixconnection.h b/gio/gunixconnection.h
index bd87374..6797a85 100644
--- a/gio/gunixconnection.h
+++ b/gio/gunixconnection.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gunixcredentialsmessage.h b/gio/gunixcredentialsmessage.h
index 17b4a31..bc3e43a 100644
--- a/gio/gunixcredentialsmessage.h
+++ b/gio/gunixcredentialsmessage.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 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/>.
  *
  * Authors: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/gunixfdlist.h b/gio/gunixfdlist.h
index 6bbfb48..6b1c383 100644
--- a/gio/gunixfdlist.h
+++ b/gio/gunixfdlist.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gunixfdmessage.h b/gio/gunixfdmessage.h
index 41f9b0a..3b900ea 100644
--- a/gio/gunixfdmessage.h
+++ b/gio/gunixfdmessage.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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index 6f7e7d4..51a46ee 100644
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gunixinputstream.h b/gio/gunixinputstream.h
index a8beb88..8633051 100644
--- a/gio/gunixinputstream.h
+++ b/gio/gunixinputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gunixmount.c b/gio/gunixmount.c
index 3f79714..2bbb91a 100644
--- a/gio/gunixmount.c
+++ b/gio/gunixmount.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gunixmount.h b/gio/gunixmount.h
index 35cd64d..dd2dfb9 100644
--- a/gio/gunixmount.h
+++ b/gio/gunixmount.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index a6cf826..e0f39cf 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.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 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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gunixmounts.h b/gio/gunixmounts.h
index bd269a3..6ac06f2 100644
--- a/gio/gunixmounts.h
+++ b/gio/gunixmounts.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gunixoutputstream.c b/gio/gunixoutputstream.c
index d1de6d5..b3d2d34 100644
--- a/gio/gunixoutputstream.c
+++ b/gio/gunixoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gunixoutputstream.h b/gio/gunixoutputstream.h
index 9ef2e52..0b84857 100644
--- a/gio/gunixoutputstream.h
+++ b/gio/gunixoutputstream.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c
index 96974bb..cf9f7bb 100644
--- a/gio/gunixsocketaddress.c
+++ b/gio/gunixsocketaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gunixsocketaddress.h b/gio/gunixsocketaddress.h
index 39d5821..709ee28 100644
--- a/gio/gunixsocketaddress.h
+++ b/gio/gunixsocketaddress.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/>.
  *
  * Authors: Christian Kellner <gicmo gnome org>
  *          Samuel Cormier-Iijima <sciyoshi gmail com>
diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
index 24f14d5..079b902 100644
--- a/gio/gunixvolume.c
+++ b/gio/gunixvolume.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gunixvolume.h b/gio/gunixvolume.h
index 3d51d3f..185300a 100644
--- a/gio/gunixvolume.h
+++ b/gio/gunixvolume.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index 0a48486..130ca62 100644
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gunixvolumemonitor.h b/gio/gunixvolumemonitor.h
index 9c09cf6..f7dfd0a 100644
--- a/gio/gunixvolumemonitor.h
+++ b/gio/gunixvolumemonitor.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gvdb/gvdb-builder.c b/gio/gvdb/gvdb-builder.c
index 91adec6..48fe3e4 100644
--- a/gio/gvdb/gvdb-builder.c
+++ b/gio/gvdb/gvdb-builder.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gvdb/gvdb-builder.h b/gio/gvdb/gvdb-builder.h
index 797626e..8ec05c8 100644
--- a/gio/gvdb/gvdb-builder.h
+++ b/gio/gvdb/gvdb-builder.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gvdb/gvdb-format.h b/gio/gvdb/gvdb-format.h
index 886aa56..486e854 100644
--- a/gio/gvdb/gvdb-format.h
+++ b/gio/gvdb/gvdb-format.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gvdb/gvdb-reader.c b/gio/gvdb/gvdb-reader.c
index 44594bf..1b80e70 100644
--- a/gio/gvdb/gvdb-reader.c
+++ b/gio/gvdb/gvdb-reader.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gvdb/gvdb-reader.h b/gio/gvdb/gvdb-reader.h
index e6878c3..08a1605 100644
--- a/gio/gvdb/gvdb-reader.h
+++ b/gio/gvdb/gvdb-reader.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/gvfs.c b/gio/gvfs.c
index d08c49e..2390b7c 100644
--- a/gio/gvfs.c
+++ b/gio/gvfs.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gvfs.h b/gio/gvfs.h
index 4150ae9..54a0fb7 100644
--- a/gio/gvfs.h
+++ b/gio/gvfs.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gvolume.c b/gio/gvolume.c
index aa5e40e..9f06701 100644
--- a/gio/gvolume.c
+++ b/gio/gvolume.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gvolume.h b/gio/gvolume.h
index 0a4abe0..c5e13c3 100644
--- a/gio/gvolume.h
+++ b/gio/gvolume.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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gvolumemonitor.c b/gio/gvolumemonitor.c
index bb0fd35..f4b4009 100644
--- a/gio/gvolumemonitor.c
+++ b/gio/gvolumemonitor.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h
index 0a37e12..f6b4e58 100644
--- a/gio/gvolumemonitor.h
+++ b/gio/gvolumemonitor.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c
index 40e59ef..7762a2b 100644
--- a/gio/gwin32appinfo.c
+++ b/gio/gwin32appinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gwin32appinfo.h b/gio/gwin32appinfo.h
index c07ee30..9636662 100644
--- a/gio/gwin32appinfo.h
+++ b/gio/gwin32appinfo.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gwin32inputstream.c b/gio/gwin32inputstream.c
index 0d9f5c0..b607c55 100644
--- a/gio/gwin32inputstream.c
+++ b/gio/gwin32inputstream.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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml iki fi>
diff --git a/gio/gwin32inputstream.h b/gio/gwin32inputstream.h
index 27fa7e1..4a04b3a 100644
--- a/gio/gwin32inputstream.h
+++ b/gio/gwin32inputstream.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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml iki fi>
diff --git a/gio/gwin32mount.c b/gio/gwin32mount.c
index 39931ef..5ae80c8 100644
--- a/gio/gwin32mount.c
+++ b/gio/gwin32mount.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gwin32mount.h b/gio/gwin32mount.h
index 92e1f28..753513f 100644
--- a/gio/gwin32mount.h
+++ b/gio/gwin32mount.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gwin32outputstream.c b/gio/gwin32outputstream.c
index c36b8cd..bae5102 100644
--- a/gio/gwin32outputstream.c
+++ b/gio/gwin32outputstream.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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml iki fi>
diff --git a/gio/gwin32outputstream.h b/gio/gwin32outputstream.h
index 9e441d9..f317edb 100644
--- a/gio/gwin32outputstream.h
+++ b/gio/gwin32outputstream.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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml iki fi>
diff --git a/gio/gwin32volumemonitor.c b/gio/gwin32volumemonitor.c
index 286d1ca..d3932fc 100644
--- a/gio/gwin32volumemonitor.c
+++ b/gio/gwin32volumemonitor.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gwin32volumemonitor.h b/gio/gwin32volumemonitor.h
index e3aab73..49bd6ef 100644
--- a/gio/gwin32volumemonitor.h
+++ b/gio/gwin32volumemonitor.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 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: Alexander Larsson <alexl redhat com>
  *         David Zeuthen <davidz redhat com>
diff --git a/gio/gzlibcompressor.c b/gio/gzlibcompressor.c
index 51092e8..68445d0 100644
--- a/gio/gzlibcompressor.c
+++ b/gio/gzlibcompressor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gzlibcompressor.h b/gio/gzlibcompressor.h
index 609e42f..4bda693 100644
--- a/gio/gzlibcompressor.h
+++ b/gio/gzlibcompressor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gzlibdecompressor.c b/gio/gzlibdecompressor.c
index a868255..0f1da62 100644
--- a/gio/gzlibdecompressor.c
+++ b/gio/gzlibdecompressor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/gzlibdecompressor.h b/gio/gzlibdecompressor.h
index ecc4f4e..ac47d70 100644
--- a/gio/gzlibdecompressor.h
+++ b/gio/gzlibdecompressor.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/inotify/ginotifydirectorymonitor.c b/gio/inotify/ginotifydirectorymonitor.c
index 7b7fd0f..cd4a610 100644
--- a/gio/inotify/ginotifydirectorymonitor.c
+++ b/gio/inotify/ginotifydirectorymonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/inotify/ginotifydirectorymonitor.h b/gio/inotify/ginotifydirectorymonitor.h
index c8cb9ca..eef566e 100644
--- a/gio/inotify/ginotifydirectorymonitor.h
+++ b/gio/inotify/ginotifydirectorymonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/inotify/ginotifyfilemonitor.c b/gio/inotify/ginotifyfilemonitor.c
index ca30139..e122d67 100644
--- a/gio/inotify/ginotifyfilemonitor.c
+++ b/gio/inotify/ginotifyfilemonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/inotify/ginotifyfilemonitor.h b/gio/inotify/ginotifyfilemonitor.h
index e97a40c..05837b9 100644
--- a/gio/inotify/ginotifyfilemonitor.h
+++ b/gio/inotify/ginotifyfilemonitor.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 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/>.
  *
  * Authors: Alexander Larsson <alexl redhat com>
  *          John McCutchan <john johnmccutchan com> 
diff --git a/gio/inotify/inotify-helper.c b/gio/inotify/inotify-helper.c
index f4ef8a4..9f0fcf6 100644
--- a/gio/inotify/inotify-helper.c
+++ b/gio/inotify/inotify-helper.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/>.
 
    Authors: 
                 John McCutchan <john johnmccutchan com>
diff --git a/gio/inotify/inotify-helper.h b/gio/inotify/inotify-helper.h
index 1fd9701..27bba70 100644
--- a/gio/inotify/inotify-helper.h
+++ b/gio/inotify/inotify-helper.h
@@ -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: John McCutchan <john johnmccutchan com>
 */
diff --git a/gio/inotify/inotify-kernel.c b/gio/inotify/inotify-kernel.c
index 3c205a6..81294fa 100644
--- a/gio/inotify/inotify-kernel.c
+++ b/gio/inotify/inotify-kernel.c
@@ -13,8 +13,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/>.
 
    Authors:.
                John McCutchan <john johnmccutchan com>
diff --git a/gio/inotify/inotify-kernel.h b/gio/inotify/inotify-kernel.h
index 104a189..e1a2b9c 100644
--- a/gio/inotify/inotify-kernel.h
+++ b/gio/inotify/inotify-kernel.h
@@ -13,8 +13,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/>.
 
    Authors:.
                John McCutchan <john johnmccutchan com>
diff --git a/gio/inotify/inotify-missing.c b/gio/inotify/inotify-missing.c
index 5ce241c..c2cb7ce 100644
--- a/gio/inotify/inotify-missing.c
+++ b/gio/inotify/inotify-missing.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/>.
 
    Authors: 
                 John McCutchan <john johnmccutchan com>
diff --git a/gio/inotify/inotify-missing.h b/gio/inotify/inotify-missing.h
index b67b595..58c0fb6 100644
--- a/gio/inotify/inotify-missing.h
+++ b/gio/inotify/inotify-missing.h
@@ -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: John McCutchan <ttb tentacle dhs org>
 */
diff --git a/gio/inotify/inotify-path.c b/gio/inotify/inotify-path.c
index 4025837..9d6c00e 100644
--- a/gio/inotify/inotify-path.c
+++ b/gio/inotify/inotify-path.c
@@ -17,8 +17,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/>.
 
    Authors:
                 John McCutchan <john johnmccutchan com>
diff --git a/gio/inotify/inotify-path.h b/gio/inotify/inotify-path.h
index 0027260..e985149 100644
--- a/gio/inotify/inotify-path.h
+++ b/gio/inotify/inotify-path.h
@@ -13,8 +13,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/>.
 
    Authors:.
                John McCutchan <john johnmccutchan com>
diff --git a/gio/inotify/inotify-sub.c b/gio/inotify/inotify-sub.c
index a4edc99..85b3411 100644
--- a/gio/inotify/inotify-sub.c
+++ b/gio/inotify/inotify-sub.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/>.
 
    Authors: 
                 John McCutchan <john johnmccutchan com>
diff --git a/gio/inotify/inotify-sub.h b/gio/inotify/inotify-sub.h
index 8c9593a..ff37567 100644
--- a/gio/inotify/inotify-sub.h
+++ b/gio/inotify/inotify-sub.h
@@ -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: John McCutchan <john johnmccutchan com>
 */
diff --git a/gio/strinfo.c b/gio/strinfo.c
index 777f23a..d0f6488 100644
--- a/gio/strinfo.c
+++ b/gio/strinfo.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/tests/cancellable.c b/gio/tests/cancellable.c
index deadb38..1cbd765 100644
--- a/gio/tests/cancellable.c
+++ b/gio/tests/cancellable.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/gio/tests/dbus-appinfo.c b/gio/tests/dbus-appinfo.c
index 7698429..2f5e691 100644
--- a/gio/tests/dbus-appinfo.c
+++ b/gio/tests/dbus-appinfo.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 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/>.
  *
  * Authors: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
index 241d331..9f26e0e 100644
--- a/gio/tests/desktop-app-info.c
+++ b/gio/tests/desktop-app-info.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 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: Matthias Clasen
  */
diff --git a/gio/tests/filter-cat.c b/gio/tests/filter-cat.c
index d2b9f5c..6697405 100644
--- a/gio/tests/filter-cat.c
+++ b/gio/tests/filter-cat.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gio/tests/gdbus-addresses.c b/gio/tests/gdbus-addresses.c
index c5a237d..96d07e1 100644
--- a/gio/tests/gdbus-addresses.c
+++ b/gio/tests/gdbus-addresses.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c
index a61a667..da9b207 100644
--- a/gio/tests/gdbus-auth.c
+++ b/gio/tests/gdbus-auth.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-bz627724.c b/gio/tests/gdbus-bz627724.c
index d3d8cac..132b2a0 100644
--- a/gio/tests/gdbus-bz627724.c
+++ b/gio/tests/gdbus-bz627724.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-close-pending.c b/gio/tests/gdbus-close-pending.c
index a707e08..c74ce66 100644
--- a/gio/tests/gdbus-close-pending.c
+++ b/gio/tests/gdbus-close-pending.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 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: Simon McVittie <simon mcvittie collabora co uk>
  */
diff --git a/gio/tests/gdbus-connection-flush-helper.c b/gio/tests/gdbus-connection-flush-helper.c
index dd9f4a7..2a8a39b 100644
--- a/gio/tests/gdbus-connection-flush-helper.c
+++ b/gio/tests/gdbus-connection-flush-helper.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-connection-flush.c b/gio/tests/gdbus-connection-flush.c
index b331e4b..7a82367 100644
--- a/gio/tests/gdbus-connection-flush.c
+++ b/gio/tests/gdbus-connection-flush.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 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: Simon McVittie <simon mcvittie collabora co uk>
  */
diff --git a/gio/tests/gdbus-connection-loss.c b/gio/tests/gdbus-connection-loss.c
index ed4142d..d807193 100644
--- a/gio/tests/gdbus-connection-loss.c
+++ b/gio/tests/gdbus-connection-loss.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-connection-slow.c b/gio/tests/gdbus-connection-slow.c
index 1ceb4e2..9c2f59a 100644
--- a/gio/tests/gdbus-connection-slow.c
+++ b/gio/tests/gdbus-connection-slow.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
index b3a5120..8d0b0df 100644
--- a/gio/tests/gdbus-connection.c
+++ b/gio/tests/gdbus-connection.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-error.c b/gio/tests/gdbus-error.c
index 96f3a76..ccdac97 100644
--- a/gio/tests/gdbus-error.c
+++ b/gio/tests/gdbus-error.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-exit-on-close.c b/gio/tests/gdbus-exit-on-close.c
index c431331..5ec6e93 100644
--- a/gio/tests/gdbus-exit-on-close.c
+++ b/gio/tests/gdbus-exit-on-close.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c
index 0d4d94b..7502023 100644
--- a/gio/tests/gdbus-export.c
+++ b/gio/tests/gdbus-export.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-introspection.c b/gio/tests/gdbus-introspection.c
index b7580f3..84ba23c 100644
--- a/gio/tests/gdbus-introspection.c
+++ b/gio/tests/gdbus-introspection.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c
index 36ffc41..7a88bbf 100644
--- a/gio/tests/gdbus-message.c
+++ b/gio/tests/gdbus-message.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-names.c b/gio/tests/gdbus-names.c
index b478c6f..af9dbe9 100644
--- a/gio/tests/gdbus-names.c
+++ b/gio/tests/gdbus-names.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-non-socket.c b/gio/tests/gdbus-non-socket.c
index b28d9bd..c0eae5e 100644
--- a/gio/tests/gdbus-non-socket.c
+++ b/gio/tests/gdbus-non-socket.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-overflow.c b/gio/tests/gdbus-overflow.c
index f78960b..507d565 100644
--- a/gio/tests/gdbus-overflow.c
+++ b/gio/tests/gdbus-overflow.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-peer-object-manager.c b/gio/tests/gdbus-peer-object-manager.c
index 7a19c71..01a36a5 100644
--- a/gio/tests/gdbus-peer-object-manager.c
+++ b/gio/tests/gdbus-peer-object-manager.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 gnome org>
  */
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index 6deee41..6c6f3b0 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-proxy-threads.c b/gio/tests/gdbus-proxy-threads.c
index 74df408..5181a9a 100644
--- a/gio/tests/gdbus-proxy-threads.c
+++ b/gio/tests/gdbus-proxy-threads.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 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: Simon McVittie <simon mcvittie collabora co uk>
  */
diff --git a/gio/tests/gdbus-proxy-well-known-name.c b/gio/tests/gdbus-proxy-well-known-name.c
index f22aa6e..72d23bd 100644
--- a/gio/tests/gdbus-proxy-well-known-name.c
+++ b/gio/tests/gdbus-proxy-well-known-name.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-proxy.c b/gio/tests/gdbus-proxy.c
index e550b52..384f4c7 100644
--- a/gio/tests/gdbus-proxy.c
+++ b/gio/tests/gdbus-proxy.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-serialization.c b/gio/tests/gdbus-serialization.c
index faf7229..f1b0214 100644
--- a/gio/tests/gdbus-serialization.c
+++ b/gio/tests/gdbus-serialization.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-sessionbus.c b/gio/tests/gdbus-sessionbus.c
index 13c2edb..773af55 100644
--- a/gio/tests/gdbus-sessionbus.c
+++ b/gio/tests/gdbus-sessionbus.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: Xavier Claessens <xavier claessens collabora co uk>
  */
diff --git a/gio/tests/gdbus-sessionbus.h b/gio/tests/gdbus-sessionbus.h
index 284cd00..ca10273 100644
--- a/gio/tests/gdbus-sessionbus.h
+++ b/gio/tests/gdbus-sessionbus.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: Xavier Claessens <xavier claessens collabora co uk>
  */
diff --git a/gio/tests/gdbus-test-codegen.c b/gio/tests/gdbus-test-codegen.c
index d4d9c36..62c17e0 100644
--- a/gio/tests/gdbus-test-codegen.c
+++ b/gio/tests/gdbus-test-codegen.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-tests.c b/gio/tests/gdbus-tests.c
index 77d6235..8b64e85 100644
--- a/gio/tests/gdbus-tests.c
+++ b/gio/tests/gdbus-tests.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-tests.h b/gio/tests/gdbus-tests.h
index 00d5580..538b265 100644
--- a/gio/tests/gdbus-tests.h
+++ b/gio/tests/gdbus-tests.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
index 1c1f1df..ee9dbe9 100644
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.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: David Zeuthen <davidz redhat com>
  */
diff --git a/gio/tests/gnotification-server.c b/gio/tests/gnotification-server.c
index 0df2d9f..300761b 100644
--- a/gio/tests/gnotification-server.c
+++ b/gio/tests/gnotification-server.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/tests/gnotification-server.h b/gio/tests/gnotification-server.h
index beec619..3ae3e73 100644
--- a/gio/tests/gnotification-server.h
+++ b/gio/tests/gnotification-server.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/tests/gnotification.c b/gio/tests/gnotification.c
index 5aee544..5ae989b 100644
--- a/gio/tests/gnotification.c
+++ b/gio/tests/gnotification.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 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/>.
  *
  * Authors: Lars Uebernickel <lars uebernic de>
  */
diff --git a/gio/tests/gtesttlsbackend.c b/gio/tests/gtesttlsbackend.c
index d951bdf..d08e2aa 100644
--- a/gio/tests/gtesttlsbackend.c
+++ b/gio/tests/gtesttlsbackend.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/>.
  */
 
 #include "gtesttlsbackend.h"
diff --git a/gio/tests/gtesttlsbackend.h b/gio/tests/gtesttlsbackend.h
index c745fb9..0c62d70 100644
--- a/gio/tests/gtesttlsbackend.h
+++ b/gio/tests/gtesttlsbackend.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/>.
  */
 
 #ifndef __G_TEST_TLS_BACKEND_H__
diff --git a/gio/tests/gtlsconsoleinteraction.c b/gio/tests/gtlsconsoleinteraction.c
index 7e1ed49..b3dcd69 100644
--- a/gio/tests/gtlsconsoleinteraction.c
+++ b/gio/tests/gtlsconsoleinteraction.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/gio/tests/gtlsconsoleinteraction.h b/gio/tests/gtlsconsoleinteraction.h
index eaf4d18..80fe321 100644
--- a/gio/tests/gtlsconsoleinteraction.h
+++ b/gio/tests/gtlsconsoleinteraction.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/gio/tests/network-monitor.c b/gio/tests/network-monitor.c
index 8901199..08d6008 100644
--- a/gio/tests/network-monitor.c
+++ b/gio/tests/network-monitor.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/>.
  */
 
 #include "gio.h"
diff --git a/gio/tests/pollable.c b/gio/tests/pollable.c
index 9cd79b0..24bd111 100644
--- a/gio/tests/pollable.c
+++ b/gio/tests/pollable.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/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/tests/proxy-test.c b/gio/tests/proxy-test.c
index af91f38..0cbe85c 100644
--- a/gio/tests/proxy-test.c
+++ b/gio/tests/proxy-test.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/>.
  */
 
 #include <string.h>
diff --git a/gio/tests/proxy.c b/gio/tests/proxy.c
index 5738300..8f687b9 100644
--- a/gio/tests/proxy.c
+++ b/gio/tests/proxy.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/>.
  *
  * Authors: Nicolas Dufresne <nicolas dufresne collabora co uk>
  */
diff --git a/gio/tests/resolver.c b/gio/tests/resolver.c
index 5f252f5..d4c2056 100644
--- a/gio/tests/resolver.c
+++ b/gio/tests/resolver.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 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/>.
  */
 
 #include "config.h"
diff --git a/gio/tests/resources.c b/gio/tests/resources.c
index f7c7a48..daa0e9d 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.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/>.
  */
 
 #include <string.h>
diff --git a/gio/tests/socket.c b/gio/tests/socket.c
index 2e4072b..7892b9c 100644
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.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/>.
  */
 
 #include <gio/gio.h>
diff --git a/gio/tests/test-io-stream.c b/gio/tests/test-io-stream.c
index 3338a9d..7ab7f91 100644
--- a/gio/tests/test-io-stream.c
+++ b/gio/tests/test-io-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 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: David Zeuthen <davidz redhat com>
  * Author: Simon McVittie <simon mcvittie collabora co uk>
diff --git a/gio/tests/test-io-stream.h b/gio/tests/test-io-stream.h
index 60feceb..2c58ba8 100644
--- a/gio/tests/test-io-stream.h
+++ b/gio/tests/test-io-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 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: David Zeuthen <davidz redhat com>
  * Author: Simon McVittie <simon mcvittie collabora co uk>
diff --git a/gio/tests/test-pipe-unix.c b/gio/tests/test-pipe-unix.c
index 4b348db..7b98044 100644
--- a/gio/tests/test-pipe-unix.c
+++ b/gio/tests/test-pipe-unix.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 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: Simon McVittie <simon mcvittie collabora co uk>
  */
diff --git a/gio/tests/test-pipe-unix.h b/gio/tests/test-pipe-unix.h
index 37a5a48..b281744 100644
--- a/gio/tests/test-pipe-unix.h
+++ b/gio/tests/test-pipe-unix.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 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: Simon McVittie <simon mcvittie collabora co uk>
  */
diff --git a/gio/tests/tls-certificate.c b/gio/tests/tls-certificate.c
index 07303ca..4d1de1d 100644
--- a/gio/tests/tls-certificate.c
+++ b/gio/tests/tls-certificate.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: Nicolas Dufresne <nicolas dufresne collabora com>
  */
diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c
index ce2aa88..5fc4b1e 100644
--- a/gio/tests/tls-interaction.c
+++ b/gio/tests/tls-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 collobora co uk>
  */
diff --git a/gio/thumbnail-verify.c b/gio/thumbnail-verify.c
index e50b281..bf5c60f 100644
--- a/gio/thumbnail-verify.c
+++ b/gio/thumbnail-verify.c
@@ -11,9 +11,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: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/thumbnail-verify.h b/gio/thumbnail-verify.h
index 3c1812c..a0becd0 100644
--- a/gio/thumbnail-verify.h
+++ b/gio/thumbnail-verify.h
@@ -11,9 +11,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: Ryan Lortie <desrt desrt ca>
  */
diff --git a/gio/win32/gwin32directorymonitor.c b/gio/win32/gwin32directorymonitor.c
index ded076a..b5f192e 100644
--- a/gio/win32/gwin32directorymonitor.c
+++ b/gio/win32/gwin32directorymonitor.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: Vlad Grecescu <b100dian gmail com>
  * 
diff --git a/gio/win32/gwin32directorymonitor.h b/gio/win32/gwin32directorymonitor.h
index 810f797..3e07748 100644
--- a/gio/win32/gwin32directorymonitor.h
+++ b/gio/win32/gwin32directorymonitor.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: Vlad Grecescu <b100dian gmail com>
  * 
diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c
index 84d5d77..160168d 100644
--- a/gio/win32/gwinhttpfile.c
+++ b/gio/win32/gwinhttpfile.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/win32/gwinhttpfile.h b/gio/win32/gwinhttpfile.h
index 9a0c392..10bf645 100644
--- a/gio/win32/gwinhttpfile.h
+++ b/gio/win32/gwinhttpfile.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/win32/gwinhttpfileinputstream.c b/gio/win32/gwinhttpfileinputstream.c
index 1d1d2a3..4842948 100644
--- a/gio/win32/gwinhttpfileinputstream.c
+++ b/gio/win32/gwinhttpfileinputstream.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/win32/gwinhttpfileinputstream.h b/gio/win32/gwinhttpfileinputstream.h
index 80e02b4..5f635d4 100644
--- a/gio/win32/gwinhttpfileinputstream.h
+++ b/gio/win32/gwinhttpfileinputstream.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/win32/gwinhttpfileoutputstream.c b/gio/win32/gwinhttpfileoutputstream.c
index 1c6888c..d596a68 100644
--- a/gio/win32/gwinhttpfileoutputstream.c
+++ b/gio/win32/gwinhttpfileoutputstream.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/win32/gwinhttpfileoutputstream.h b/gio/win32/gwinhttpfileoutputstream.h
index 4cc7e61..f532e72 100644
--- a/gio/win32/gwinhttpfileoutputstream.h
+++ b/gio/win32/gwinhttpfileoutputstream.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/win32/gwinhttpvfs.c b/gio/win32/gwinhttpvfs.c
index 1fcc167..dbe6af7 100644
--- a/gio/win32/gwinhttpvfs.c
+++ b/gio/win32/gwinhttpvfs.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/win32/gwinhttpvfs.h b/gio/win32/gwinhttpvfs.h
index f515168..e04c735 100644
--- a/gio/win32/gwinhttpvfs.h
+++ b/gio/win32/gwinhttpvfs.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 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: Alexander Larsson <alexl redhat com>
  * Author: Tor Lillqvist <tml novell com>
diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c
index f73b7f2..42dda58 100644
--- a/gio/xdgmime/xdgmime.c
+++ b/gio/xdgmime/xdgmime.c
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmime.h b/gio/xdgmime/xdgmime.h
index fadf59d..fda8a5c 100644
--- a/gio/xdgmime/xdgmime.h
+++ b/gio/xdgmime/xdgmime.h
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/gio/xdgmime/xdgmimealias.c b/gio/xdgmime/xdgmimealias.c
index 8740c3f..deea51e 100644
--- a/gio/xdgmime/xdgmimealias.c
+++ b/gio/xdgmime/xdgmimealias.c
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmimealias.h b/gio/xdgmime/xdgmimealias.h
index 06fc0c3..0ee7822 100644
--- a/gio/xdgmime/xdgmimealias.h
+++ b/gio/xdgmime/xdgmimealias.h
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __XDG_MIME_ALIAS_H__
diff --git a/gio/xdgmime/xdgmimecache.c b/gio/xdgmime/xdgmimecache.c
index 3a64deb..7998f29 100644
--- a/gio/xdgmime/xdgmimecache.c
+++ b/gio/xdgmime/xdgmimecache.c
@@ -19,9 +19,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmimecache.h b/gio/xdgmime/xdgmimecache.h
index 48756ad..7bcfcbc 100644
--- a/gio/xdgmime/xdgmimecache.h
+++ b/gio/xdgmime/xdgmimecache.h
@@ -19,9 +19,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __XDG_MIME_CACHE_H__
diff --git a/gio/xdgmime/xdgmimeglob.c b/gio/xdgmime/xdgmimeglob.c
index eeda2a5..73ef7a5 100644
--- a/gio/xdgmime/xdgmimeglob.c
+++ b/gio/xdgmime/xdgmimeglob.c
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmimeglob.h b/gio/xdgmime/xdgmimeglob.h
index d826434..fe942a3 100644
--- a/gio/xdgmime/xdgmimeglob.h
+++ b/gio/xdgmime/xdgmimeglob.h
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __XDG_MIME_GLOB_H__
diff --git a/gio/xdgmime/xdgmimeicon.c b/gio/xdgmime/xdgmimeicon.c
index 9658bd4..08322a4 100644
--- a/gio/xdgmime/xdgmimeicon.c
+++ b/gio/xdgmime/xdgmimeicon.c
@@ -19,9 +19,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmimeicon.h b/gio/xdgmime/xdgmimeicon.h
index 4f604c1..f130951 100644
--- a/gio/xdgmime/xdgmimeicon.h
+++ b/gio/xdgmime/xdgmimeicon.h
@@ -19,9 +19,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __XDG_MIME_ICON_H__
diff --git a/gio/xdgmime/xdgmimeint.c b/gio/xdgmime/xdgmimeint.c
index b2aa956..9faed72 100644
--- a/gio/xdgmime/xdgmimeint.c
+++ b/gio/xdgmime/xdgmimeint.c
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmimeint.h b/gio/xdgmime/xdgmimeint.h
index 232c808..de45868 100644
--- a/gio/xdgmime/xdgmimeint.h
+++ b/gio/xdgmime/xdgmimeint.h
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __XDG_MIME_INT_H__
diff --git a/gio/xdgmime/xdgmimemagic.c b/gio/xdgmime/xdgmimemagic.c
index 744eb5a..20bc2b4 100644
--- a/gio/xdgmime/xdgmimemagic.c
+++ b/gio/xdgmime/xdgmimemagic.c
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmimemagic.h b/gio/xdgmime/xdgmimemagic.h
index 35c8039..210a5bd 100644
--- a/gio/xdgmime/xdgmimemagic.h
+++ b/gio/xdgmime/xdgmimemagic.h
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __XDG_MIME_MAGIC_H__
diff --git a/gio/xdgmime/xdgmimeparent.c b/gio/xdgmime/xdgmimeparent.c
index 6c4cde0..b29cfd5 100644
--- a/gio/xdgmime/xdgmimeparent.c
+++ b/gio/xdgmime/xdgmimeparent.c
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gio/xdgmime/xdgmimeparent.h b/gio/xdgmime/xdgmimeparent.h
index fbc927e..d0a46c4 100644
--- a/gio/xdgmime/xdgmimeparent.h
+++ b/gio/xdgmime/xdgmimeparent.h
@@ -20,9 +20,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __XDG_MIME_PARENT_H__
diff --git a/glib-gettextize.in b/glib-gettextize.in
index 7166cf7..617d6bc 100644
--- a/glib-gettextize.in
+++ b/glib-gettextize.in
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 
 # - Modified in October 2001 by jacob berkman <jacob ximian com> to
diff --git a/glib/deprecated/gallocator.c b/glib/deprecated/gallocator.c
index a191eb6..2a8111c 100644
--- a/glib/deprecated/gallocator.c
+++ b/glib/deprecated/gallocator.c
@@ -10,9 +10,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/deprecated/gallocator.h b/glib/deprecated/gallocator.h
index a3dc2a1..3985075 100644
--- a/glib/deprecated/gallocator.h
+++ b/glib/deprecated/gallocator.h
@@ -10,9 +10,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_ALLOCATOR_H__
diff --git a/glib/deprecated/gcache.c b/glib/deprecated/gcache.c
index 5a59365..878c922 100644
--- a/glib/deprecated/gcache.c
+++ b/glib/deprecated/gcache.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/deprecated/gcache.h b/glib/deprecated/gcache.h
index a7854e0..1886f6b 100644
--- a/glib/deprecated/gcache.h
+++ b/glib/deprecated/gcache.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/deprecated/gcompletion.c b/glib/deprecated/gcompletion.c
index fb5ab61..cd46746 100644
--- a/glib/deprecated/gcompletion.c
+++ b/glib/deprecated/gcompletion.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/deprecated/gcompletion.h b/glib/deprecated/gcompletion.h
index fa77596..8b9afd9 100644
--- a/glib/deprecated/gcompletion.h
+++ b/glib/deprecated/gcompletion.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/deprecated/gmain.h b/glib/deprecated/gmain.h
index bb62240..c2e31ff 100644
--- a/glib/deprecated/gmain.h
+++ b/glib/deprecated/gmain.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/deprecated/grel.h b/glib/deprecated/grel.h
index b76e006..bc26dd1 100644
--- a/glib/deprecated/grel.h
+++ b/glib/deprecated/grel.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c
index 89dba4d..02153ad 100644
--- a/glib/deprecated/gthread-deprecated.c
+++ b/glib/deprecated/gthread-deprecated.c
@@ -16,9 +16,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h
index 500f72f..9d1c685 100644
--- a/glib/deprecated/gthread.h
+++ b/glib/deprecated/gthread.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/docs.c b/glib/docs.c
index f74f783..ac57f12 100644
--- a/glib/docs.c
+++ b/glib/docs.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Matthias Clasen
  */
diff --git a/glib/galloca.h b/glib/galloca.h
index 8ece1b2..d6b49a1 100644
--- a/glib/galloca.h
+++ b/glib/galloca.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/garray.c b/glib/garray.c
index a942374..9640e1e 100644
--- a/glib/garray.c
+++ b/glib/garray.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/garray.h b/glib/garray.h
index 7fe8c2f..686245b 100644
--- a/glib/garray.h
+++ b/glib/garray.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c
index 075266f..6aa7611 100644
--- a/glib/gasyncqueue.c
+++ b/glib/gasyncqueue.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h
index 3d4b38f..fa9565f 100644
--- a/glib/gasyncqueue.h
+++ b/glib/gasyncqueue.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gasyncqueueprivate.h b/glib/gasyncqueueprivate.h
index 3ecb29a..bff9ecc 100644
--- a/glib/gasyncqueueprivate.h
+++ b/glib/gasyncqueueprivate.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_ASYNCQUEUEPRIVATE_H__
diff --git a/glib/gatomic.c b/glib/gatomic.c
index eb2fe46..9327b6b 100644
--- a/glib/gatomic.c
+++ b/glib/gatomic.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gatomic.h b/glib/gatomic.h
index e7fd1f2..afe4b60 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 5501c60..ea335de 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index 47dd2ee..76ed832 100644
--- a/glib/gbacktrace.h
+++ b/glib/gbacktrace.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gbase64.c b/glib/gbase64.c
index cc6cbfc..7c7ab7b 100644
--- a/glib/gbase64.c
+++ b/glib/gbase64.c
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * This is based on code in camel, written by:
  *    Michael Zucchi <notzed ximian com>
diff --git a/glib/gbase64.h b/glib/gbase64.h
index b53fca5..4018f0d 100644
--- a/glib/gbase64.h
+++ b/glib/gbase64.h
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_BASE64_H__
diff --git a/glib/gbitlock.c b/glib/gbitlock.c
index 12075c9..572c2d1 100644
--- a/glib/gbitlock.c
+++ b/glib/gbitlock.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gbitlock.h b/glib/gbitlock.h
index 7485dfa..5fab494 100644
--- a/glib/gbitlock.h
+++ b/glib/gbitlock.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gbytes.c b/glib/gbytes.c
index ac73f37..a22500b 100644
--- a/glib/gbytes.c
+++ b/glib/gbytes.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  *         Stef Walter <stefw collabora co uk>
diff --git a/glib/gbytes.h b/glib/gbytes.h
index c89f6eb..24f1856 100644
--- a/glib/gbytes.h
+++ b/glib/gbytes.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  *         Stef Walter <stefw collabora co uk>
diff --git a/glib/gcharset.c b/glib/gcharset.c
index bb8c044..1611187 100644
--- a/glib/gcharset.c
+++ b/glib/gcharset.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gcharset.h b/glib/gcharset.h
index f3b306d..e90a5f6 100644
--- a/glib/gcharset.h
+++ b/glib/gcharset.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 #ifndef __G_CHARSET_H__
diff --git a/glib/gcharsetprivate.h b/glib/gcharsetprivate.h
index aea1384..1529423 100644
--- a/glib/gcharsetprivate.h
+++ b/glib/gcharsetprivate.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_CHARSET_PRIVATE_H__
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index 4dc8558..d8f2e15 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gchecksum.h b/glib/gchecksum.h
index ba500a2..af32757 100644
--- a/glib/gchecksum.h
+++ b/glib/gchecksum.h
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_CHECKSUM_H__
diff --git a/glib/gconvert.c b/glib/gconvert.c
index fd8f04e..19c872a 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gconvert.h b/glib/gconvert.h
index 3df66ce..ee7ece7 100644
--- a/glib/gconvert.h
+++ b/glib/gconvert.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gdataset.c b/glib/gdataset.c
index f0919b3..92325b7 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -15,8 +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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gdataset.h b/glib/gdataset.h
index 6d69e60..d8d59c9 100644
--- a/glib/gdataset.h
+++ b/glib/gdataset.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gdatasetprivate.h b/glib/gdatasetprivate.h
index 80d0ccf..4f98040 100644
--- a/glib/gdatasetprivate.h
+++ b/glib/gdatasetprivate.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gdate.c b/glib/gdate.c
index 46c9332..a2db8ad 100644
--- a/glib/gdate.c
+++ b/glib/gdate.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gdate.h b/glib/gdate.h
index ad02879..ff4b8c1 100644
--- a/glib/gdate.h
+++ b/glib/gdate.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gdir.c b/glib/gdir.c
index 4f17981..a9540fd 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -17,9 +17,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gdir.h b/glib/gdir.h
index 7b6ec1b..6ff2455 100644
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -16,9 +16,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_DIR_H__
diff --git a/glib/gen-unicode-tables.pl b/glib/gen-unicode-tables.pl
old mode 100755
new mode 100644
index d111d91..37d9de9
--- a/glib/gen-unicode-tables.pl
+++ b/glib/gen-unicode-tables.pl
@@ -14,9 +14,7 @@
 #    GNU General Public License for more details.
 
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#    02111-1307, USA.
+#    along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # Contributer(s):
 #   Andrew Taylor <andrew taylor montage ca>
diff --git a/glib/genviron.c b/glib/genviron.c
index 01e8b82..d60371b 100644
--- a/glib/genviron.c
+++ b/glib/genviron.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/genviron.h b/glib/genviron.h
index 1fcc225..7268a56 100644
--- a/glib/genviron.h
+++ b/glib/genviron.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gerror.c b/glib/gerror.c
index 81e6b71..438d158 100644
--- a/glib/gerror.c
+++ b/glib/gerror.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gerror.h b/glib/gerror.h
index 6224b87..37ab437 100644
--- a/glib/gerror.h
+++ b/glib/gerror.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 #ifndef __G_ERROR_H__
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 4ea8ade..faadc57 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #include "config.h"
diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index 93dbde3..604c7fd 100644
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #ifndef __G_FILEUTILS_H__
diff --git a/glib/ggettext.c b/glib/ggettext.c
index 79abf0c..61d20d1 100644
--- a/glib/ggettext.c
+++ b/glib/ggettext.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/ggettext.h b/glib/ggettext.h
index e1ef576..96cc6ac 100644
--- a/glib/ggettext.h
+++ b/glib/ggettext.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/ghash.c b/glib/ghash.c
index 256c843..ac91d50 100644
--- a/glib/ghash.c
+++ b/glib/ghash.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/ghash.h b/glib/ghash.h
index 1253076..d353088 100644
--- a/glib/ghash.h
+++ b/glib/ghash.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/ghmac.c b/glib/ghmac.c
index 1da1b7f..7f717a2 100644
--- a/glib/ghmac.c
+++ b/glib/ghmac.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw collabora co uk>
  */
diff --git a/glib/ghmac.h b/glib/ghmac.h
index 94bc427..01d53aa 100644
--- a/glib/ghmac.h
+++ b/glib/ghmac.h
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_HMAC_H__
diff --git a/glib/ghook.c b/glib/ghook.c
index 249a160..0fcde0e 100644
--- a/glib/ghook.c
+++ b/glib/ghook.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/ghook.h b/glib/ghook.h
index 45e1e27..f0b6516 100644
--- a/glib/ghook.h
+++ b/glib/ghook.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/ghostutils.c b/glib/ghostutils.c
index 99afe9a..2af7d0c 100644
--- a/glib/ghostutils.c
+++ b/glib/ghostutils.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 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/>.
  */
 
 #include "config.h"
diff --git a/glib/ghostutils.h b/glib/ghostutils.h
index dfb64e5..4c47881 100644
--- a/glib/ghostutils.h
+++ b/glib/ghostutils.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 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/>.
  */
 
 #ifndef __G_HOST_UTILS_H__
diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index ca002a7..150a268 100644
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_I18N_LIB_H__
diff --git a/glib/gi18n.h b/glib/gi18n.h
index c710046..f765c3d 100644
--- a/glib/gi18n.h
+++ b/glib/gi18n.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_I18N_H__
diff --git a/glib/giochannel.c b/glib/giochannel.c
index b9c45df..33a3c94 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/giochannel.h b/glib/giochannel.h
index 75fa1ef..ed098ed 100644
--- a/glib/giochannel.h
+++ b/glib/giochannel.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/giounix.c b/glib/giounix.c
index 517e36b..bb773c3 100644
--- a/glib/giounix.c
+++ b/glib/giounix.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/giowin32.c b/glib/giowin32.c
index 72cd84b..171fb68 100644
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -17,9 +17,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 639dd64..d7a6648 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -19,8 +19,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #include "config.h"
diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h
index 3fdfc29..0c8d3e5 100644
--- a/glib/gkeyfile.h
+++ b/glib/gkeyfile.h
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #ifndef __G_KEY_FILE_H__
diff --git a/glib/glib-init.c b/glib/glib-init.c
index 02b66c0..875844d 100644
--- a/glib/glib-init.c
+++ b/glib/glib-init.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/glib-init.h b/glib/glib-init.h
index 5b150a4..de6be78 100644
--- a/glib/glib-init.h
+++ b/glib/glib-init.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/glib-object.h b/glib/glib-object.h
index 336ba93..5d9b83e 100644
--- a/glib/glib-object.h
+++ b/glib/glib-object.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 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/>.
  */
 #ifndef __GLIB_GOBJECT_H__
 #define __GLIB_GOBJECT_H__
diff --git a/glib/glib-private.c b/glib/glib-private.c
index c357502..bbf879f 100644
--- a/glib/glib-private.c
+++ b/glib/glib-private.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Colin Walters <walters verbum org>
  */
diff --git a/glib/glib-private.h b/glib/glib-private.h
index 6195ad9..fd2e985 100644
--- a/glib/glib-private.h
+++ b/glib/glib-private.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GLIB_PRIVATE_H__
diff --git a/glib/glib-unix.c b/glib/glib-unix.c
index 8f1fe1c..ec8cc5c 100644
--- a/glib/glib-unix.c
+++ b/glib/glib-unix.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Colin Walters <walters verbum org>
  */
diff --git a/glib/glib-unix.h b/glib/glib-unix.h
index 66ccf74..f29ed59 100644
--- a/glib/glib-unix.h
+++ b/glib/glib-unix.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_UNIX_H__
diff --git a/glib/glib.h b/glib/glib.h
index ce7447e..c7fc999 100644
--- a/glib/glib.h
+++ b/glib/glib.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/glib_trace.h b/glib/glib_trace.h
index 789e88d..3818374 100644
--- a/glib/glib_trace.h
+++ b/glib/glib_trace.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/glib/glist.c b/glib/glist.c
index 8425ad3..30c0a5b 100644
--- a/glib/glist.c
+++ b/glib/glist.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/glist.h b/glib/glist.h
index 120e788..bf5614e 100644
--- a/glib/glist.h
+++ b/glib/glist.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 8a36671..a181c97 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gmain-internal.h b/glib/gmain-internal.h
index 97775ca..a9cd70d 100644
--- a/glib/gmain-internal.h
+++ b/glib/gmain-internal.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_MAIN_INTERNAL_H__
diff --git a/glib/gmain.c b/glib/gmain.c
index eb3d1e1..1ff5db4 100644
--- a/glib/gmain.c
+++ b/glib/gmain.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gmain.h b/glib/gmain.h
index c455353..255a39b 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_MAIN_H__
diff --git a/glib/gmappedfile.c b/glib/gmappedfile.c
index 1c019e1..603028b 100644
--- a/glib/gmappedfile.c
+++ b/glib/gmappedfile.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h
index a1c7ac7..b566b7d 100644
--- a/glib/gmappedfile.h
+++ b/glib/gmappedfile.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_MAPPED_FILE_H__
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 89404e5..b9c88a9 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #include "config.h"
diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index 96425db..c7efea5 100644
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #ifndef __G_MARKUP_H__
diff --git a/glib/gmem.c b/glib/gmem.c
index 44e1280..ec1c1cc 100644
--- a/glib/gmem.c
+++ b/glib/gmem.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gmem.h b/glib/gmem.h
index 8795b67..e1d88d5 100644
--- a/glib/gmem.h
+++ b/glib/gmem.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gmessages.c b/glib/gmessages.c
index a118002..60eaab0 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gmessages.h b/glib/gmessages.h
index d58fd8a..d0b8406 100644
--- a/glib/gmessages.h
+++ b/glib/gmessages.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gnode.c b/glib/gnode.c
index 799e131..6fcc651 100644
--- a/glib/gnode.c
+++ b/glib/gnode.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gnode.h b/glib/gnode.h
index 71f60ab..763ac90 100644
--- a/glib/gnode.h
+++ b/glib/gnode.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gnulib/asnprintf.c b/glib/gnulib/asnprintf.c
index 765d98c..e4453ef 100644
--- a/glib/gnulib/asnprintf.c
+++ b/glib/gnulib/asnprintf.c
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/glib/gnulib/g-gnulib.h b/glib/gnulib/g-gnulib.h
index 88f3e0e..41d414c 100644
--- a/glib/gnulib/g-gnulib.h
+++ b/glib/gnulib/g-gnulib.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __G_GNULIB_H__
 
diff --git a/glib/gnulib/printf-args.c b/glib/gnulib/printf-args.c
index 75a2a54..0530d37 100644
--- a/glib/gnulib/printf-args.c
+++ b/glib/gnulib/printf-args.c
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/glib/gnulib/printf-args.h b/glib/gnulib/printf-args.h
index 0825675..250ce7e 100644
--- a/glib/gnulib/printf-args.h
+++ b/glib/gnulib/printf-args.h
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _PRINTF_ARGS_H
 #define _PRINTF_ARGS_H
diff --git a/glib/gnulib/printf-parse.c b/glib/gnulib/printf-parse.c
index 961b081..da7b4e0 100644
--- a/glib/gnulib/printf-parse.c
+++ b/glib/gnulib/printf-parse.c
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/glib/gnulib/printf-parse.h b/glib/gnulib/printf-parse.h
index ab41478..90f92a9 100644
--- a/glib/gnulib/printf-parse.h
+++ b/glib/gnulib/printf-parse.h
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _PRINTF_PARSE_H
 #define _PRINTF_PARSE_H
diff --git a/glib/gnulib/printf.c b/glib/gnulib/printf.c
index b339299..6edca1a 100644
--- a/glib/gnulib/printf.c
+++ b/glib/gnulib/printf.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gnulib/printf.h b/glib/gnulib/printf.h
index a7be56f..ac29be4 100644
--- a/glib/gnulib/printf.h
+++ b/glib/gnulib/printf.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __GNULIB_PRINTF_H__
 #define __GNULIB_PRINTF_H__
diff --git a/glib/gnulib/vasnprintf.c b/glib/gnulib/vasnprintf.c
index 5ecc419..ee0a43a 100644
--- a/glib/gnulib/vasnprintf.c
+++ b/glib/gnulib/vasnprintf.c
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _WIN32
 /* Tell glibc's <stdio.h> to provide a prototype for snprintf().
diff --git a/glib/gnulib/vasnprintf.h b/glib/gnulib/vasnprintf.h
index 65f1bc1..7affec1 100644
--- a/glib/gnulib/vasnprintf.h
+++ b/glib/gnulib/vasnprintf.h
@@ -12,9 +12,7 @@
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _VASNPRINTF_H
 #define _VASNPRINTF_H
diff --git a/glib/goption.c b/glib/goption.c
index a7ad7c6..db71037 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/glib/goption.h b/glib/goption.h
index 78df2ec..3162dd2 100644
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_OPTION_H__
diff --git a/glib/gpattern.c b/glib/gpattern.c
index c06fef3..be5951d 100644
--- a/glib/gpattern.c
+++ b/glib/gpattern.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gpattern.h b/glib/gpattern.h
index 956b003..4263a8f 100644
--- a/glib/gpattern.h
+++ b/glib/gpattern.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_PATTERN_H__
diff --git a/glib/gpoll.c b/glib/gpoll.c
index 5d1e632..61102bc 100644
--- a/glib/gpoll.c
+++ b/glib/gpoll.c
@@ -16,9 +16,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gpoll.h b/glib/gpoll.h
index 3ba8420..7790957 100644
--- a/glib/gpoll.h
+++ b/glib/gpoll.h
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_POLL_H__
diff --git a/glib/gprimes.c b/glib/gprimes.c
index 6e27343..caa6418 100644
--- a/glib/gprimes.c
+++ b/glib/gprimes.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gprimes.h b/glib/gprimes.h
index 536ace4..2b22814 100644
--- a/glib/gprimes.h
+++ b/glib/gprimes.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gprintf.c b/glib/gprintf.c
index f106a11..583695b 100644
--- a/glib/gprintf.c
+++ b/glib/gprintf.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gprintf.h b/glib/gprintf.h
index 0b01cc4..212c337 100644
--- a/glib/gprintf.h
+++ b/glib/gprintf.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_PRINTF_H__
diff --git a/glib/gprintfint.h b/glib/gprintfint.h
index 0c975a1..88c6170 100644
--- a/glib/gprintfint.h
+++ b/glib/gprintfint.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gqsort.c b/glib/gqsort.c
index fc699ea..e63264e 100644
--- a/glib/gqsort.c
+++ b/glib/gqsort.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gqsort.h b/glib/gqsort.h
index c67d949..904b506 100644
--- a/glib/gqsort.h
+++ b/glib/gqsort.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gquark.c b/glib/gquark.c
index 9762dd6..c9750df 100644
--- a/glib/gquark.c
+++ b/glib/gquark.c
@@ -15,8 +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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gquark.h b/glib/gquark.h
index 617dbd2..87fb713 100644
--- a/glib/gquark.h
+++ b/glib/gquark.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gqueue.c b/glib/gqueue.c
index 6860a19..a78c08c 100644
--- a/glib/gqueue.c
+++ b/glib/gqueue.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gqueue.h b/glib/gqueue.h
index 23536a4..4521ea9 100644
--- a/glib/gqueue.h
+++ b/glib/gqueue.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/grand.c b/glib/grand.c
index aa9501c..fd657b6 100644
--- a/glib/grand.c
+++ b/glib/grand.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Originally developed and coded by Makoto Matsumoto and Takuji
diff --git a/glib/grand.h b/glib/grand.h
index b121e50..9011404 100644
--- a/glib/grand.h
+++ b/glib/grand.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 9d73749..42151c0 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gscanner.h b/glib/gscanner.h
index 499d6e5..704c2cb 100644
--- a/glib/gscanner.h
+++ b/glib/gscanner.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gsequence.c b/glib/gsequence.c
index ec23aca..a17953b 100644
--- a/glib/gsequence.c
+++ b/glib/gsequence.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gsequence.h b/glib/gsequence.h
index 81d06a2..9939132 100644
--- a/glib/gsequence.h
+++ b/glib/gsequence.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_SEQUENCE_H__
diff --git a/glib/gslice.c b/glib/gslice.c
index 8b541cc..9da316a 100644
--- a/glib/gslice.c
+++ b/glib/gslice.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 /* MT safe */
 
diff --git a/glib/gslice.h b/glib/gslice.h
index e1b6686..411140f 100644
--- a/glib/gslice.h
+++ b/glib/gslice.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_SLICE_H__
diff --git a/glib/gslist.c b/glib/gslist.c
index 7cec285..0143ded 100644
--- a/glib/gslist.c
+++ b/glib/gslist.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gslist.h b/glib/gslist.h
index 55b91c6..9d6e50a 100644
--- a/glib/gslist.h
+++ b/glib/gslist.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gstdio.c b/glib/gstdio.c
index 28e1f68..4fff212 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #include "config.h"
diff --git a/glib/gstdio.h b/glib/gstdio.h
index 90ee74e..7601f5e 100644
--- a/glib/gstdio.h
+++ b/glib/gstdio.h
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 
 #ifndef __G_STDIO_H__
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index bf8fa18..019a348 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 9958d69..ff513f2 100644
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gstring.c b/glib/gstring.c
index 782fd4a..2a0f255 100644
--- a/glib/gstring.c
+++ b/glib/gstring.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gstring.h b/glib/gstring.h
index 0cbba5d..c8d5b8a 100644
--- a/glib/gstring.h
+++ b/glib/gstring.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gstringchunk.c b/glib/gstringchunk.c
index 359aeea..41eb46c 100644
--- a/glib/gstringchunk.c
+++ b/glib/gstringchunk.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gstringchunk.h b/glib/gstringchunk.h
index 79848e1..dde2363 100644
--- a/glib/gstringchunk.h
+++ b/glib/gstringchunk.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gtester-report b/glib/gtester-report
old mode 100755
new mode 100644
index 0131714..5bf076c
--- a/glib/gtester-report
+++ b/glib/gtester-report
@@ -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 library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
 import datetime
 import optparse
 import sys, re, xml.dom.minidom
diff --git a/glib/gtester.c b/glib/gtester.c
index 507742f..0f0cc11 100644
--- a/glib/gtester.c
+++ b/glib/gtester.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 651a712..4d8dbb8 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 0118c50..d6b3e52 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_TEST_UTILS_H__
diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index 786dcb4..ae6d34b 100644
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index c54f2bd..275ecc6 100644
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -16,9 +16,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gthread.c b/glib/gthread.c
index 2df13c4..a7687e4 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -16,9 +16,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Prelude {{{1 ----------------------------------------------------------- */
diff --git a/glib/gthread.h b/glib/gthread.h
index 43c7891..3f026f6 100644
--- a/glib/gthread.h
+++ b/glib/gthread.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c
index a122d8d..d8f1e70 100644
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h
index c05d700..b46987d 100644
--- a/glib/gthreadpool.h
+++ b/glib/gthreadpool.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
index 15584f4..198b29a 100644
--- a/glib/gthreadprivate.h
+++ b/glib/gthreadprivate.h
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 #ifndef __G_THREADPRIVATE_H__
diff --git a/glib/gtimer.c b/glib/gtimer.c
index 3273627..3635997 100644
--- a/glib/gtimer.c
+++ b/glib/gtimer.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gtimer.h b/glib/gtimer.h
index 702e002..b897f1f 100644
--- a/glib/gtimer.h
+++ b/glib/gtimer.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 256ac80..fa91f33 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gtimezone.h b/glib/gtimezone.h
index 536acb1..3e6f1cb 100644
--- a/glib/gtimezone.h
+++ b/glib/gtimezone.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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gtrashstack.c b/glib/gtrashstack.c
index 71bac8d..64bbf2c 100644
--- a/glib/gtrashstack.c
+++ b/glib/gtrashstack.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gtrashstack.h b/glib/gtrashstack.h
index bff504d..3e513a0 100644
--- a/glib/gtrashstack.h
+++ b/glib/gtrashstack.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gtree.c b/glib/gtree.c
index d588330..803b2aa 100644
--- a/glib/gtree.c
+++ b/glib/gtree.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gtree.h b/glib/gtree.h
index 34cb8bb..56a3292 100644
--- a/glib/gtree.h
+++ b/glib/gtree.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gtypes.h b/glib/gtypes.h
index c18e0bf..d01c810 100644
--- a/glib/gtypes.h
+++ b/glib/gtypes.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gunibreak.c b/glib/gunibreak.c
index 4b4f0e2..266e6b1 100644
--- a/glib/gunibreak.c
+++ b/glib/gunibreak.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 #include "config.h"
diff --git a/glib/gunicode.h b/glib/gunicode.h
index fdf1086..52fdd4d 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 #ifndef __G_UNICODE_H__
diff --git a/glib/gunicodeprivate.h b/glib/gunicodeprivate.h
index c5af3b5..dde5ee5 100644
--- a/glib/gunicodeprivate.h
+++ b/glib/gunicodeprivate.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_UNICODE_PRIVATE_H__
diff --git a/glib/gunicollate.c b/glib/gunicollate.c
index 3815800..b8a1481 100644
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -14,8 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 #include "config.h"
diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 2ee9894..b8e33cb 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 /**
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 2211818..d0f8795 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gurifuncs.c b/glib/gurifuncs.c
index b2128a2..54f9a0f 100644
--- a/glib/gurifuncs.c
+++ b/glib/gurifuncs.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h
index 9f89770..e36ac0d 100644
--- a/glib/gurifuncs.h
+++ b/glib/gurifuncs.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/glib/gutf8.c b/glib/gutf8.c
index c0ac8cb..76acb35 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gutils.c b/glib/gutils.c
index 6ed1a65..fccf994 100644
--- a/glib/gutils.c
+++ b/glib/gutils.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gutils.h b/glib/gutils.h
index 3b29b57..038f3c4 100644
--- a/glib/gutils.h
+++ b/glib/gutils.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
index dc20c32..524a13d 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/glib/gvariant-core.h b/glib/gvariant-core.h
index d5a653d..034dd43 100644
--- a/glib/gvariant-core.h
+++ b/glib/gvariant-core.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __G_VARIANT_CORE_H__
diff --git a/glib/gvariant-internal.h b/glib/gvariant-internal.h
index 7d7eb99..6bf19ad 100644
--- a/glib/gvariant-internal.h
+++ b/glib/gvariant-internal.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c
index de00c36..e4a551e 100644
--- a/glib/gvariant-parser.c
+++ b/glib/gvariant-parser.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
index 4c8425a..5df7fc3 100644
--- a/glib/gvariant-serialiser.c
+++ b/glib/gvariant-serialiser.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvariant-serialiser.h b/glib/gvariant-serialiser.h
index b003aed..2be3299 100644
--- a/glib/gvariant-serialiser.h
+++ b/glib/gvariant-serialiser.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 0e02867..6c9a9c6 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvariant.h b/glib/gvariant.h
index e214f5e..7ec6897 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
index 658af77..772daae 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index 81e324f..e3a562f 100644
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c
index 7a76d27..b398d65 100644
--- a/glib/gvarianttypeinfo.c
+++ b/glib/gvarianttypeinfo.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gvarianttypeinfo.h b/glib/gvarianttypeinfo.h
index 7247bf2..0714d78 100644
--- a/glib/gvarianttypeinfo.h
+++ b/glib/gvarianttypeinfo.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gversion.c b/glib/gversion.c
index 70650b3..e8d71b8 100644
--- a/glib/gversion.c
+++ b/glib/gversion.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gversion.h b/glib/gversion.h
index 7eb414d..ab341aa 100644
--- a/glib/gversion.h
+++ b/glib/gversion.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index 2aa23af..78c1e7e 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gwakeup.c b/glib/gwakeup.c
index 2aec2f5..7125a4b 100644
--- a/glib/gwakeup.c
+++ b/glib/gwakeup.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gwakeup.h b/glib/gwakeup.h
index d871cdf..adf415c 100644
--- a/glib/gwakeup.h
+++ b/glib/gwakeup.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt desrt ca>
  */
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 0cc1181..17034d1 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/gwin32.h b/glib/gwin32.h
index f60f38d..b466b63 100644
--- a/glib/gwin32.h
+++ b/glib/gwin32.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/libcharset/README b/glib/libcharset/README
index c8f53bd..6710660 100644
--- a/glib/libcharset/README
+++ b/glib/libcharset/README
@@ -39,8 +39,6 @@ Behdad Esfahbod
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <haible clisp cons org>.  */
diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c
index 3bce1e2..a819835 100644
--- a/glib/tests/array-test.c
+++ b/glib/tests/array-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/cache.c b/glib/tests/cache.c
index e80c5af..ec34df9 100644
--- a/glib/tests/cache.c
+++ b/glib/tests/cache.c
@@ -11,9 +11,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* We are testing some deprecated APIs here */
diff --git a/glib/tests/convert.c b/glib/tests/convert.c
index 6e0b5fd..a712ff3 100644
--- a/glib/tests/convert.c
+++ b/glib/tests/convert.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/hash.c b/glib/tests/hash.c
index be8c227..332f821 100644
--- a/glib/tests/hash.c
+++ b/glib/tests/hash.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/hostutils.c b/glib/tests/hostutils.c
index 106a7de..275bb30 100644
--- a/glib/tests/hostutils.c
+++ b/glib/tests/hostutils.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 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/>.
  */
 
 #include <glib/glib.h>
diff --git a/glib/tests/markups/valid-14.expected b/glib/tests/markups/valid-14.expected
index cea1fdd..452595c 100644
--- a/glib/tests/markups/valid-14.expected
+++ b/glib/tests/markups/valid-14.expected
@@ -20,8 +20,7 @@ ELEMENT 'foo'
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 '
   END 'bar'
diff --git a/glib/tests/markups/valid-14.gmarkup b/glib/tests/markups/valid-14.gmarkup
index f999a34..6253d43 100644
--- a/glib/tests/markups/valid-14.gmarkup
+++ b/glib/tests/markups/valid-14.gmarkup
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; 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/>.
  */
 </bar>
 </foo>
diff --git a/glib/tests/node.c b/glib/tests/node.c
index b6b0be2..e3b515f 100644
--- a/glib/tests/node.c
+++ b/glib/tests/node.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/pattern.c b/glib/tests/pattern.c
index 52ab7a3..538c4d2 100644
--- a/glib/tests/pattern.c
+++ b/glib/tests/pattern.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #undef G_DISABLE_ASSERT
diff --git a/glib/tests/regex.c b/glib/tests/regex.c
index ea7385f..cc76077 100644
--- a/glib/tests/regex.c
+++ b/glib/tests/regex.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #undef G_DISABLE_ASSERT
diff --git a/glib/tests/scannerapi.c b/glib/tests/scannerapi.c
index 85d8a02..0505e47 100644
--- a/glib/tests/scannerapi.c
+++ b/glib/tests/scannerapi.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <glib.h>
 #include <string.h>
diff --git a/glib/tests/shell.c b/glib/tests/shell.c
index 41e9d68..a1b92dd 100644
--- a/glib/tests/shell.c
+++ b/glib/tests/shell.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/sort.c b/glib/tests/sort.c
index ef6af50..bb30677 100644
--- a/glib/tests/sort.c
+++ b/glib/tests/sort.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/glib/tests/tree.c b/glib/tests/tree.c
index 70f4247..a8da67d 100644
--- a/glib/tests/tree.c
+++ b/glib/tests/tree.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/uri.c b/glib/tests/uri.c
index 0fc7657..83a2f10 100644
--- a/glib/tests/uri.c
+++ b/glib/tests/uri.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/utf8-performance.c b/glib/tests/utf8-performance.c
index fa1e2c2..20e5e02 100644
--- a/glib/tests/utf8-performance.c
+++ b/glib/tests/utf8-performance.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <string.h>
diff --git a/glib/tests/utf8-pointer.c b/glib/tests/utf8-pointer.c
index 6ef27d3..90c128f 100644
--- a/glib/tests/utf8-pointer.c
+++ b/glib/tests/utf8-pointer.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/glib/tests/utf8-validate.c b/glib/tests/utf8-validate.c
index 390625f..331d919 100644
--- a/glib/tests/utf8-validate.c
+++ b/glib/tests/utf8-validate.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "glib.h"
diff --git a/gmodule/gmodule-ar.c b/gmodule/gmodule-ar.c
index 8bc847d..64e4307 100644
--- a/gmodule/gmodule-ar.c
+++ b/gmodule/gmodule-ar.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* 
diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
index a606f17..20225df 100644
--- a/gmodule/gmodule-dl.c
+++ b/gmodule/gmodule-dl.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/gmodule/gmodule-dyld.c b/gmodule/gmodule-dyld.c
index 1896b43..20bf8a3 100644
--- a/gmodule/gmodule-dyld.c
+++ b/gmodule/gmodule-dyld.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 
diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c
index 557250f..2a35b19 100644
--- a/gmodule/gmodule-win32.c
+++ b/gmodule/gmodule-win32.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index b1f2117..6810787 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h
index cb9b119..194fa6e 100644
--- a/gmodule/gmodule.h
+++ b/gmodule/gmodule.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/gmodule/gmoduleconf.h.in b/gmodule/gmoduleconf.h.in
index d954c2e..eea0679 100644
--- a/gmodule/gmoduleconf.h.in
+++ b/gmodule/gmoduleconf.h.in
@@ -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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __G_MODULE_CONF_H__
 #define __G_MODULE_CONF_H__
diff --git a/gmodule/gmoduleconf.h.win32 b/gmodule/gmoduleconf.h.win32
index a0fe3af..88633b5 100644
--- a/gmodule/gmoduleconf.h.win32
+++ b/gmodule/gmoduleconf.h.win32
@@ -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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __G_MODULE_CONF_H__
 #define __G_MODULE_CONF_H__
diff --git a/gobject/gatomicarray.c b/gobject/gatomicarray.c
index 77966f2..08af80d 100644
--- a/gobject/gatomicarray.c
+++ b/gobject/gatomicarray.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 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/>.
  */
 
 #include "config.h"
diff --git a/gobject/gatomicarray.h b/gobject/gatomicarray.h
index b2ad970..b0363b8 100644
--- a/gobject/gatomicarray.h
+++ b/gobject/gatomicarray.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 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/>.
  */
 #ifndef __G_ATOMIC_ARRAY_H__
 #define __G_ATOMIC_ARRAY_H__
diff --git a/gobject/gbinding.c b/gobject/gbinding.c
index c8c8fa3..c2342d9 100644
--- a/gobject/gbinding.c
+++ b/gobject/gbinding.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: Emmanuele Bassi <ebassi linux intel com>
  */
diff --git a/gobject/gbinding.h b/gobject/gbinding.h
index 82677ca..4b343e9 100644
--- a/gobject/gbinding.h
+++ b/gobject/gbinding.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: Emmanuele Bassi <ebassi linux intel com>
  */
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index 9456bd3..c77df25 100644
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.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 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/>.
  */
 
 #include "config.h"
diff --git a/gobject/gboxed.h b/gobject/gboxed.h
index 5f6b915..d398da5 100644
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.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 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/>.
  */
 #ifndef __G_BOXED_H__
 #define __G_BOXED_H__
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index dd3fae6..9cc6464 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.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/>.
  */
 
 /*
diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index f59aab5..2142bd9 100644
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.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/>.
  */
 #ifndef __G_CLOSURE_H__
 #define __G_CLOSURE_H__
diff --git a/gobject/genums.c b/gobject/genums.c
index 81c1893..25c0708 100644
--- a/gobject/genums.c
+++ b/gobject/genums.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 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/>.
  */
 
 /*
diff --git a/gobject/genums.h b/gobject/genums.h
index 8aa7b89..15c9d81 100644
--- a/gobject/genums.h
+++ b/gobject/genums.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 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/>.
  */
 #ifndef __G_ENUMS_H__
 #define __G_ENUMS_H__
diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index c8612e4..be4151a 100644
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gobject/glib-types.h b/gobject/glib-types.h
index 34d5d1a..025ccae 100644
--- a/gobject/glib-types.h
+++ b/gobject/glib-types.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 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/>.
  */
 #ifndef __GLIB_TYPES_H__
 #define __GLIB_TYPES_H__
diff --git a/gobject/gobject-query.c b/gobject/gobject-query.c
index 5c6f0af..e93943f 100644
--- a/gobject/gobject-query.c
+++ b/gobject/gobject-query.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 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/>.
  */
 
 #include "config.h"
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 1e37f4a..18c7aee 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.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 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/>.
  */
 
 /*
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 03a9629..0615626 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.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 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/>.
  */
 #ifndef __G_OBJECT_H__
 #define __G_OBJECT_H__
diff --git a/gobject/gobject_trace.h b/gobject/gobject_trace.h
index 292a0e8..ec0b666 100644
--- a/gobject/gobject_trace.h
+++ b/gobject/gobject_trace.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: Alexander Larsson <alexl redhat com>
  */
diff --git a/gobject/gobjectnotifyqueue.c b/gobject/gobjectnotifyqueue.c
index cfe01ba..db2aa46 100644
--- a/gobject/gobjectnotifyqueue.c
+++ b/gobject/gobjectnotifyqueue.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 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/>.
  */
 
 /* WARNING:
diff --git a/gobject/gparam.c b/gobject/gparam.c
index 301affb..a087253 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.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 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/>.
  */
 
 /*
diff --git a/gobject/gparam.h b/gobject/gparam.h
index 7e734e3..68793d1 100644
--- a/gobject/gparam.h
+++ b/gobject/gparam.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 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/>.
  *
  * gparam.h: GParamSpec base class implementation
  */
diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
index 449ad85..c48ae0c 100644
--- a/gobject/gparamspecs.c
+++ b/gobject/gparamspecs.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/>.
  */
 
 /*
diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index b3245a8..7b6dd2a 100644
--- a/gobject/gparamspecs.h
+++ b/gobject/gparamspecs.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 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/>.
  *
  * gparamspecs.h: GLib default param specs
  */
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 3d881f8..317a8f1 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.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 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/>.
  *
  * this code is based on the original GtkSignal implementation
  * for the Gtk+ library by Peter Mattis <petm xcf berkeley edu>
diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index d2457df..c8e64b6 100644
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.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 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/>.
  */
 #ifndef __G_SIGNAL_H__
 #define __G_SIGNAL_H__
diff --git a/gobject/gsourceclosure.c b/gobject/gsourceclosure.c
index f6be8de..b74bdb6 100644
--- a/gobject/gsourceclosure.c
+++ b/gobject/gsourceclosure.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 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/>.
  */
 
 #include "config.h"
diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h
index 6f07786..ba2391d 100644
--- a/gobject/gsourceclosure.h
+++ b/gobject/gsourceclosure.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 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/>.
  */
 #ifndef __G_SOURCECLOSURE_H__
 #define __G_SOURCECLOSURE_H__
diff --git a/gobject/gtype-private.h b/gobject/gtype-private.h
index d9e31e4..f441ac4 100644
--- a/gobject/gtype-private.h
+++ b/gobject/gtype-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 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/>.
  */
 #ifndef __G_TYPE_PRIVATE_H__
 #define __G_TYPE_PRIVATE_H__
diff --git a/gobject/gtype.c b/gobject/gtype.c
index c8d3552..4608ebd 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.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 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/>.
  */
 
 /*
diff --git a/gobject/gtype.h b/gobject/gtype.h
index ff57af7..802877f 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.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 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/>.
  */
 #ifndef __G_TYPE_H__
 #define __G_TYPE_H__
diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c
index b1a663d..a8d5510 100644
--- a/gobject/gtypemodule.c
+++ b/gobject/gtypemodule.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index 2580e1b..71e72c2 100644
--- a/gobject/gtypemodule.h
+++ b/gobject/gtypemodule.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __G_TYPE_MODULE_H__
 #define __G_TYPE_MODULE_H__
diff --git a/gobject/gtypeplugin.c b/gobject/gtypeplugin.c
index 192f6f9..13fc989 100644
--- a/gobject/gtypeplugin.c
+++ b/gobject/gtypeplugin.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 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/>.
  */
 
 #include "config.h"
diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h
index c744f9e..afb2d2b 100644
--- a/gobject/gtypeplugin.h
+++ b/gobject/gtypeplugin.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 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/>.
  */
 #ifndef __G_TYPE_PLUGIN_H__
 #define __G_TYPE_PLUGIN_H__
diff --git a/gobject/gvalue.c b/gobject/gvalue.c
index ee40842..56d30c6 100644
--- a/gobject/gvalue.c
+++ b/gobject/gvalue.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 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/>.
  */
 
 /*
diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index 56ea0c6..5ff485f 100644
--- a/gobject/gvalue.h
+++ b/gobject/gvalue.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 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/>.
  *
  * gvalue.h: generic GValue functions
  */
diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c
index a3d2cb0..9cf3c17 100644
--- a/gobject/gvaluearray.c
+++ b/gobject/gvaluearray.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 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/>.
  */
 
 /*
diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index aca3716..a52fe2c 100644
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.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 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/>.
  *
  * gvaluearray.h: GLib array type holding GValues
  */
diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index 05a436a..1e488b4 100644
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.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 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/>.
  *
  * gvaluecollector.h: GValue varargs stubs
  */
diff --git a/gobject/gvaluetransform.c b/gobject/gvaluetransform.c
index 119f854..5579e7f 100644
--- a/gobject/gvaluetransform.c
+++ b/gobject/gvaluetransform.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 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/>.
  */
 
 #include "config.h"
diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c
index b986415..4b234a3 100644
--- a/gobject/gvaluetypes.c
+++ b/gobject/gvaluetypes.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/>.
  */
 
 /*
diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h
index 5fb42ad..5319acb 100644
--- a/gobject/gvaluetypes.h
+++ b/gobject/gvaluetypes.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 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/>.
  *
  * gvaluetypes.h: GLib default values
  */
diff --git a/gobject/tests/ifaceproperties.c b/gobject/tests/ifaceproperties.c
index 1fba57e..0528ac8 100644
--- a/gobject/tests/ifaceproperties.c
+++ b/gobject/tests/ifaceproperties.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 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/>.
  */
 
 #include <stdlib.h>
diff --git a/gobject/tests/testcommon.h b/gobject/tests/testcommon.h
index 7bfef05..a69f594 100644
--- a/gobject/tests/testcommon.h
+++ b/gobject/tests/testcommon.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 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/>.
  */
 
 #ifndef __TEST_COMMON_H__
diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index 6ccf0f6..22080da 100644
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/po/po2tbl.sed.in b/po/po2tbl.sed.in
index b3bcca4..bc6ff22 100644
--- a/po/po2tbl.sed.in
+++ b/po/po2tbl.sed.in
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 1 {
   i\
diff --git a/tests/child-test.c b/tests/child-test.c
index 7681701..f7edaee 100644
--- a/tests/child-test.c
+++ b/tests/child-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/completion-test.c b/tests/completion-test.c
index 4be88c9..b5f004f 100644
--- a/tests/completion-test.c
+++ b/tests/completion-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/dirname-test.c b/tests/dirname-test.c
index 0c8753c..4260a05 100644
--- a/tests/dirname-test.c
+++ b/tests/dirname-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/env-test.c b/tests/env-test.c
index 1b2e219..6f2189a 100644
--- a/tests/env-test.c
+++ b/tests/env-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/file-test.c b/tests/file-test.c
index ce958d5..0a3316f 100644
--- a/tests/file-test.c
+++ b/tests/file-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/gen-casefold-txt.pl b/tests/gen-casefold-txt.pl
old mode 100755
new mode 100644
index d028ea9..2a6a0d4
--- a/tests/gen-casefold-txt.pl
+++ b/tests/gen-casefold-txt.pl
@@ -14,9 +14,7 @@
 #    GNU General Public License for more details.
 
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#    02111-1307, USA.
+#    along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # gen-casefold-test.pl - Generate test cases for casefolding from Unicode data.
 # See http://www.unicode.org/Public/UNIDATA/UnicodeCharacterDatabase.html
diff --git a/tests/gen-casemap-txt.pl b/tests/gen-casemap-txt.pl
old mode 100755
new mode 100644
index 0b9fc1d..3ae419c
--- a/tests/gen-casemap-txt.pl
+++ b/tests/gen-casemap-txt.pl
@@ -14,9 +14,7 @@
 #    GNU General Public License for more details.
 
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#    02111-1307, USA.
+#    along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # gen-casemap-test.pl - Generate test cases for case mapping from Unicode data.
 # See http://www.unicode.org/Public/UNIDATA/UnicodeCharacterDatabase.html
diff --git a/tests/gio-test.c b/tests/gio-test.c
index fd4ffe0..f0f70cd 100644
--- a/tests/gio-test.c
+++ b/tests/gio-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* A test program for the main loop and IO channel code.
diff --git a/tests/gobject/accumulator.c b/tests/gobject/accumulator.c
index f994a76..29aa4ed 100644
--- a/tests/gobject/accumulator.c
+++ b/tests/gobject/accumulator.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/defaultiface.c b/tests/gobject/defaultiface.c
index c44c18a..40a1ebc 100644
--- a/tests/gobject/defaultiface.c
+++ b/tests/gobject/defaultiface.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/deftype.c b/tests/gobject/deftype.c
index 232feff..ae46843 100644
--- a/tests/gobject/deftype.c
+++ b/tests/gobject/deftype.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 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/>.
  */
 #include <glib-object.h>
 
diff --git a/tests/gobject/dynamictype.c b/tests/gobject/dynamictype.c
index b527608..f61dcb3 100644
--- a/tests/gobject/dynamictype.c
+++ b/tests/gobject/dynamictype.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/gvalue-test.c b/tests/gobject/gvalue-test.c
index b928d8b..d24bf30 100644
--- a/tests/gobject/gvalue-test.c
+++ b/tests/gobject/gvalue-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/gobject/ifacecheck.c b/tests/gobject/ifacecheck.c
index e00d9b5..b224385 100644
--- a/tests/gobject/ifacecheck.c
+++ b/tests/gobject/ifacecheck.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/ifaceinherit.c b/tests/gobject/ifaceinherit.c
index 7de658b..9ed251f 100644
--- a/tests/gobject/ifaceinherit.c
+++ b/tests/gobject/ifaceinherit.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/ifaceinit.c b/tests/gobject/ifaceinit.c
index ec62fd7..55ef355 100644
--- a/tests/gobject/ifaceinit.c
+++ b/tests/gobject/ifaceinit.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/override.c b/tests/gobject/override.c
index 47702d7..96fc808 100644
--- a/tests/gobject/override.c
+++ b/tests/gobject/override.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/paramspec-test.c b/tests/gobject/paramspec-test.c
index 5b2e834..74609dd 100644
--- a/tests/gobject/paramspec-test.c
+++ b/tests/gobject/paramspec-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/gobject/performance-threaded.c b/tests/gobject/performance-threaded.c
index a7bd7c0..af6424c 100644
--- a/tests/gobject/performance-threaded.c
+++ b/tests/gobject/performance-threaded.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 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/>.
  */
 
 #include <math.h>
diff --git a/tests/gobject/performance.c b/tests/gobject/performance.c
index fdc51da..e4cb736 100644
--- a/tests/gobject/performance.c
+++ b/tests/gobject/performance.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 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/>.
  */
 
 #include <math.h>
diff --git a/tests/gobject/references.c b/tests/gobject/references.c
index cfedfa9..b2812d1 100644
--- a/tests/gobject/references.c
+++ b/tests/gobject/references.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 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/>.
  */
 
 #undef G_LOG_DOMAIN
diff --git a/tests/gobject/signals.c b/tests/gobject/signals.c
index ad1f876..adcc5f2 100644
--- a/tests/gobject/signals.c
+++ b/tests/gobject/signals.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/>.
  */
 
 #undef        G_LOG_DOMAIN
diff --git a/tests/gobject/singleton.c b/tests/gobject/singleton.c
index abf1a0b..6f2899b 100644
--- a/tests/gobject/singleton.c
+++ b/tests/gobject/singleton.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 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/>.
  */
 #undef  G_LOG_DOMAIN
 #define G_LOG_DOMAIN "TestSingleton"
diff --git a/tests/gobject/testcommon.h b/tests/gobject/testcommon.h
index 6c377e4..c43072f 100644
--- a/tests/gobject/testcommon.h
+++ b/tests/gobject/testcommon.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 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/>.
  */
 
 #ifndef __TEST_COMMON_H__
diff --git a/tests/gobject/testgobject.c b/tests/gobject/testgobject.c
index 39e10d1..4fe3640 100644
--- a/tests/gobject/testgobject.c
+++ b/tests/gobject/testgobject.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 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/>.
  */
 
 #include <string.h>
diff --git a/tests/gobject/testmodule.c b/tests/gobject/testmodule.c
index a6159f1..f2c8323 100644
--- a/tests/gobject/testmodule.c
+++ b/tests/gobject/testmodule.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "testmodule.h"
diff --git a/tests/gobject/testmodule.h b/tests/gobject/testmodule.h
index 751d8ad..80a87ee 100644
--- a/tests/gobject/testmodule.h
+++ b/tests/gobject/testmodule.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __TEST_MODULE_H__
diff --git a/tests/libmoduletestplugin_a.c b/tests/libmoduletestplugin_a.c
index 7a35745..6fbd7ae 100644
--- a/tests/libmoduletestplugin_a.c
+++ b/tests/libmoduletestplugin_a.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/libmoduletestplugin_b.c b/tests/libmoduletestplugin_b.c
index f3b15e9..15a6f55 100644
--- a/tests/libmoduletestplugin_b.c
+++ b/tests/libmoduletestplugin_b.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/mapping-test.c b/tests/mapping-test.c
index c21b21f..a85cf80 100644
--- a/tests/mapping-test.c
+++ b/tests/mapping-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/memchunks.c b/tests/memchunks.c
index 8ce1625..d2c4811 100644
--- a/tests/memchunks.c
+++ b/tests/memchunks.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/module-test.c b/tests/module-test.c
index 956b0a9..5a45ed2 100644
--- a/tests/module-test.c
+++ b/tests/module-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/relation-test.c b/tests/relation-test.c
index 35f5a16..ecc8388 100644
--- a/tests/relation-test.c
+++ b/tests/relation-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/slice-color.c b/tests/slice-color.c
index ecd38d1..f77ff88 100644
--- a/tests/slice-color.c
+++ b/tests/slice-color.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <glib.h>
 #include <string.h>
diff --git a/tests/slice-concurrent.c b/tests/slice-concurrent.c
index 8f8de37..3c686e8 100644
--- a/tests/slice-concurrent.c
+++ b/tests/slice-concurrent.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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <glib.h>
 #include <stdlib.h>
diff --git a/tests/slice-test.c b/tests/slice-test.c
index 519c81b..0caedad 100644
--- a/tests/slice-test.c
+++ b/tests/slice-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <glib.h>
 
diff --git a/tests/sources.c b/tests/sources.c
index 9bd2b15..93221ed 100644
--- a/tests/sources.c
+++ b/tests/sources.c
@@ -9,9 +9,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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Copyright 2012 Red Hat, Inc
  */
diff --git a/tests/spawn-test.c b/tests/spawn-test.c
index 1bc360a..806b93e 100644
--- a/tests/spawn-test.c
+++ b/tests/spawn-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/testglib.c b/tests/testglib.c
index 9894c3a..7ccdc05 100644
--- a/tests/testglib.c
+++ b/tests/testglib.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/tests/type-test.c b/tests/type-test.c
index cbaaa7d..e767f0f 100644
--- a/tests/type-test.c
+++ b/tests/type-test.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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]