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

[libvirt] [PATCH] Desert the FSF address in copyrig ht



Per the FSF address could be changed from time to time, and GNU
recommends the following now: (http://www.gnu.org/licenses/gpl-howto.html)

  You should have received a copy of the GNU General Public License
  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.

This patch removes the explicit FSF address, and uses above instead
(of course, with inserting 'Lesser' before 'General').

Except a bunch of files for security driver, all others are changed
automatically, the copyright for securify files are not complete,
that's why to do it manually:

  src/security/security_selinux.h
  src/security/security_driver.h
  src/security/security_selinux.c
  src/security/security_apparmor.h
  src/security/security_apparmor.c
  src/security/security_driver.c
---
 daemon/libvirtd-config.c                  |    4 ++--
 daemon/libvirtd-config.h                  |    4 ++--
 daemon/libvirtd.c                         |    4 ++--
 daemon/libvirtd.h                         |    4 ++--
 daemon/remote.c                           |    4 ++--
 daemon/remote.h                           |    4 ++--
 daemon/stream.c                           |    4 ++--
 daemon/stream.h                           |    4 ++--
 src/conf/capabilities.c                   |    4 ++--
 src/conf/capabilities.h                   |    4 ++--
 src/conf/cpu_conf.c                       |    4 ++--
 src/conf/cpu_conf.h                       |    4 ++--
 src/conf/domain_audit.c                   |    4 ++--
 src/conf/domain_audit.h                   |    4 ++--
 src/conf/domain_conf.c                    |    4 ++--
 src/conf/domain_conf.h                    |    4 ++--
 src/conf/domain_event.c                   |    4 ++--
 src/conf/domain_event.h                   |    4 ++--
 src/conf/domain_nwfilter.c                |    4 ++--
 src/conf/domain_nwfilter.h                |    4 ++--
 src/conf/interface_conf.c                 |    4 ++--
 src/conf/interface_conf.h                 |    4 ++--
 src/conf/netdev_bandwidth_conf.c          |    4 ++--
 src/conf/netdev_bandwidth_conf.h          |    4 ++--
 src/conf/netdev_vport_profile_conf.c      |    4 ++--
 src/conf/netdev_vport_profile_conf.h      |    4 ++--
 src/conf/network_conf.c                   |    4 ++--
 src/conf/network_conf.h                   |    4 ++--
 src/conf/node_device_conf.c               |    4 ++--
 src/conf/node_device_conf.h               |    4 ++--
 src/conf/nwfilter_conf.c                  |    4 ++--
 src/conf/nwfilter_conf.h                  |    4 ++--
 src/conf/nwfilter_ipaddrmap.c             |    4 ++--
 src/conf/nwfilter_ipaddrmap.h             |    4 ++--
 src/conf/nwfilter_params.c                |    4 ++--
 src/conf/nwfilter_params.h                |    4 ++--
 src/conf/secret_conf.c                    |    4 ++--
 src/conf/secret_conf.h                    |    4 ++--
 src/conf/storage_conf.c                   |    4 ++--
 src/conf/storage_conf.h                   |    4 ++--
 src/conf/storage_encryption_conf.c        |    4 ++--
 src/conf/storage_encryption_conf.h        |    4 ++--
 src/conf/virconsole.c                     |    4 ++--
 src/conf/virconsole.h                     |    4 ++--
 src/conf/virdomainlist.c                  |    4 ++--
 src/conf/virdomainlist.h                  |    4 ++--
 src/cpu/cpu.c                             |    4 ++--
 src/cpu/cpu.h                             |    4 ++--
 src/cpu/cpu_arm.c                         |    4 ++--
 src/cpu/cpu_arm.h                         |    4 ++--
 src/cpu/cpu_generic.c                     |    4 ++--
 src/cpu/cpu_generic.h                     |    4 ++--
 src/cpu/cpu_map.c                         |    4 ++--
 src/cpu/cpu_map.h                         |    4 ++--
 src/cpu/cpu_powerpc.c                     |    4 ++--
 src/cpu/cpu_powerpc.h                     |    4 ++--
 src/cpu/cpu_s390.c                        |    4 ++--
 src/cpu/cpu_s390.h                        |    4 ++--
 src/cpu/cpu_x86.c                         |    4 ++--
 src/cpu/cpu_x86.h                         |    4 ++--
 src/cpu/cpu_x86_data.h                    |    4 ++--
 src/datatypes.c                           |    4 ++--
 src/datatypes.h                           |    4 ++--
 src/driver.c                              |    4 ++--
 src/esx/esx_device_monitor.c              |    4 ++--
 src/esx/esx_device_monitor.h              |    4 ++--
 src/esx/esx_driver.c                      |    4 ++--
 src/esx/esx_driver.h                      |    4 ++--
 src/esx/esx_interface_driver.c            |    4 ++--
 src/esx/esx_interface_driver.h            |    4 ++--
 src/esx/esx_network_driver.c              |    4 ++--
 src/esx/esx_network_driver.h              |    4 ++--
 src/esx/esx_nwfilter_driver.c             |    4 ++--
 src/esx/esx_nwfilter_driver.h             |    4 ++--
 src/esx/esx_private.h                     |    4 ++--
 src/esx/esx_secret_driver.c               |    4 ++--
 src/esx/esx_secret_driver.h               |    4 ++--
 src/esx/esx_storage_driver.c              |    4 ++--
 src/esx/esx_storage_driver.h              |    4 ++--
 src/esx/esx_util.c                        |    4 ++--
 src/esx/esx_util.h                        |    4 ++--
 src/esx/esx_vi.c                          |    4 ++--
 src/esx/esx_vi.h                          |    4 ++--
 src/esx/esx_vi_methods.c                  |    4 ++--
 src/esx/esx_vi_methods.h                  |    4 ++--
 src/esx/esx_vi_types.c                    |    4 ++--
 src/esx/esx_vi_types.h                    |    4 ++--
 src/fdstream.c                            |    4 ++--
 src/fdstream.h                            |    4 ++--
 src/gnutls_1_0_compat.h                   |    4 ++--
 src/hyperv/hyperv_device_monitor.c        |    4 ++--
 src/hyperv/hyperv_device_monitor.h        |    4 ++--
 src/hyperv/hyperv_driver.c                |    4 ++--
 src/hyperv/hyperv_driver.h                |    4 ++--
 src/hyperv/hyperv_interface_driver.c      |    4 ++--
 src/hyperv/hyperv_interface_driver.h      |    4 ++--
 src/hyperv/hyperv_network_driver.c        |    4 ++--
 src/hyperv/hyperv_network_driver.h        |    4 ++--
 src/hyperv/hyperv_nwfilter_driver.c       |    4 ++--
 src/hyperv/hyperv_nwfilter_driver.h       |    4 ++--
 src/hyperv/hyperv_private.h               |    4 ++--
 src/hyperv/hyperv_secret_driver.c         |    4 ++--
 src/hyperv/hyperv_secret_driver.h         |    4 ++--
 src/hyperv/hyperv_storage_driver.c        |    4 ++--
 src/hyperv/hyperv_storage_driver.h        |    4 ++--
 src/hyperv/hyperv_util.c                  |    4 ++--
 src/hyperv/hyperv_util.h                  |    4 ++--
 src/hyperv/hyperv_wmi.c                   |    4 ++--
 src/hyperv/hyperv_wmi.h                   |    4 ++--
 src/hyperv/hyperv_wmi_classes.c           |    4 ++--
 src/hyperv/hyperv_wmi_classes.h           |    4 ++--
 src/hyperv/openwsman.h                    |    4 ++--
 src/interface/netcf_driver.c              |    4 ++--
 src/interface/netcf_driver.h              |    4 ++--
 src/libvirt-qemu.c                        |    4 ++--
 src/libvirt_internal.h                    |    4 ++--
 src/libxl/libxl_conf.c                    |    4 ++--
 src/libxl/libxl_conf.h                    |    4 ++--
 src/libxl/libxl_driver.c                  |    4 ++--
 src/libxl/libxl_driver.h                  |    4 ++--
 src/locking/domain_lock.c                 |    4 ++--
 src/locking/domain_lock.h                 |    4 ++--
 src/locking/lock_driver.h                 |    4 ++--
 src/locking/lock_driver_nop.c             |    4 ++--
 src/locking/lock_driver_nop.h             |    4 ++--
 src/locking/lock_driver_sanlock.c         |    4 ++--
 src/locking/lock_manager.c                |    4 ++--
 src/locking/lock_manager.h                |    4 ++--
 src/lxc/lxc_cgroup.c                      |    4 ++--
 src/lxc/lxc_cgroup.h                      |    4 ++--
 src/lxc/lxc_conf.c                        |    4 ++--
 src/lxc/lxc_conf.h                        |    4 ++--
 src/lxc/lxc_container.c                   |    4 ++--
 src/lxc/lxc_container.h                   |    4 ++--
 src/lxc/lxc_controller.c                  |    4 ++--
 src/lxc/lxc_domain.c                      |    4 ++--
 src/lxc/lxc_domain.h                      |    4 ++--
 src/lxc/lxc_driver.c                      |    4 ++--
 src/lxc/lxc_driver.h                      |    4 ++--
 src/lxc/lxc_process.c                     |    4 ++--
 src/lxc/lxc_process.h                     |    4 ++--
 src/network/bridge_driver.c               |    4 ++--
 src/network/bridge_driver.h               |    4 ++--
 src/node_device/node_device_driver.c      |    4 ++--
 src/node_device/node_device_driver.h      |    4 ++--
 src/node_device/node_device_hal.c         |    4 ++--
 src/node_device/node_device_hal.h         |    4 ++--
 src/node_device/node_device_linux_sysfs.c |    4 ++--
 src/node_device/node_device_udev.c        |    4 ++--
 src/node_device/node_device_udev.h        |    4 ++--
 src/nodeinfo.c                            |    4 ++--
 src/nodeinfo.h                            |    4 ++--
 src/nwfilter/nwfilter_dhcpsnoop.c         |    4 ++--
 src/nwfilter/nwfilter_dhcpsnoop.h         |    4 ++--
 src/nwfilter/nwfilter_driver.c            |    4 ++--
 src/nwfilter/nwfilter_driver.h            |    4 ++--
 src/nwfilter/nwfilter_ebiptables_driver.c |    4 ++--
 src/nwfilter/nwfilter_ebiptables_driver.h |    4 ++--
 src/nwfilter/nwfilter_gentech_driver.c    |    4 ++--
 src/nwfilter/nwfilter_gentech_driver.h    |    4 ++--
 src/nwfilter/nwfilter_learnipaddr.c       |    4 ++--
 src/nwfilter/nwfilter_learnipaddr.h       |    4 ++--
 src/openvz/openvz_conf.c                  |    4 ++--
 src/openvz/openvz_conf.h                  |    4 ++--
 src/openvz/openvz_driver.c                |    4 ++--
 src/openvz/openvz_driver.h                |    4 ++--
 src/openvz/openvz_util.c                  |    4 ++--
 src/openvz/openvz_util.h                  |    4 ++--
 src/phyp/phyp_driver.c                    |    4 ++--
 src/phyp/phyp_driver.h                    |    4 ++--
 src/qemu/qemu_agent.c                     |    4 ++--
 src/qemu/qemu_agent.h                     |    4 ++--
 src/qemu/qemu_bridge_filter.c             |    4 ++--
 src/qemu/qemu_bridge_filter.h             |    4 ++--
 src/qemu/qemu_capabilities.c              |    4 ++--
 src/qemu/qemu_capabilities.h              |    4 ++--
 src/qemu/qemu_cgroup.c                    |    4 ++--
 src/qemu/qemu_cgroup.h                    |    4 ++--
 src/qemu/qemu_command.c                   |    4 ++--
 src/qemu/qemu_command.h                   |    4 ++--
 src/qemu/qemu_conf.c                      |    4 ++--
 src/qemu/qemu_conf.h                      |    4 ++--
 src/qemu/qemu_domain.c                    |    4 ++--
 src/qemu/qemu_domain.h                    |    4 ++--
 src/qemu/qemu_driver.c                    |    4 ++--
 src/qemu/qemu_driver.h                    |    4 ++--
 src/qemu/qemu_hostdev.c                   |    4 ++--
 src/qemu/qemu_hostdev.h                   |    4 ++--
 src/qemu/qemu_hotplug.c                   |    4 ++--
 src/qemu/qemu_hotplug.h                   |    4 ++--
 src/qemu/qemu_migration.c                 |    4 ++--
 src/qemu/qemu_migration.h                 |    4 ++--
 src/qemu/qemu_monitor.c                   |    4 ++--
 src/qemu/qemu_monitor.h                   |    4 ++--
 src/qemu/qemu_monitor_json.c              |    4 ++--
 src/qemu/qemu_monitor_json.h              |    4 ++--
 src/qemu/qemu_monitor_text.c              |    4 ++--
 src/qemu/qemu_monitor_text.h              |    4 ++--
 src/qemu/qemu_process.c                   |    4 ++--
 src/qemu/qemu_process.h                   |    4 ++--
 src/remote/remote_driver.c                |    4 ++--
 src/remote/remote_driver.h                |    4 ++--
 src/rpc/virkeepalive.c                    |    4 ++--
 src/rpc/virkeepalive.h                    |    4 ++--
 src/rpc/virnetclient.c                    |    4 ++--
 src/rpc/virnetclient.h                    |    4 ++--
 src/rpc/virnetclientprogram.c             |    4 ++--
 src/rpc/virnetclientprogram.h             |    4 ++--
 src/rpc/virnetclientstream.c              |    4 ++--
 src/rpc/virnetclientstream.h              |    4 ++--
 src/rpc/virnetmessage.c                   |    4 ++--
 src/rpc/virnetmessage.h                   |    4 ++--
 src/rpc/virnetsaslcontext.c               |    4 ++--
 src/rpc/virnetsaslcontext.h               |    4 ++--
 src/rpc/virnetserver.c                    |    4 ++--
 src/rpc/virnetserver.h                    |    4 ++--
 src/rpc/virnetserverclient.c              |    4 ++--
 src/rpc/virnetserverclient.h              |    4 ++--
 src/rpc/virnetservermdns.c                |    4 ++--
 src/rpc/virnetservermdns.h                |    4 ++--
 src/rpc/virnetserverprogram.c             |    4 ++--
 src/rpc/virnetserverprogram.h             |    4 ++--
 src/rpc/virnetserverservice.c             |    4 ++--
 src/rpc/virnetserverservice.h             |    4 ++--
 src/rpc/virnetsocket.c                    |    4 ++--
 src/rpc/virnetsocket.h                    |    4 ++--
 src/rpc/virnettlscontext.c                |    4 ++--
 src/rpc/virnettlscontext.h                |    4 ++--
 src/secret/secret_driver.c                |    4 ++--
 src/secret/secret_driver.h                |    4 ++--
 src/security/security_apparmor.c          |   10 ++++++++++
 src/security/security_apparmor.h          |   10 +++++++++-
 src/security/security_dac.c               |    4 ++--
 src/security/security_dac.h               |    4 ++--
 src/security/security_driver.c            |    9 +++++++++
 src/security/security_driver.h            |    9 +++++++++
 src/security/security_manager.c           |    4 ++--
 src/security/security_manager.h           |    4 ++--
 src/security/security_nop.c               |    4 ++--
 src/security/security_nop.h               |    4 ++--
 src/security/security_selinux.c           |    9 +++++++++
 src/security/security_selinux.h           |    9 +++++++++
 src/security/security_stack.c             |    4 ++--
 src/security/security_stack.h             |    4 ++--
 src/storage/parthelper.c                  |    4 ++--
 src/storage/storage_backend.c             |    4 ++--
 src/storage/storage_backend.h             |    4 ++--
 src/storage/storage_backend_disk.c        |    4 ++--
 src/storage/storage_backend_disk.h        |    4 ++--
 src/storage/storage_backend_fs.c          |    4 ++--
 src/storage/storage_backend_fs.h          |    4 ++--
 src/storage/storage_backend_iscsi.c       |    4 ++--
 src/storage/storage_backend_iscsi.h       |    4 ++--
 src/storage/storage_backend_logical.c     |    4 ++--
 src/storage/storage_backend_logical.h     |    4 ++--
 src/storage/storage_backend_mpath.c       |    4 ++--
 src/storage/storage_backend_mpath.h       |    4 ++--
 src/storage/storage_backend_rbd.c         |    4 ++--
 src/storage/storage_backend_rbd.h         |    4 ++--
 src/storage/storage_backend_scsi.c        |    4 ++--
 src/storage/storage_backend_scsi.h        |    4 ++--
 src/storage/storage_backend_sheepdog.c    |    4 ++--
 src/storage/storage_backend_sheepdog.h    |    4 ++--
 src/storage/storage_driver.c              |    4 ++--
 src/storage/storage_driver.h              |    4 ++--
 src/test/test_driver.c                    |    4 ++--
 src/test/test_driver.h                    |    4 ++--
 src/uml/uml_conf.c                        |    4 ++--
 src/uml/uml_conf.h                        |    4 ++--
 src/uml/uml_driver.c                      |    4 ++--
 src/uml/uml_driver.h                      |    4 ++--
 src/util/bitmap.c                         |    4 ++--
 src/util/bitmap.h                         |    4 ++--
 src/util/command.c                        |    4 ++--
 src/util/command.h                        |    4 ++--
 src/util/dnsmasq.c                        |    4 ++--
 src/util/dnsmasq.h                        |    4 ++--
 src/util/ebtables.c                       |    4 ++--
 src/util/ebtables.h                       |    4 ++--
 src/util/event.c                          |    4 ++--
 src/util/event.h                          |    4 ++--
 src/util/event_poll.c                     |    4 ++--
 src/util/event_poll.h                     |    4 ++--
 src/util/hooks.c                          |    4 ++--
 src/util/hooks.h                          |    4 ++--
 src/util/hostusb.c                        |    4 ++--
 src/util/hostusb.h                        |    4 ++--
 src/util/iohelper.c                       |    4 ++--
 src/util/iptables.c                       |    4 ++--
 src/util/iptables.h                       |    4 ++--
 src/util/json.c                           |    4 ++--
 src/util/json.h                           |    4 ++--
 src/util/logging.c                        |    4 ++--
 src/util/logging.h                        |    4 ++--
 src/util/memory.c                         |    4 ++--
 src/util/memory.h                         |    4 ++--
 src/util/pci.c                            |    4 ++--
 src/util/pci.h                            |    4 ++--
 src/util/processinfo.c                    |    4 ++--
 src/util/processinfo.h                    |    4 ++--
 src/util/storage_file.c                   |    4 ++--
 src/util/storage_file.h                   |    4 ++--
 src/util/sysinfo.c                        |    4 ++--
 src/util/sysinfo.h                        |    4 ++--
 src/util/threadpool.c                     |    4 ++--
 src/util/threadpool.h                     |    4 ++--
 src/util/threads-pthread.c                |    4 ++--
 src/util/threads-pthread.h                |    4 ++--
 src/util/threads-win32.c                  |    4 ++--
 src/util/threads-win32.h                  |    4 ++--
 src/util/threads.c                        |    4 ++--
 src/util/threads.h                        |    4 ++--
 src/util/util.c                           |    4 ++--
 src/util/util.h                           |    4 ++--
 src/util/uuid.c                           |    4 ++--
 src/util/uuid.h                           |    4 ++--
 src/util/viratomic.h                      |    4 ++--
 src/util/viraudit.c                       |    4 ++--
 src/util/viraudit.h                       |    4 ++--
 src/util/virauth.c                        |    4 ++--
 src/util/virauth.h                        |    4 ++--
 src/util/virauthconfig.c                  |    4 ++--
 src/util/virauthconfig.h                  |    4 ++--
 src/util/virdbus.c                        |    4 ++--
 src/util/virdbus.h                        |    4 ++--
 src/util/virfile.c                        |    4 ++--
 src/util/virfile.h                        |    4 ++--
 src/util/virhashcode.c                    |    4 ++--
 src/util/virhashcode.h                    |    4 ++--
 src/util/virkeycode.c                     |    4 ++--
 src/util/virkeycode.h                     |    4 ++--
 src/util/virkeyfile.c                     |    4 ++--
 src/util/virkeyfile.h                     |    4 ++--
 src/util/virmacaddr.c                     |    4 ++--
 src/util/virmacaddr.h                     |    4 ++--
 src/util/virnetdev.c                      |    4 ++--
 src/util/virnetdev.h                      |    4 ++--
 src/util/virnetdevbandwidth.c             |    4 ++--
 src/util/virnetdevbandwidth.h             |    4 ++--
 src/util/virnetdevbridge.c                |    4 ++--
 src/util/virnetdevbridge.h                |    4 ++--
 src/util/virnetdevmacvlan.c               |    4 ++--
 src/util/virnetdevmacvlan.h               |    4 ++--
 src/util/virnetdevopenvswitch.c           |    4 ++--
 src/util/virnetdevopenvswitch.h           |    4 ++--
 src/util/virnetdevtap.c                   |    4 ++--
 src/util/virnetdevtap.h                   |    4 ++--
 src/util/virnetdevveth.c                  |    4 ++--
 src/util/virnetdevveth.h                  |    4 ++--
 src/util/virnetdevvportprofile.c          |    4 ++--
 src/util/virnetdevvportprofile.h          |    4 ++--
 src/util/virnetlink.c                     |    4 ++--
 src/util/virnetlink.h                     |    4 ++--
 src/util/virnodesuspend.c                 |    4 ++--
 src/util/virnodesuspend.h                 |    4 ++--
 src/util/virpidfile.c                     |    4 ++--
 src/util/virpidfile.h                     |    4 ++--
 src/util/virrandom.c                      |    4 ++--
 src/util/virrandom.h                      |    4 ++--
 src/util/virsocketaddr.c                  |    4 ++--
 src/util/virsocketaddr.h                  |    4 ++--
 src/util/virterror_internal.h             |    4 ++--
 src/util/virtime.c                        |    4 ++--
 src/util/virtime.h                        |    4 ++--
 src/util/virtypedparam.c                  |    4 ++--
 src/util/virtypedparam.h                  |    4 ++--
 src/vbox/vbox_MSCOMGlue.c                 |    4 ++--
 src/vbox/vbox_MSCOMGlue.h                 |    4 ++--
 src/vbox/vbox_glue.c                      |    4 ++--
 src/vbox/vbox_glue.h                      |    4 ++--
 src/vmware/vmware_conf.c                  |    4 ++--
 src/vmware/vmware_conf.h                  |    4 ++--
 src/vmware/vmware_driver.c                |    4 ++--
 src/vmware/vmware_driver.h                |    4 ++--
 src/vmx/vmx.c                             |    4 ++--
 src/vmx/vmx.h                             |    4 ++--
 src/xen/xen_inotify.c                     |    4 ++--
 src/xen/xen_inotify.h                     |    4 ++--
 src/xen/xm_internal.c                     |    4 ++--
 src/xen/xm_internal.h                     |    4 ++--
 src/xenapi/xenapi_driver.c                |    4 ++--
 src/xenapi/xenapi_driver.h                |    4 ++--
 src/xenapi/xenapi_driver_private.h        |    4 ++--
 src/xenapi/xenapi_utils.c                 |    4 ++--
 src/xenapi/xenapi_utils.h                 |    4 ++--
 src/xenxs/xen_sxpr.c                      |    4 ++--
 src/xenxs/xen_sxpr.h                      |    4 ++--
 src/xenxs/xen_xm.c                        |    4 ++--
 src/xenxs/xen_xm.h                        |    4 ++--
 src/xenxs/xenxs_private.h                 |    4 ++--
 tests/commandhelper.c                     |    4 ++--
 tests/commandtest.c                       |    4 ++--
 tests/cputest.c                           |    4 ++--
 tests/eventtest.c                         |    4 ++--
 tests/libvirtdconftest.c                  |    4 ++--
 tests/shunloadhelper.c                    |    4 ++--
 tests/shunloadtest.c                      |    4 ++--
 tests/sockettest.c                        |    4 ++--
 tests/ssh.c                               |    4 ++--
 tests/storagebackendsheepdogtest.c        |    4 ++--
 tests/virauthconfigtest.c                 |    4 ++--
 tests/virdrivermoduletest.c               |    4 ++--
 tests/virkeyfiletest.c                    |    4 ++--
 tests/virnetmessagetest.c                 |    4 ++--
 tests/virnetsockettest.c                  |    4 ++--
 tests/virnettlscontexttest.c              |    4 ++--
 tests/virtimetest.c                       |    4 ++--
 tests/viruritest.c                        |    4 ++--
 tests/xmconfigtest.c                      |    4 ++--
 tools/console.c                           |    4 ++--
 tools/console.h                           |    4 ++--
 tools/virt-host-validate-common.c         |    4 ++--
 tools/virt-host-validate-common.h         |    4 ++--
 tools/virt-host-validate-lxc.c            |    4 ++--
 tools/virt-host-validate-lxc.h            |    4 ++--
 tools/virt-host-validate-qemu.c           |    4 ++--
 tools/virt-host-validate-qemu.h           |    4 ++--
 tools/virt-host-validate.c                |    4 ++--
 418 files changed, 879 insertions(+), 825 deletions(-)

diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 2875927..5374bcc 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h
index 082cb9c..e9c58cb 100644
--- a/daemon/libvirtd-config.h
+++ b/daemon/libvirtd-config.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 8c434a0..b5c0102 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h
index fc169d3..726a1fb 100644
--- a/daemon/libvirtd.h
+++ b/daemon/libvirtd.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/daemon/remote.c b/daemon/remote.c
index a323852..80626a2 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Richard W.M. Jones <rjones redhat com>
  */
diff --git a/daemon/remote.h b/daemon/remote.h
index d3e1b2d..9f662cb 100644
--- a/daemon/remote.h
+++ b/daemon/remote.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Richard W.M. Jones <rjones redhat com>
  * Author: Daniel P. Berrange <berrange redhat com>
diff --git a/daemon/stream.c b/daemon/stream.c
index a0e96af..6f26ee5 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/daemon/stream.h b/daemon/stream.h
index 7c2d8dc..2c74ab7 100644
--- a/daemon/stream.h
+++ b/daemon/stream.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index cc7d018..8b9b516 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 9568b4c..460b273 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 175a7ed..87e9540 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 2df0a50..601e208 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index cb81fa0..5300371 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h
index eaa26d0..b430da7 100644
--- a/src/conf/domain_audit.h
+++ b/src/conf/domain_audit.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1b5dad9..41726ff 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 6c777e7..469d3b6 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index c2a3127..f72bc8c 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Ben Guthro
  */
diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h
index 1274751..0a48bde 100644
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Ben Guthro
  */
diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
index 644b57c..a6e63e1 100644
--- a/src/conf/domain_nwfilter.c
+++ b/src/conf/domain_nwfilter.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h
index 9330c22..9662c0a 100644
--- a/src/conf/domain_nwfilter.h
+++ b/src/conf/domain_nwfilter.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index e054210..1249f12 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel Veillard <veillard redhat com>
  *         Laine Stump <laine redhat com>
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index c5630d4..a83b120 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel Veillard <veillard redhat com>
  *         Laine Stump <laine redhat com>
diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 4dbf18d..832f6db 100644
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Michal Privoznik <mprivozn redhat com>
diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 4bb7def..3123b66 100644
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Michal Privoznik <mprivozn redhat com>
diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index 2699310..d008042 100644
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Stefan Berger <stefanb us ibm com>
diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h
index 30084d5..367bdf3 100644
--- a/src/conf/netdev_vport_profile_conf.h
+++ b/src/conf/netdev_vport_profile_conf.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Stefan Berger <stefanb us ibm com>
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 41864be..5827f7c 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 745d972..1c640a9 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 7144415..048c70c 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: David F. Lively <dlively virtualiron com>
  */
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index ddf5fca..41c9fcc 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: David F. Lively <dlively virtualiron com>
  */
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 70fadaa..a5e38b2 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -19,8 +19,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 5cffded..8b05d04 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c
index c72958b..5087be8 100644
--- a/src/conf/nwfilter_ipaddrmap.c
+++ b/src/conf/nwfilter_ipaddrmap.c
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/conf/nwfilter_ipaddrmap.h b/src/conf/nwfilter_ipaddrmap.h
index 3411a99..0a34ed6 100644
--- a/src/conf/nwfilter_ipaddrmap.h
+++ b/src/conf/nwfilter_ipaddrmap.h
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index d08e860..839d704 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h
index f0fd216..a44e2cf 100644
--- a/src/conf/nwfilter_params.h
+++ b/src/conf/nwfilter_params.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 0f72596..d03503e 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Red Hat Author: Miloslav Trmač <mitr redhat com>
  */
diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index 854b380..511c52d 100644
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Red Hat Author: Miloslav Trmač <mitr redhat com>
  */
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 6ce9208..7944555 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 6f84340..8c4b202 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 63cb7f4..801f4a2 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Red Hat Author: Miloslav Trmač <mitr redhat com>
  */
diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h
index cfb088c..4fa568b 100644
--- a/src/conf/storage_encryption_conf.h
+++ b/src/conf/storage_encryption_conf.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Red Hat Author: Miloslav Trmač <mitr redhat com>
  */
diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index fe47039..05e2b07 100644
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Peter Krempa <pkrempa redhat com>
  */
diff --git a/src/conf/virconsole.h b/src/conf/virconsole.h
index 7cdf578..4d256f9 100644
--- a/src/conf/virconsole.h
+++ b/src/conf/virconsole.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Peter Krempa <pkrempa redhat com>
  */
diff --git a/src/conf/virdomainlist.c b/src/conf/virdomainlist.c
index 2b0b878..c882bc2 100644
--- a/src/conf/virdomainlist.c
+++ b/src/conf/virdomainlist.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Peter Krempa <pkrempa redhat com>
  */
diff --git a/src/conf/virdomainlist.h b/src/conf/virdomainlist.h
index e623129..322e5b8 100644
--- a/src/conf/virdomainlist.h
+++ b/src/conf/virdomainlist.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Peter Krempa <pkrempa redhat com>
  */
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index c7a08c0..2afa90f 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 8d6db44..3f74ef5 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index d6c991f..28d78ed 100644
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Chuck Short <chuck short canonical com>
diff --git a/src/cpu/cpu_arm.h b/src/cpu/cpu_arm.h
index 6c3b3d3..b78ea2e 100644
--- a/src/cpu/cpu_arm.h
+++ b/src/cpu/cpu_arm.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Chuck Short <chuck short canonical com>
diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c
index cba6cfa..8f6edcf 100644
--- a/src/cpu/cpu_generic.c
+++ b/src/cpu/cpu_generic.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu_generic.h b/src/cpu/cpu_generic.h
index b494468..9ac5b88 100644
--- a/src/cpu/cpu_generic.h
+++ b/src/cpu/cpu_generic.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index 9749423..a848960 100644
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h
index acf4cc4..d751ac7 100644
--- a/src/cpu/cpu_map.h
+++ b/src/cpu/cpu_map.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index ed81694..6bab5fd 100644
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Anton Blanchard <anton au ibm com>
diff --git a/src/cpu/cpu_powerpc.h b/src/cpu/cpu_powerpc.h
index 2e0c1a5..8bc2fe5 100644
--- a/src/cpu/cpu_powerpc.h
+++ b/src/cpu/cpu_powerpc.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Anton Blanchard <anton au ibm com>
diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index eb2acef..f95e18f 100644
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Thang Pham <thang pham us ibm com>
diff --git a/src/cpu/cpu_s390.h b/src/cpu/cpu_s390.h
index 4f28cf9..119a6d6 100644
--- a/src/cpu/cpu_s390.h
+++ b/src/cpu/cpu_s390.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Thang Pham <thang pham us ibm com>
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index dce0a09..a5f7405 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
index dd47c2c..b820d8b 100644
--- a/src/cpu/cpu_x86.h
+++ b/src/cpu/cpu_x86.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
index 34a5b06..0d6f1a9 100644
--- a/src/cpu/cpu_x86_data.h
+++ b/src/cpu/cpu_x86_data.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *      Jiri Denemark <jdenemar redhat com>
diff --git a/src/datatypes.c b/src/datatypes.c
index d718170..699c4a8 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/datatypes.h b/src/datatypes.h
index fc284d2..9ad2d01 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/driver.c b/src/driver.c
index da4bee5..0049b79 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 2eba2b0..d85c7e5 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_device_monitor.h b/src/esx/esx_device_monitor.h
index c19599e..0594ad2 100644
--- a/src/esx/esx_device_monitor.h
+++ b/src/esx/esx_device_monitor.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_driver.c b/src/esx/esx_driver.c
index f110ba3..47957cc 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_driver.h b/src/esx/esx_driver.h
index 7138aca..1079afd 100644
--- a/src/esx/esx_driver.h
+++ b/src/esx/esx_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 5713137..501409a 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_interface_driver.h b/src/esx/esx_interface_driver.h
index ac04f79..141372d 100644
--- a/src/esx/esx_interface_driver.h
+++ b/src/esx/esx_interface_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 224c764..2e0e40b 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_network_driver.h b/src/esx/esx_network_driver.h
index 9f06d5a..779d0bc 100644
--- a/src/esx/esx_network_driver.h
+++ b/src/esx/esx_network_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 6056d6d..8bd2631 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_nwfilter_driver.h b/src/esx/esx_nwfilter_driver.h
index 64cceab..94236da 100644
--- a/src/esx/esx_nwfilter_driver.h
+++ b/src/esx/esx_nwfilter_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_private.h b/src/esx/esx_private.h
index 58d1233..671bfb9 100644
--- a/src/esx/esx_private.h
+++ b/src/esx/esx_private.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index c37b62d..ce6dacd 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_secret_driver.h b/src/esx/esx_secret_driver.h
index d9ee7eb..4ed1172 100644
--- a/src/esx/esx_secret_driver.h
+++ b/src/esx/esx_secret_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index b200e56..348bd62 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_storage_driver.h b/src/esx/esx_storage_driver.h
index 21098e9..417775d 100644
--- a/src/esx/esx_storage_driver.h
+++ b/src/esx/esx_storage_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_util.c b/src/esx/esx_util.c
index 6ed3a3e..9288218 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_util.h b/src/esx/esx_util.h
index a69b3f4..07492c1 100644
--- a/src/esx/esx_util.h
+++ b/src/esx/esx_util.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_vi.c b/src/esx/esx_vi.c
index b1b5d70..ab79afe 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_vi.h b/src/esx/esx_vi.h
index dd42925..4b84be8 100644
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index 77588c2..2e5819f 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h
index c78c649..4c6b047 100644
--- a/src/esx/esx_vi_methods.h
+++ b/src/esx/esx_vi_methods.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index 9e67eff..da4f389 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h
index 3d843bf..c92889c 100644
--- a/src/esx/esx_vi_types.h
+++ b/src/esx/esx_vi_types.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/fdstream.c b/src/fdstream.c
index 647db53..214f636 100644
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/fdstream.h b/src/fdstream.h
index f08cab9..160e3cc 100644
--- a/src/fdstream.h
+++ b/src/fdstream.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/gnutls_1_0_compat.h b/src/gnutls_1_0_compat.h
index ebe97fd..eb0c046 100644
--- a/src/gnutls_1_0_compat.h
+++ b/src/gnutls_1_0_compat.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Richard W.M. Jones <rjones redhat com>
  */
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 675d43a..50ce72f 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_device_monitor.h b/src/hyperv/hyperv_device_monitor.h
index 864e8af..a148108 100644
--- a/src/hyperv/hyperv_device_monitor.h
+++ b/src/hyperv/hyperv_device_monitor.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 17685ea..664b435 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_driver.h b/src/hyperv/hyperv_driver.h
index 17ffa2c..14168d1 100644
--- a/src/hyperv/hyperv_driver.h
+++ b/src/hyperv/hyperv_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index f2e8dee..29f173b 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_interface_driver.h b/src/hyperv/hyperv_interface_driver.h
index 730234c..324097b 100644
--- a/src/hyperv/hyperv_interface_driver.h
+++ b/src/hyperv/hyperv_interface_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index 92a43e3..792c7f7 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_network_driver.h b/src/hyperv/hyperv_network_driver.h
index 49c856f..645b0ae 100644
--- a/src/hyperv/hyperv_network_driver.h
+++ b/src/hyperv/hyperv_network_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index b5d8069..2906a35 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_nwfilter_driver.h b/src/hyperv/hyperv_nwfilter_driver.h
index ef4f660..35de2de 100644
--- a/src/hyperv/hyperv_nwfilter_driver.h
+++ b/src/hyperv/hyperv_nwfilter_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h
index 677c5bc..808d607 100644
--- a/src/hyperv/hyperv_private.h
+++ b/src/hyperv/hyperv_private.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index b238e06..e62def7 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_secret_driver.h b/src/hyperv/hyperv_secret_driver.h
index a7e9f25..8dc938f 100644
--- a/src/hyperv/hyperv_secret_driver.h
+++ b/src/hyperv/hyperv_secret_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 4bfefd0..c429abf 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_storage_driver.h b/src/hyperv/hyperv_storage_driver.h
index c9bca22..9b69796 100644
--- a/src/hyperv/hyperv_storage_driver.h
+++ b/src/hyperv/hyperv_storage_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 86d140f..e74e261 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h
index d9d1c84..88928a4 100644
--- a/src/hyperv/hyperv_util.h
+++ b/src/hyperv/hyperv_util.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 4a2dfff..32ea81c 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index fae6d4f..4418514 100644
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_wmi_classes.c b/src/hyperv/hyperv_wmi_classes.c
index ed5e314..6e23e68 100644
--- a/src/hyperv/hyperv_wmi_classes.c
+++ b/src/hyperv/hyperv_wmi_classes.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h
index 5c97ca6..bb8bed1 100644
--- a/src/hyperv/hyperv_wmi_classes.h
+++ b/src/hyperv/hyperv_wmi_classes.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/hyperv/openwsman.h b/src/hyperv/openwsman.h
index 8bc0604..0b4e830 100644
--- a/src/hyperv/openwsman.h
+++ b/src/hyperv/openwsman.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/interface/netcf_driver.c b/src/interface/netcf_driver.c
index 39fa721..935be66 100644
--- a/src/interface/netcf_driver.c
+++ b/src/interface/netcf_driver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Laine Stump <laine redhat com>
  */
diff --git a/src/interface/netcf_driver.h b/src/interface/netcf_driver.h
index eb3a55d..38fbc77 100644
--- a/src/interface/netcf_driver.h
+++ b/src/interface/netcf_driver.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:  Laine Stump <laine redhat com>
  */
diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
index 4b2f8c2..78480bb 100644
--- a/src/libvirt-qemu.c
+++ b/src/libvirt-qemu.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Chris Lalancette <clalance redhat com>
  */
diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index 01ba689..707a982 100644
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * NB This file is ABI sensitive. Things here impact the wire
  * protocol ABI in the remote driver. Same rules as for things
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 28966cd..e9eaed7 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Jim Fehlig <jfehlig novell com>
diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 3067c52..325298a 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Jim Fehlig <jfehlig novell com>
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index edf5c33..873f973 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Jim Fehlig <jfehlig novell com>
diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h
index 4632d33..364adf9 100644
--- a/src/libxl/libxl_driver.h
+++ b/src/libxl/libxl_driver.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Jim Fehlig <jfehlig novell com>
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index de1937c..55f5640 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/locking/domain_lock.h b/src/locking/domain_lock.h
index dd35c7c..e6f845f 100644
--- a/src/locking/domain_lock.h
+++ b/src/locking/domain_lock.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/locking/lock_driver.h b/src/locking/lock_driver.h
index 357a8d5..6f9eb5f 100644
--- a/src/locking/lock_driver.h
+++ b/src/locking/lock_driver.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c
index 2ca6c4d..73799fb 100644
--- a/src/locking/lock_driver_nop.c
+++ b/src/locking/lock_driver_nop.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/locking/lock_driver_nop.h b/src/locking/lock_driver_nop.h
index 4be5377..d233bbb 100644
--- a/src/locking/lock_driver_nop.h
+++ b/src/locking/lock_driver_nop.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 2352968..7c71af3 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/locking/lock_manager.c b/src/locking/lock_manager.c
index d7929e3..18e739e 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/locking/lock_manager.h b/src/locking/lock_manager.h
index 0fb3bb7..b548d45 100644
--- a/src/locking/lock_manager.h
+++ b/src/locking/lock_manager.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index ddd4901..aca6309 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h
index 97bb12a..8ff1015 100644
--- a/src/lxc/lxc_cgroup.h
+++ b/src/lxc/lxc_cgroup.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 __VIR_LXC_CGROUP_H__
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 72547c4..81b3b3f 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index 937da16..1c653e3 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 LXC_CONF_H
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 6fdf359..74242b2 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -19,8 +19,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_container.h b/src/lxc/lxc_container.h
index 6f1cc8b..2a98cc7 100644
--- a/src/lxc/lxc_container.h
+++ b/src/lxc/lxc_container.h
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 LXC_CONTAINER_H
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 4777d51..10f0b8a 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 75fd74f..f78dc09 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h
index e97b2b4..9629465 100644
--- a/src/lxc/lxc_domain.h
+++ b/src/lxc/lxc_domain.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 09c64b2..ba07a80 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_driver.h b/src/lxc/lxc_driver.h
index 7864fd0..7227bc7 100644
--- a/src/lxc/lxc_driver.h
+++ b/src/lxc/lxc_driver.h
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 LXC_DRIVER_H
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 12f6ae6..ab27cbe 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/lxc/lxc_process.h b/src/lxc/lxc_process.h
index b4b707b..d763a69 100644
--- a/src/lxc/lxc_process.h
+++ b/src/lxc/lxc_process.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 __LXC_PROCESS_H__
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index bb2a765..a5046f1 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index 4913126..6620ecb 100644
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 83db775..d44924c 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: David F. Lively <dlively virtualiron com>
  */
diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index 673e95b..6f680a5 100644
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: David F. Lively <dlively virtualiron com>
  */
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 7f8b076..9d63a29 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: David F. Lively <dlively virtualiron com>
  */
diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h
index 3cb22a6..da93b91 100644
--- a/src/node_device/node_device_hal.h
+++ b/src/node_device/node_device_hal.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c
index 6df73a3..4046d69 100644
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index aa96abd..265cbd4 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Dave Allan <dallan redhat com>
  */
diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h
index cdaa142..312c853 100644
--- a/src/node_device/node_device_udev.h
+++ b/src/node_device/node_device_udev.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Dave Allan <dallan redhat com>
  */
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 76b5619..84a5d66 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/nodeinfo.h b/src/nodeinfo.h
index 7d2ef1d..12090e2 100644
--- a/src/nodeinfo.h
+++ b/src/nodeinfo.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index 0a12be5..aee57ed 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -19,8 +19,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Based in part on work by Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h
index 70ff5b2..07fe250 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.h
+++ b/src/nwfilter/nwfilter_dhcpsnoop.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: David L Stevens <dlstevens us ibm com>
  */
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 9034549..4fa73f8 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  *         Stefan Berger <stefanb us ibm com>
diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h
index 3f60560..f1f22e8 100644
--- a/src/nwfilter/nwfilter_driver.h
+++ b/src/nwfilter/nwfilter_driver.h
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  *         Stefan Berger <stefanb us ibm com>
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 18195c3..6d6bc3b 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfilter_ebiptables_driver.h
index 47ddff5..e55b9d8 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.h
+++ b/src/nwfilter/nwfilter_ebiptables_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index 48fc440..5976dc7 100644
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h
index f0da42c..8824462 100644
--- a/src/nwfilter/nwfilter_gentech_driver.h
+++ b/src/nwfilter/nwfilter_gentech_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index f86fc97..cb80050 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h
index 5cb974f..977b16d 100644
--- a/src/nwfilter/nwfilter_learnipaddr.h
+++ b/src/nwfilter/nwfilter_learnipaddr.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Stefan Berger <stefanb us ibm com>
  */
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 697d9e1..5dc071c 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  * Shuveb Hussain <shuveb binarykarma com>
diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h
index 3c783b7..0c604a5 100644
--- a/src/openvz/openvz_conf.h
+++ b/src/openvz/openvz_conf.h
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  * Shuveb Hussain <shuveb binarykarma com>
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index a144408..428b944 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  * Shuveb Hussain <shuveb binarykarma com>
diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h
index 5be9ce7..79181a3 100644
--- a/src/openvz/openvz_driver.h
+++ b/src/openvz/openvz_driver.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  * Shuveb Hussain <shuveb binarykarma com>
diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index a878dd6..89066ab 100644
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/openvz/openvz_util.h b/src/openvz/openvz_util.h
index 94c527f..cf1d374 100644
--- a/src/openvz/openvz_util.h
+++ b/src/openvz/openvz_util.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 25de1ab..0ebdfff 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h
index a22156c..47aa91e 100644
--- a/src/phyp/phyp_driver.h
+++ b/src/phyp/phyp_driver.h
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 PHYP_DRIVER_H
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index a3dbc45..14bf11b 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
index 0816d90..860e7e5 100644
--- a/src/qemu/qemu_agent.h
+++ b/src/qemu/qemu_agent.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index e55b031..0d4cfa8 100644
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Gerhard Stenzel <gerhard stenzel de ibm com>
diff --git a/src/qemu/qemu_bridge_filter.h b/src/qemu/qemu_bridge_filter.h
index 85ca8d0..f1ae0a5 100644
--- a/src/qemu/qemu_bridge_filter.h
+++ b/src/qemu/qemu_bridge_filter.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Gerhard Stenzel <gerhard stenzel de ibm com>
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8e1177c..85c49a2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ca54829..e8251dc 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index b93887c..32184e7 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index c1023b3..5973430 100644
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d6df4ee..c1d23fb 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index ddf426f..3ccf4d7 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 7735ffe..b7db277 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 4234807..92e4968 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 42875b4..86f0265 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 3a5f1f3..9f9467d 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ecd2ec1..6cf3882 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_driver.h b/src/qemu/qemu_driver.h
index 73da9e4..94e4d89 100644
--- a/src/qemu/qemu_driver.h
+++ b/src/qemu/qemu_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index c55545d..7619fd0 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h
index a8acccf..1737f34 100644
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index d7e2a73..7880606 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index e6d7843..f3a0d83 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 12cf31d..7663e5e 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 5fab0ca..e6ca215 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 7ed0909..20395b0 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index c96282b..995948b 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 5c16284..dd6536f 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 5293895..e732178 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index c7de172..fa17927 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h
index 4525864..c6fd464 100644
--- a/src/qemu/qemu_monitor_text.h
+++ b/src/qemu/qemu_monitor_text.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index dad5304..685ea7c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index d13778d..2e74bec 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/remote/remote_driver.c b/src/remote/remote_driver.c
index aa0e6d6..a69e69a 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Richard Jones <rjones redhat com>
  */
diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h
index aca9412..1ab4290 100644
--- a/src/remote/remote_driver.h
+++ b/src/remote/remote_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Richard Jones <rjones redhat com>
  */
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index c05847a..ffb059e 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Jiri Denemark <jdenemar redhat com>
  */
diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h
index 1e25214..52e1d04 100644
--- a/src/rpc/virkeepalive.h
+++ b/src/rpc/virkeepalive.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Jiri Denemark <jdenemar redhat com>
  */
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index f877934..0e7e423 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 13b4f96..3b8cbb2 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 47e6adc..c7d2409 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h
index 14a4c96..f799f2e 100644
--- a/src/rpc/virnetclientprogram.h
+++ b/src/rpc/virnetclientprogram.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index f230d20..8580e39 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h
index fd7a2ee..00d598a 100644
--- a/src/rpc/virnetclientstream.h
+++ b/src/rpc/virnetclientstream.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index 4b5adb8..be4076f 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h
index 8f36a70..8f5bcf2 100644
--- a/src/rpc/virnetmessage.h
+++ b/src/rpc/virnetmessage.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 __VIR_NET_MESSAGE_H__
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index 9943057..9c737d0 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/rpc/virnetsaslcontext.h b/src/rpc/virnetsaslcontext.h
index 774139c..914c45c 100644
--- a/src/rpc/virnetsaslcontext.h
+++ b/src/rpc/virnetsaslcontext.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 __VIR_NET_CLIENT_SASL_CONTEXT_H__
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 257cef7..248ad9f 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 438f524..92f741a 100644
--- a/src/rpc/virnetserver.h
+++ b/src/rpc/virnetserver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index d6b348b..d0a144c 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index 154a160..606c428 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index a63cbbc..274be19 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h
index a482aef..5fe5d3c 100644
--- a/src/rpc/virnetservermdns.h
+++ b/src/rpc/virnetservermdns.h
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 001e18d..c083fb3 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h
index aa9f3cf..015ecef 100644
--- a/src/rpc/virnetserverprogram.h
+++ b/src/rpc/virnetserverprogram.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 28202a4..2880df3 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h
index 8540bd9..d6bf98b 100644
--- a/src/rpc/virnetserverservice.h
+++ b/src/rpc/virnetserverservice.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index aee3c19..31c4e28 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index 5ba7c8f..6c8e77c 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index adbc0de..5ae22f2 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h
index fdfce6d..8893da9 100644
--- a/src/rpc/virnettlscontext.h
+++ b/src/rpc/virnettlscontext.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 __VIR_NET_TLS_CONTEXT_H__
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index af3bfcf..7f92776 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Red Hat Author: Miloslav Trmač <mitr redhat com>
  */
diff --git a/src/secret/secret_driver.h b/src/secret/secret_driver.h
index 54a60a1..fe8e46b 100644
--- a/src/secret/secret_driver.h
+++ b/src/secret/secret_driver.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Red Hat Author: Miloslav Trmač <mitr redhat com>
  */
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 8c95f78..3385232 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -1,5 +1,6 @@
 /*
  * AppArmor security driver for libvirt
+ *
  * Copyright (C) 2011 Red Hat, Inc.
  * Copyright (C) 2009-2010 Canonical Ltd.
  *
@@ -8,6 +9,15 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  * Author:
  *   Jamie Strandboge <jamie canonical com>
  *   Based on security_selinux.c by James Morris <jmorris namei org>
diff --git a/src/security/security_apparmor.h b/src/security/security_apparmor.h
index ffd8288..d0dd0a1 100644
--- a/src/security/security_apparmor.h
+++ b/src/security/security_apparmor.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (C) 2009 Canonical Ltd.
  *
@@ -7,6 +6,15 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  * Author:
  *   Jamie Strandboge <jamie canonical com>
  *
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 9182b39..f398c3f 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * POSIX DAC security driver
  */
diff --git a/src/security/security_dac.h b/src/security/security_dac.h
index ccd9d1c..b312b03 100644
--- a/src/security/security_dac.h
+++ b/src/security/security_dac.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * POSIX DAC security driver
  */
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 5cc6178..7ff5f17 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -6,6 +6,15 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  * Authors:
  *     James Morris <jmorris namei org>
  *     Dan Walsh <dwalsh redhat com>
diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index c68615d..e459ada 100644
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -6,6 +6,15 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  * Authors:
  *     James Morris <jmorris namei org>
  *
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index e7d0360..2e1be4d 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index af16e75..36d801b 100644
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/security/security_nop.c b/src/security/security_nop.c
index 5f90df3..a6b18da 100644
--- a/src/security/security_nop.c
+++ b/src/security/security_nop.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/security/security_nop.h b/src/security/security_nop.h
index 589a75d..24d5d0a 100644
--- a/src/security/security_nop.h
+++ b/src/security/security_nop.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/security/security_selinux.c b/src/security/security_selinux.c
index 131c058..ca19b70 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -6,6 +6,15 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  * Authors:
  *     James Morris <jmorris namei org>
  *     Dan Walsh <dwalsh redhat com>
diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h
index aa67421..09d7ef6 100644
--- a/src/security/security_selinux.h
+++ b/src/security/security_selinux.h
@@ -6,6 +6,15 @@
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  * Authors:
  *     James Morris <jmorris namei org>
  *
diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 65d30d6..65d9dd7 100644
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Stacked security driver
  */
diff --git a/src/security/security_stack.h b/src/security/security_stack.h
index bc83ff3..fd0d26f 100644
--- a/src/security/security_stack.h
+++ b/src/security/security_stack.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Stacked security driver
  */
diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index 964aa78..b5d4acc 100644
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -24,8 +24,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 1095615..e677cda 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h
index 4c371fb..bafd6b6 100644
--- a/src/storage/storage_backend.h
+++ b/src/storage/storage_backend.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 75d2927..0fc2995 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_disk.h b/src/storage/storage_backend_disk.h
index 9d4773e..b02d3b3 100644
--- a/src/storage/storage_backend_disk.h
+++ b/src/storage/storage_backend_disk.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 8da985e..29d6341 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_fs.h b/src/storage/storage_backend_fs.h
index 4f69056..14e927d 100644
--- a/src/storage/storage_backend_fs.h
+++ b/src/storage/storage_backend_fs.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index 0e14558..b2f0c6c 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_iscsi.h b/src/storage/storage_backend_iscsi.h
index 6f18280..e8b5d31 100644
--- a/src/storage/storage_backend_iscsi.h
+++ b/src/storage/storage_backend_iscsi.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index ac116de..97152ae 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_logical.h b/src/storage/storage_backend_logical.h
index 2ee1683..ae220f2 100644
--- a/src/storage/storage_backend_logical.h
+++ b/src/storage/storage_backend_logical.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 685cbf4..fadc08a 100644
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Dave Allan <dallan redhat com>
  */
diff --git a/src/storage/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h
index a060a13..e146332 100644
--- a/src/storage/storage_backend_mpath.h
+++ b/src/storage/storage_backend_mpath.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Dave Allan <dallan redhat com>
  */
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 4df0b54..0342e9f 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Wido den Hollander <wido widodh nl>
  */
diff --git a/src/storage/storage_backend_rbd.h b/src/storage/storage_backend_rbd.h
index 2ae2513..d3b9d76 100644
--- a/src/storage/storage_backend_rbd.h
+++ b/src/storage/storage_backend_rbd.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Wido den Hollander <wido widodh nl>
  */
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index f215876..9689fb0 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_scsi.h b/src/storage/storage_backend_scsi.h
index c3af173..aed289a 100644
--- a/src/storage/storage_backend_scsi.h
+++ b/src/storage/storage_backend_scsi.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index 55ca5c1..430c0e9 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Wido den Hollander <wido widodh nl>
  *         Frank Spijkerman <frank spijkerman avira com>
diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h
index 51ef7a4..9c4e1fd 100644
--- a/src/storage/storage_backend_sheepdog.h
+++ b/src/storage/storage_backend_sheepdog.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Wido den Hollander <wido widodh nl>
  *         Frank Spijkerman <frank spijkerman avira com>
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index c9b8021..4ad9155 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h
index b3e2554..ac9a4be 100644
--- a/src/storage/storage_driver.h
+++ b/src/storage/storage_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 990b20d..3c2056e 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Daniel Berrange <berrange redhat com>
  */
diff --git a/src/test/test_driver.h b/src/test/test_driver.h
index deb0caf..67d4218 100644
--- a/src/test/test_driver.h
+++ b/src/test/test_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Daniel Berrange <berrange redhat com>
  */
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index de1cf46..4c299d8 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index 13b4328..ee91e61 100644
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 128b112..a4a9258 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/uml/uml_driver.h b/src/uml/uml_driver.h
index b7b8d9d..11ba592 100644
--- a/src/uml/uml_driver.h
+++ b/src/uml/uml_driver.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/bitmap.c b/src/util/bitmap.c
index 8c326c4..53a8a38 100644
--- a/src/util/bitmap.c
+++ b/src/util/bitmap.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Jim Fehlig <jfehlig novell com>
  */
diff --git a/src/util/bitmap.h b/src/util/bitmap.h
index ef62cca..c3e6222 100644
--- a/src/util/bitmap.h
+++ b/src/util/bitmap.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Jim Fehlig <jfehlig novell com>
  */
diff --git a/src/util/command.c b/src/util/command.c
index c02a7f1..35080d2 100644
--- a/src/util/command.c
+++ b/src/util/command.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/command.h b/src/util/command.h
index 07aa0b3..34d93a8 100644
--- a/src/util/command.h
+++ b/src/util/command.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/dnsmasq.c b/src/util/dnsmasq.c
index dcb7195..9b26ba1 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Based on iptables.c
  */
diff --git a/src/util/dnsmasq.h b/src/util/dnsmasq.h
index 2bec726..e489148 100644
--- a/src/util/dnsmasq.h
+++ b/src/util/dnsmasq.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * based on iptables.h
  */
diff --git a/src/util/ebtables.c b/src/util/ebtables.c
index 4943d13..ca056b1 100644
--- a/src/util/ebtables.c
+++ b/src/util/ebtables.c
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * based on iptables.c
  * Authors:
diff --git a/src/util/ebtables.h b/src/util/ebtables.h
index d4f3cf8..05c624b 100644
--- a/src/util/ebtables.h
+++ b/src/util/ebtables.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * based on iptables.h
  * Authors:
diff --git a/src/util/event.c b/src/util/event.c
index 495a1f3..f33a4fa 100644
--- a/src/util/event.c
+++ b/src/util/event.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/event.h b/src/util/event.h
index 2fef314..3d9f95f 100644
--- a/src/util/event.h
+++ b/src/util/event.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/event_poll.c b/src/util/event_poll.c
index 273200d..1bc1d41 100644
--- a/src/util/event_poll.c
+++ b/src/util/event_poll.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/event_poll.h b/src/util/event_poll.h
index 4ab3789..31c7dc7 100644
--- a/src/util/event_poll.h
+++ b/src/util/event_poll.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/hooks.c b/src/util/hooks.c
index 1e462a9..2361e72 100644
--- a/src/util/hooks.c
+++ b/src/util/hooks.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel Veillard <veillard redhat com>
  */
diff --git a/src/util/hooks.h b/src/util/hooks.h
index 1af7c04..4986d0c 100644
--- a/src/util/hooks.h
+++ b/src/util/hooks.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel Veillard <veillard redhat com>
  */
diff --git a/src/util/hostusb.c b/src/util/hostusb.c
index 755135d..789c0b8 100644
--- a/src/util/hostusb.c
+++ b/src/util/hostusb.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/hostusb.h b/src/util/hostusb.h
index 27e07dc..3468dc8 100644
--- a/src/util/hostusb.h
+++ b/src/util/hostusb.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 0794193..0732cac 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  *
diff --git a/src/util/iptables.c b/src/util/iptables.c
index f63ae25..b23aca9 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/iptables.h b/src/util/iptables.h
index 429f29c..30e0898 100644
--- a/src/util/iptables.h
+++ b/src/util/iptables.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/json.c b/src/util/json.c
index ae3686f..5132989 100644
--- a/src/util/json.c
+++ b/src/util/json.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/json.h b/src/util/json.h
index 436405f..c8bd504 100644
--- a/src/util/json.h
+++ b/src/util/json.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/logging.c b/src/util/logging.c
index f8233cd..73e7eb6 100644
--- a/src/util/logging.c
+++ b/src/util/logging.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/logging.h b/src/util/logging.h
index db648cb..d2bedcf 100644
--- a/src/util/logging.h
+++ b/src/util/logging.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/memory.c b/src/util/memory.c
index 90ca29a..92cb962 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/memory.h b/src/util/memory.h
index 9b6da39..ce11f16 100644
--- a/src/util/memory.h
+++ b/src/util/memory.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/pci.c b/src/util/pci.c
index 062005d..137521b 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/pci.h b/src/util/pci.h
index b71bb12..8bbab07 100644
--- a/src/util/pci.h
+++ b/src/util/pci.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/processinfo.c b/src/util/processinfo.c
index af19723..16ab8af 100644
--- a/src/util/processinfo.c
+++ b/src/util/processinfo.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/processinfo.h b/src/util/processinfo.h
index 65a7171..a648bb8 100644
--- a/src/util/processinfo.h
+++ b/src/util/processinfo.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index 530071e..f38aa8e 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/storage_file.h b/src/util/storage_file.h
index 13d0e87..1fbe08e 100644
--- a/src/util/storage_file.h
+++ b/src/util/storage_file.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index ca4e56e..92c3539 100644
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel Veillard <veillard redhat com>
  */
diff --git a/src/util/sysinfo.h b/src/util/sysinfo.h
index bee43ee..b36dee4 100644
--- a/src/util/sysinfo.h
+++ b/src/util/sysinfo.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel Veillard <veillard redhat com>
  */
diff --git a/src/util/threadpool.c b/src/util/threadpool.c
index 305a22f..63c5ea0 100644
--- a/src/util/threadpool.c
+++ b/src/util/threadpool.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Hu Tao <hutao cn fujitsu com>
diff --git a/src/util/threadpool.h b/src/util/threadpool.h
index c4612ad..894b278 100644
--- a/src/util/threadpool.h
+++ b/src/util/threadpool.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Hu Tao <hutao cn fujitsu com>
diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c
index ea64887..4bc06ff 100644
--- a/src/util/threads-pthread.c
+++ b/src/util/threads-pthread.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/threads-pthread.h b/src/util/threads-pthread.h
index dcaacb7..62b41e8 100644
--- a/src/util/threads-pthread.h
+++ b/src/util/threads-pthread.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/threads-win32.c b/src/util/threads-win32.c
index 20756a1..59c1674 100644
--- a/src/util/threads-win32.c
+++ b/src/util/threads-win32.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/threads-win32.h b/src/util/threads-win32.h
index 1b23402..830aaa7 100644
--- a/src/util/threads-win32.h
+++ b/src/util/threads-win32.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/threads.c b/src/util/threads.c
index 4ebce56..98b4cba 100644
--- a/src/util/threads.c
+++ b/src/util/threads.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/threads.h b/src/util/threads.h
index 8f192cf..173cbec 100644
--- a/src/util/threads.h
+++ b/src/util/threads.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/util.c b/src/util/util.c
index d1ba0d0..e5bb27b 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  * File created Jul 18, 2007 - Shuveb Hussain <shuveb binarykarma com>
diff --git a/src/util/util.h b/src/util/util.h
index 33226b2..d151c27 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * File created Jul 18, 2007 - Shuveb Hussain <shuveb binarykarma com>
  */
diff --git a/src/util/uuid.c b/src/util/uuid.c
index a0ceb3e..1efde69 100644
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/uuid.h b/src/util/uuid.h
index 7dbfad5..da56a92 100644
--- a/src/util/uuid.h
+++ b/src/util/uuid.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/viratomic.h b/src/util/viratomic.h
index 5fee35b..246fe2b 100644
--- a/src/util/viratomic.h
+++ b/src/util/viratomic.h
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/viraudit.c b/src/util/viraudit.c
index df58edf..691d2f1 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/viraudit.h b/src/util/viraudit.h
index 9d8c359..42a4f8c 100644
--- a/src/util/viraudit.h
+++ b/src/util/viraudit.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virauth.c b/src/util/virauth.c
index 5412ca6..e6b1db0 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virauth.h b/src/util/virauth.h
index 1b315c7..94e081e 100644
--- a/src/util/virauth.h
+++ b/src/util/virauth.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 20a5571..099fe55 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h
index cbeef85..fce439a 100644
--- a/src/util/virauthconfig.h
+++ b/src/util/virauthconfig.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 0402027..da1b143 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virdbus.h b/src/util/virdbus.h
index 7d9ec8f..92d0db0 100644
--- a/src/util/virdbus.h
+++ b/src/util/virdbus.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virfile.c b/src/util/virfile.c
index 4294da7..5c99976 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virfile.h b/src/util/virfile.h
index 101953a..3b4b4f8 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -17,8 +17,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virhashcode.c b/src/util/virhashcode.c
index d16d544..d437cdf 100644
--- a/src/util/virhashcode.c
+++ b/src/util/virhashcode.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The hash code generation is based on the public domain MurmurHash3 from Austin Appleby:
  * http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h
index a38043e..2fb7a95 100644
--- a/src/util/virhashcode.h
+++ b/src/util/virhashcode.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The hash code generation is based on the public domain MurmurHash3 from Austin Appleby:
  * http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c
index f85fe4a..bb181b1 100644
--- a/src/util/virkeycode.c
+++ b/src/util/virkeycode.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virkeycode.h b/src/util/virkeycode.h
index 17e1e9d..6db6b43 100644
--- a/src/util/virkeycode.h
+++ b/src/util/virkeycode.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virkeyfile.c b/src/util/virkeyfile.c
index 4efb897..9b307cf 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/virkeyfile.h b/src/util/virkeyfile.h
index 098ef59..162e991 100644
--- a/src/util/virkeyfile.h
+++ b/src/util/virkeyfile.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index 887e1ac..c07976b 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h
index a767557..fdac362 100644
--- a/src/util/virmacaddr.h
+++ b/src/util/virmacaddr.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index de397c5..f1ee0a4 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 4c1a0d9..c663e49 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index b6686b2..b23ccd3 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Michal Privoznik <mprivozn redhat com>
diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
index 58decff..18384ae 100644
--- a/src/util/virnetdevbandwidth.h
+++ b/src/util/virnetdevbandwidth.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Michal Privoznik <mprivozn redhat com>
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 08c8f5c..a616d8e 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/virnetdevbridge.h b/src/util/virnetdevbridge.h
index 98fc1d2..9ec1af0 100644
--- a/src/util/virnetdevbridge.h
+++ b/src/util/virnetdevbridge.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 559fac5..cfad2de 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Stefan Berger <stefanb us ibm com>
diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
index 3d5afce..b22b088 100644
--- a/src/util/virnetdevmacvlan.h
+++ b/src/util/virnetdevmacvlan.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Stefan Berger <stefanb us ibm com>
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index fda4439..7e0beef 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Dan Wendlandt <dan nicira com>
diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index 5adfabd..fbf9168 100644
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Dan Wendlandt <dan nicira com>
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index e6b1ae5..6ccc380 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h
index f14d1c9..ce3365e 100644
--- a/src/util/virnetdevtap.h
+++ b/src/util/virnetdevtap.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Mark McLoughlin <markmc redhat com>
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index b996cfe..38d7b18 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     David L. Leskovec <dlesko at linux.vnet.ibm.com>
diff --git a/src/util/virnetdevveth.h b/src/util/virnetdevveth.h
index 0d450f1..69fd04f 100644
--- a/src/util/virnetdevveth.h
+++ b/src/util/virnetdevveth.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     David L. Leskovec <dlesko at linux.vnet.ibm.com>
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 089ec8a..506240b 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Stefan Berger <stefanb us ibm com>
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index 1c93f77..6cce1bb 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Stefan Berger <stefanb us ibm com>
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index b1ec777..4a31b1c 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Stefan Berger <stefanb us ibm com>
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index b7f64ca..1997c8d 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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 __VIR_NETLINK_H__
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index 2978b1c..71beb3d 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virnodesuspend.h b/src/util/virnodesuspend.h
index 5debde2..a6927ac 100644
--- a/src/util/virnodesuspend.h
+++ b/src/util/virnodesuspend.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virpidfile.c b/src/util/virpidfile.c
index d6235d2..7c78924 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virpidfile.h b/src/util/virpidfile.h
index dc44fc9..6227bb1 100644
--- a/src/util/virpidfile.h
+++ b/src/util/virpidfile.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virrandom.c b/src/util/virrandom.c
index 88413ab..b815ce2 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/virrandom.h b/src/util/virrandom.h
index 24ab0b1..aa2c8b4 100644
--- a/src/util/virrandom.h
+++ b/src/util/virrandom.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel P. Berrange <berrange redhat com>
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 603d2ec..36ac2fb 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel Veillard <veillard redhat com>
diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h
index b71a8af..ba863e2 100644
--- a/src/util/virsocketaddr.h
+++ b/src/util/virsocketaddr.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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:
  *     Daniel Veillard <veillard redhat com>
diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h
index 06417b5..b82b905 100644
--- a/src/util/virterror_internal.h
+++ b/src/util/virterror_internal.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virtime.c b/src/util/virtime.c
index 92b6cdd..926bb50 100644
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  *
diff --git a/src/util/virtime.h b/src/util/virtime.h
index 59954c2..e21662b 100644
--- a/src/util/virtime.h
+++ b/src/util/virtime.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index d1a1eea..d68d79f 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/util/virtypedparam.h b/src/util/virtypedparam.h
index 7c513ed..f117b84 100644
--- a/src/util/virtypedparam.h
+++ b/src/util/virtypedparam.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index 68810fb..eb688b8 100644
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vbox/vbox_MSCOMGlue.h b/src/vbox/vbox_MSCOMGlue.h
index 83b2ce1..cd0b5a6 100644
--- a/src/vbox/vbox_MSCOMGlue.h
+++ b/src/vbox/vbox_MSCOMGlue.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vbox/vbox_glue.c b/src/vbox/vbox_glue.c
index 5fca843..dbd600d 100644
--- a/src/vbox/vbox_glue.c
+++ b/src/vbox/vbox_glue.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vbox/vbox_glue.h b/src/vbox/vbox_glue.h
index bbc244b..e074d75 100644
--- a/src/vbox/vbox_glue.h
+++ b/src/vbox/vbox_glue.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index e7a9dfa..9fb95c4 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h
index 9053eba..1b2b079 100644
--- a/src/vmware/vmware_conf.h
+++ b/src/vmware/vmware_conf.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 9af5078..6c6347a 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vmware/vmware_driver.h b/src/vmware/vmware_driver.h
index 71186de..0e48d81 100644
--- a/src/vmware/vmware_driver.h
+++ b/src/vmware/vmware_driver.h
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vmx/vmx.c b/src/vmx/vmx.c
index 3f05b16..c775e78 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/vmx/vmx.h b/src/vmx/vmx.h
index 4d54660..c516d70 100644
--- a/src/vmx/vmx.h
+++ b/src/vmx/vmx.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 7185366..24e70a6 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -18,8 +18,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Ben Guthro
  */
diff --git a/src/xen/xen_inotify.h b/src/xen/xen_inotify.h
index 74f4dff..984351b 100644
--- a/src/xen/xen_inotify.h
+++ b/src/xen/xen_inotify.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Ben Guthro
  */
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index c073f25..f9ccbab 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  *
diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h
index 3e1f886..190d32e 100644
--- a/src/xen/xm_internal.h
+++ b/src/xen/xm_internal.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  *
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 38a7cd0..5608de8 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Sharadha Prabhakar <sharadha prabhakar citrix com>
  */
diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h
index a47c132..647cd98 100644
--- a/src/xenapi/xenapi_driver.h
+++ b/src/xenapi/xenapi_driver.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Sharadha Prabhakar <sharadha prabhakar citrix com>
  */
diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h
index cfcaa75..07f7995 100644
--- a/src/xenapi/xenapi_driver_private.h
+++ b/src/xenapi/xenapi_driver_private.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Sharadha Prabhakar <sharadha prabhakar citrix com>
  */
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index c8b12de..3031a17 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Sharadha Prabhakar <sharadha prabhakar citrix com>
  */
diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h
index aa1ff74..5912446 100644
--- a/src/xenapi/xenapi_utils.h
+++ b/src/xenapi/xenapi_utils.h
@@ -13,8 +13,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Sharadha Prabhakar <sharadha prabhakar citrix com>
  */
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 42533ce..c84ce35 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Anthony Liguori <aliguori us ibm com>
  * Author: Daniel Veillard <veillard redhat com>
diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h
index e5380ab..3433f68 100644
--- a/src/xenxs/xen_sxpr.h
+++ b/src/xenxs/xen_sxpr.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Anthony Liguori <aliguori us ibm com>
  * Author: Daniel Veillard <veillard redhat com>
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 99e736e..20347d3 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  * Author: Markus Groß <gross univention de>
diff --git a/src/xenxs/xen_xm.h b/src/xenxs/xen_xm.h
index 7b53ab6..0689fe0 100644
--- a/src/xenxs/xen_xm.h
+++ b/src/xenxs/xen_xm.h
@@ -16,8 +16,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  * Author: Markus Groß <gross univention de>
diff --git a/src/xenxs/xenxs_private.h b/src/xenxs/xenxs_private.h
index 4fc9461..d0ba59a 100644
--- a/src/xenxs/xenxs_private.h
+++ b/src/xenxs/xenxs_private.h
@@ -15,8 +15,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Richard W.M. Jones <rjones redhat com>
  * Author: Markus Groß <gross univention de>
diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index ec0c458..29da1a5 100644
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tests/commandtest.c b/tests/commandtest.c
index fa445d3..b1c7523 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tests/cputest.c b/tests/cputest.c
index ccc17fd..1ca0b85 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Jiri Denemark <jdenemar redhat com>
  */
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 4c45860..2dea75b 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index f97bf80..b394d54 100644
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/shunloadhelper.c b/tests/shunloadhelper.c
index efd8af0..51307b2 100644
--- a/tests/shunloadhelper.c
+++ b/tests/shunloadhelper.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/shunloadtest.c b/tests/shunloadtest.c
index 45ef0a1..7b5ea5d 100644
--- a/tests/shunloadtest.c
+++ b/tests/shunloadtest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/sockettest.c b/tests/sockettest.c
index 777da4a..e58140f 100644
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/ssh.c b/tests/ssh.c
index 49b6bce..e6e8f42 100644
--- a/tests/ssh.c
+++ b/tests/ssh.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index 0870829..b7b3b35 100644
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Sebastian Wiedenroth <sebastian wiedenroth skylime net>
  */
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 6d0bc51..9b1b537 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 405574e..8762de4 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index 0d0931c..92b64bf 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index 0408b5b..02c68c2 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 204113e..d65b949 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index e745487..0dfaa23 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index ac06e89..c151f70 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 48cbaf5..93deb12 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -12,8 +12,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  */
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 9956bf2..3a0937e 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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: Daniel P. Berrange <berrange redhat com>
  *
diff --git a/tools/console.c b/tools/console.c
index 90e54e3..afece27 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Daniel Berrange <berrange redhat com>
  */
diff --git a/tools/console.h b/tools/console.h
index 1feea9e..c1448a7 100644
--- a/tools/console.h
+++ b/tools/console.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Daniel Berrange <berrange redhat com>
  */
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index 066343c..e947a53 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h
index 93d8a83..184dddf 100644
--- a/tools/virt-host-validate-common.h
+++ b/tools/virt-host-validate-common.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c
index 9d69b67..321b209 100644
--- a/tools/virt-host-validate-lxc.c
+++ b/tools/virt-host-validate-lxc.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tools/virt-host-validate-lxc.h b/tools/virt-host-validate-lxc.h
index 7efc229..64e3a83 100644
--- a/tools/virt-host-validate-lxc.h
+++ b/tools/virt-host-validate-lxc.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c
index b65d449..f9c3188 100644
--- a/tools/virt-host-validate-qemu.c
+++ b/tools/virt-host-validate-qemu.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tools/virt-host-validate-qemu.h b/tools/virt-host-validate-qemu.h
index ba5f03b..99153b8 100644
--- a/tools/virt-host-validate-qemu.h
+++ b/tools/virt-host-validate-qemu.h
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, 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/tools/virt-host-validate.c b/tools/virt-host-validate.c
index cdf8302..e32d358 100644
--- a/tools/virt-host-validate.c
+++ b/tools/virt-host-validate.c
@@ -14,8 +14,8 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library;  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  */
 
-- 
1.7.7.3


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