[PATCH osinfo-db] There's no GPL 2.1

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

 



Update headers accordingly

Spotted-by: Thorsten Alteholz
---
 data/datamap/microsoft.com/win-7-l10n-language.xml.in                 | 2 +-
 data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in         | 2 +-
 data/datamap/microsoft.com/win-8-l10n-language.xml.in                 | 2 +-
 data/datamap/x.org/x11-keyboard.xml.in                                | 2 +-
 data/device/ibasetechnologies.net/isa-ib700.xml.in                    | 2 +-
 data/device/ibm.com/ps2-keyboard.xml.in                               | 2 +-
 data/device/ibm.com/ps2-mouse.xml.in                                  | 2 +-
 data/device/pcisig.com/pci-1000-0012.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1013-00b8.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1022-2000.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-10ec-8029.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-10ec-8139.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1234-1111.xml.in                           | 2 +-
 data/device/pcisig.com/pci-1274-5000.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-15ad-0710.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1000.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1001.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1002.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1003.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1004.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1005.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1009.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1041.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1042.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1043.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1044.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1045.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1048.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1049.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1050.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1af4-1052.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-1b36-0100.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-8086-100e.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-8086-2415.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-8086-25ab.d/class.xml.in                   | 2 +-
 data/device/pcisig.com/pci-8086-2668.d/class.xml.in                   | 2 +-
 data/device/usb.org/usb-80ee-0021.d/class.xml.in                      | 2 +-
 data/device/xen.org/xen-console.xml.in                                | 2 +-
 data/device/xen.org/xen-pci.xml.in                                    | 2 +-
 data/device/xen.org/xen-vbd.xml.in                                    | 2 +-
 data/device/xen.org/xen-vfb.xml.in                                    | 2 +-
 data/device/xen.org/xen-vif.xml.in                                    | 2 +-
 data/device/xen.org/xen-vkbd.xml.in                                   | 2 +-
 data/device/xen.org/xen-vscsi.xml.in                                  | 2 +-
 data/device/xen.org/xen-vtpm.xml.in                                   | 2 +-
 data/install-script/debian.org/debian-preseed-desktop.xml.in          | 2 +-
 data/install-script/debian.org/debian-preseed-jeos.xml.in             | 2 +-
 data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in | 2 +-
 data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in    | 2 +-
 data/install-script/microsoft.com/windows-cmd-desktop.xml.in          | 2 +-
 data/install-script/microsoft.com/windows-reg-desktop.xml.in          | 2 +-
 data/install-script/microsoft.com/windows-sif-desktop.xml.in          | 2 +-
 data/install-script/microsoft.com/windows-sif-jeos.xml.in             | 2 +-
 data/install-script/microsoft.com/windows-unattend-desktop.xml.in     | 2 +-
 data/install-script/microsoft.com/windows-unattend-jeos.xml.in        | 2 +-
 data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in     | 2 +-
 data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in        | 2 +-
 data/install-script/redhat.com/rhel-kickstart-desktop.xml.in          | 2 +-
 data/install-script/redhat.com/rhel-kickstart-jeos.xml.in             | 2 +-
 data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in             | 2 +-
 data/os/altlinux.org/altlinux-1.0.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-2.0.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-2.2.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-2.4.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-3.0.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-4.0.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-4.1.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-5.0.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-6.0.xml.in                              | 2 +-
 data/os/altlinux.org/altlinux-7.0.xml.in                              | 2 +-
 data/os/apple.com/macosx-10.0.xml.in                                  | 2 +-
 data/os/apple.com/macosx-10.1.xml.in                                  | 2 +-
 data/os/apple.com/macosx-10.2.xml.in                                  | 2 +-
 data/os/apple.com/macosx-10.3.xml.in                                  | 2 +-
 data/os/apple.com/macosx-10.4.xml.in                                  | 2 +-
 data/os/apple.com/macosx-10.5.xml.in                                  | 2 +-
 data/os/apple.com/macosx-10.6.xml.in                                  | 2 +-
 data/os/apple.com/macosx-10.7.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.0.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.1.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.2.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.3.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.4.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.5.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.6.xml.in                                  | 2 +-
 data/os/centos.org/centos-6.7.xml.in                                  | 2 +-
 data/os/centos.org/centos-7.0.xml.in                                  | 2 +-
 data/os/debian.org/debian-1.1.xml.in                                  | 2 +-
 data/os/debian.org/debian-1.2.xml.in                                  | 2 +-
 data/os/debian.org/debian-1.3.xml.in                                  | 2 +-
 data/os/debian.org/debian-2.0.xml.in                                  | 2 +-
 data/os/debian.org/debian-2.1.xml.in                                  | 2 +-
 data/os/debian.org/debian-2.2.xml.in                                  | 2 +-
 data/os/debian.org/debian-3.1.xml.in                                  | 2 +-
 data/os/debian.org/debian-3.xml.in                                    | 2 +-
 data/os/debian.org/debian-4.xml.in                                    | 2 +-
 data/os/debian.org/debian-5.xml.in                                    | 2 +-
 data/os/debian.org/debian-6.xml.in                                    | 2 +-
 data/os/debian.org/debian-7.xml.in                                    | 2 +-
 data/os/debian.org/debian-8.xml.in                                    | 2 +-
 data/os/debian.org/debian-testing.xml.in                              | 2 +-
 data/os/fedoraproject.org/fedora-1.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-10.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-11.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-12.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-13.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-14.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-15.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-16.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-17.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-18.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-19.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-2.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-20.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-21.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-22.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-23.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-24.xml.in                            | 2 +-
 data/os/fedoraproject.org/fedora-3.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-4.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-5.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-6.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-7.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-8.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-9.xml.in                             | 2 +-
 data/os/fedoraproject.org/fedora-unknown.xml.in                       | 2 +-
 data/os/freebsd.org/freebsd-1.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-10.0.xml.in                               | 2 +-
 data/os/freebsd.org/freebsd-10.1.xml.in                               | 2 +-
 data/os/freebsd.org/freebsd-10.2.xml.in                               | 2 +-
 data/os/freebsd.org/freebsd-10.3.xml.in                               | 2 +-
 data/os/freebsd.org/freebsd-2.0.5.xml.in                              | 2 +-
 data/os/freebsd.org/freebsd-2.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-2.2.8.xml.in                              | 2 +-
 data/os/freebsd.org/freebsd-2.2.9.xml.in                              | 2 +-
 data/os/freebsd.org/freebsd-3.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-3.2.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.1.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.10.xml.in                               | 2 +-
 data/os/freebsd.org/freebsd-4.11.xml.in                               | 2 +-
 data/os/freebsd.org/freebsd-4.2.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.3.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.4.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.5.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.6.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.7.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.8.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-4.9.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-5.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-5.1.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-5.2.1.xml.in                              | 2 +-
 data/os/freebsd.org/freebsd-5.2.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-5.3.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-5.4.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-5.5.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-6.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-6.1.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-6.2.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-6.3.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-6.4.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-7.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-7.1.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-7.2.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-7.3.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-7.4.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-8.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-8.1.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-8.2.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-8.3.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-8.4.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-9.0.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-9.1.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-9.2.xml.in                                | 2 +-
 data/os/freebsd.org/freebsd-9.3.xml.in                                | 2 +-
 data/os/gnome.org/gnome-3.6.xml.in                                    | 2 +-
 data/os/gnome.org/gnome-3.8.xml.in                                    | 2 +-
 data/os/gnome.org/gnome-continuous-3.10.xml.in                        | 2 +-
 data/os/gnome.org/gnome-continuous-3.12.xml.in                        | 2 +-
 data/os/gnome.org/gnome-continuous-3.14.xml.in                        | 2 +-
 data/os/mageia.org/mageia-1.xml.in                                    | 2 +-
 data/os/mageia.org/mageia-2.xml.in                                    | 2 +-
 data/os/mageia.org/mageia-3.xml.in                                    | 2 +-
 data/os/mandriva.com/mandrake-10.0.xml.in                             | 2 +-
 data/os/mandriva.com/mandrake-10.1.xml.in                             | 2 +-
 data/os/mandriva.com/mandrake-10.2.xml.in                             | 2 +-
 data/os/mandriva.com/mandrake-5.1.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-5.2.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-5.3.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-6.0.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-6.1.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-7.0.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-7.1.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-7.2.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-8.0.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-8.1.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-8.2.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-9.0.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-9.1.xml.in                              | 2 +-
 data/os/mandriva.com/mandrake-9.2.xml.in                              | 2 +-
 data/os/mandriva.com/mandriva-2006.0.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2007.1.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2007.xml.in                             | 2 +-
 data/os/mandriva.com/mandriva-2008.0.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2008.1.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2009.0.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2009.1.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2010.0.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2010.1.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2010.2.xml.in                           | 2 +-
 data/os/mandriva.com/mandriva-2011.xml.in                             | 2 +-
 data/os/mandriva.com/mbs-1.0.xml.in                                   | 2 +-
 data/os/mandriva.com/mes-5.0.xml.in                                   | 2 +-
 data/os/mandriva.com/mes-5.1.xml.in                                   | 2 +-
 data/os/microsoft.com/msdos-6.22.xml.in                               | 2 +-
 data/os/microsoft.com/win-1.0.xml.in                                  | 2 +-
 data/os/microsoft.com/win-10.xml.in                                   | 2 +-
 data/os/microsoft.com/win-2.0.xml.in                                  | 2 +-
 data/os/microsoft.com/win-2.1.xml.in                                  | 2 +-
 data/os/microsoft.com/win-2k.xml.in                                   | 2 +-
 data/os/microsoft.com/win-2k12.xml.in                                 | 2 +-
 data/os/microsoft.com/win-2k12r2.xml.in                               | 2 +-
 data/os/microsoft.com/win-2k3.xml.in                                  | 2 +-
 data/os/microsoft.com/win-2k3r2.xml.in                                | 2 +-
 data/os/microsoft.com/win-2k8.xml.in                                  | 2 +-
 data/os/microsoft.com/win-2k8r2.xml.in                                | 2 +-
 data/os/microsoft.com/win-3.1.xml.in                                  | 2 +-
 data/os/microsoft.com/win-7.xml.in                                    | 2 +-
 data/os/microsoft.com/win-8.1.xml.in                                  | 2 +-
 data/os/microsoft.com/win-8.xml.in                                    | 2 +-
 data/os/microsoft.com/win-95.xml.in                                   | 2 +-
 data/os/microsoft.com/win-98.xml.in                                   | 2 +-
 data/os/microsoft.com/win-me.xml.in                                   | 2 +-
 data/os/microsoft.com/win-vista.xml.in                                | 2 +-
 data/os/microsoft.com/win-xp.xml.in                                   | 2 +-
 data/os/microsoft.com/winnt-3.1.xml.in                                | 2 +-
 data/os/microsoft.com/winnt-3.5.xml.in                                | 2 +-
 data/os/microsoft.com/winnt-3.51.xml.in                               | 2 +-
 data/os/microsoft.com/winnt-4.0.xml.in                                | 2 +-
 data/os/netbsd.org/netbsd-0.8.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-0.9.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-1.0.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-1.1.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-1.2.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-1.3.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-1.4.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-1.5.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-1.6.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-2.0.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-3.0.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-4.0.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-5.0.xml.in                                  | 2 +-
 data/os/netbsd.org/netbsd-5.1.xml.in                                  | 2 +-
 data/os/novell.com/netware-4.xml.in                                   | 2 +-
 data/os/novell.com/netware-5.xml.in                                   | 2 +-
 data/os/novell.com/netware-6.xml.in                                   | 2 +-
 data/os/openbsd.org/openbsd-4.2.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-4.3.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-4.4.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-4.5.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-4.8.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-4.9.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.0.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.1.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.2.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.3.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.4.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.5.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.6.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.7.xml.in                                | 2 +-
 data/os/openbsd.org/openbsd-5.8.xml.in                                | 2 +-
 data/os/opensuse.org/opensuse-10.2.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-10.3.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-11.0.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-11.1.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-11.2.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-11.3.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-11.4.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-12.1.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-12.2.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-12.3.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-13.1.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-13.2.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-42.1.xml.in                             | 2 +-
 data/os/opensuse.org/opensuse-factory.xml.in                          | 2 +-
 data/os/opensuse.org/opensuse-tumbleweed.xml.in                       | 2 +-
 data/os/opensuse.org/opensuse-unknown.xml.in                          | 2 +-
 data/os/oracle.com/solaris-11.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.1.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.2.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.3.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.4.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.5.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.6.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.7.xml.in                                  | 2 +-
 data/os/redhat.com/rhel-2.1.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.1.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.2.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.3.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.4.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.5.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.6.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.7.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.8.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.9.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-3.xml.in                                      | 2 +-
 data/os/redhat.com/rhel-4.0.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.1.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.2.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.3.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.4.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.5.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.6.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.7.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.8.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-4.9.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.0.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.1.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.10.xml.in                                   | 2 +-
 data/os/redhat.com/rhel-5.11.xml.in                                   | 2 +-
 data/os/redhat.com/rhel-5.2.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.3.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.4.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.5.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.6.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.7.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.8.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-5.9.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.0.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.1.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.2.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.3.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.4.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.5.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.6.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.7.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-6.8.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-7.0.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-7.1.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-7.2.xml.in                                    | 2 +-
 data/os/redhat.com/rhel-atomic-7.0.xml.in                             | 2 +-
 data/os/redhat.com/rhel-atomic-7.1.xml.in                             | 2 +-
 data/os/redhat.com/rhel-atomic-7.2.xml.in                             | 2 +-
 data/os/redhat.com/rhl-1.0.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-1.1.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-2.0.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-2.1.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-3.0.3.xml.in                                   | 2 +-
 data/os/redhat.com/rhl-4.0.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-4.1.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-4.2.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-5.0.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-5.1.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-5.2.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-6.0.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-6.1.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-6.2.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-7.1.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-7.2.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-7.3.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-7.xml.in                                       | 2 +-
 data/os/redhat.com/rhl-8.0.xml.in                                     | 2 +-
 data/os/redhat.com/rhl-9.xml.in                                       | 2 +-
 data/os/sun.com/opensolaris-2009.06.xml.in                            | 2 +-
 data/os/sun.com/solaris-10.xml.in                                     | 2 +-
 data/os/sun.com/solaris-9.xml.in                                      | 2 +-
 data/os/suse.com/sled-10.xml.in                                       | 2 +-
 data/os/suse.com/sled-11.1.xml.in                                     | 2 +-
 data/os/suse.com/sled-11.2.xml.in                                     | 2 +-
 data/os/suse.com/sled-11.3.xml.in                                     | 2 +-
 data/os/suse.com/sled-11.4.xml.in                                     | 2 +-
 data/os/suse.com/sled-11.xml.in                                       | 2 +-
 data/os/suse.com/sled-12.1.xml.in                                     | 2 +-
 data/os/suse.com/sled-12.xml.in                                       | 2 +-
 data/os/suse.com/sled-9.xml.in                                        | 2 +-
 data/os/suse.com/sles-10.xml.in                                       | 2 +-
 data/os/suse.com/sles-11.1.xml.in                                     | 2 +-
 data/os/suse.com/sles-11.2.xml.in                                     | 2 +-
 data/os/suse.com/sles-11.3.xml.in                                     | 2 +-
 data/os/suse.com/sles-11.4.xml.in                                     | 2 +-
 data/os/suse.com/sles-11.xml.in                                       | 2 +-
 data/os/suse.com/sles-12.1.xml.in                                     | 2 +-
 data/os/suse.com/sles-12.xml.in                                       | 2 +-
 data/os/suse.com/sles-9.xml.in                                        | 2 +-
 data/os/ubuntu.com/ubuntu-10.04.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-10.10.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-11.04.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-11.10.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-12.04.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-12.10.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-13.04.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-13.10.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-14.04.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-14.10.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-15.04.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-15.10.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-16.04.xml.in                                | 2 +-
 data/os/ubuntu.com/ubuntu-4.10.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-5.04.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-5.10.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-6.06.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-6.10.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-7.04.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-7.10.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-8.04.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-8.10.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-9.04.xml.in                                 | 2 +-
 data/os/ubuntu.com/ubuntu-9.10.xml.in                                 | 2 +-
 data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in                     | 2 +-
 data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in                       | 2 +-
 data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in                     | 2 +-
 data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in                     | 2 +-
 data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in                     | 2 +-
 data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in                     | 2 +-
 data/platform/qemu.org/qemu-1.0.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.0.xml.in                                | 2 +-
 data/platform/qemu.org/qemu-1.1.1-1.xml.in                            | 2 +-
 data/platform/qemu.org/qemu-1.1.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.1.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.1.xml.in                                | 2 +-
 data/platform/qemu.org/qemu-1.2.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.2.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.2.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.3.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.3.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.4.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.4.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.4.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.5.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.5.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.5.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.5.3.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.6.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.6.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.6.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.7.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.7.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-1.7.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.0.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.0.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.0.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.1.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.1.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.1.2.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.1.3.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.2.0.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.2.1.xml.in                              | 2 +-
 data/platform/qemu.org/qemu-2.3.0.xml.in                              | 2 +-
 data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in                    | 2 +-
 data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in                    | 2 +-
 data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in                    | 2 +-
 data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in                    | 2 +-
 data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in                    | 2 +-
 data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in                    | 2 +-
 data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in                    | 2 +-
 data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in                    | 2 +-
 data/platform/xen.org/xen-3.0.2.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.0.3.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.0.4.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.1.0.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.1.3.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.1.4.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.2.0.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.2.1.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.2.2.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.2.3.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.3.0.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.3.1.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.3.2.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.4.0.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.4.1.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.4.2.xml.in                                | 2 +-
 data/platform/xen.org/xen-3.4.3.xml.in                                | 2 +-
 data/platform/xen.org/xen-4.0.0.xml.in                                | 2 +-
 data/platform/xen.org/xen-4.0.1.xml.in                                | 2 +-
 data/platform/xen.org/xen-4.1.0.xml.in                                | 2 +-
 476 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/data/datamap/microsoft.com/win-7-l10n-language.xml.in b/data/datamap/microsoft.com/win-7-l10n-language.xml.in
index cb2f57f..3f57c80 100644
--- a/data/datamap/microsoft.com/win-7-l10n-language.xml.in
+++ b/data/datamap/microsoft.com/win-7-l10n-language.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <datamap id="http://microsoft.com/win/7/l10n-language";>
     <entry inval="EN" outval="en_US"/>
diff --git a/data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in b/data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in
index 1caf3b6..07ba024 100644
--- a/data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in
+++ b/data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <datamap id="http://microsoft.com/win/8/l10n-language-reverse";>
     <entry inval="en_US" outval="EN-US"/>
diff --git a/data/datamap/microsoft.com/win-8-l10n-language.xml.in b/data/datamap/microsoft.com/win-8-l10n-language.xml.in
index 3b81706..1dc6c1d 100644
--- a/data/datamap/microsoft.com/win-8-l10n-language.xml.in
+++ b/data/datamap/microsoft.com/win-8-l10n-language.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <datamap id="http://microsoft.com/win/8/l10n-language";>
     <entry inval="EN-US" outval="en_US"/>
diff --git a/data/datamap/x.org/x11-keyboard.xml.in b/data/datamap/x.org/x11-keyboard.xml.in
index 5a8f713..7e70be9 100644
--- a/data/datamap/x.org/x11-keyboard.xml.in
+++ b/data/datamap/x.org/x11-keyboard.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <datamap id="http://x.org/x11-keyboard";>
     <entry inval="af_ZA" outval="za"/>
diff --git a/data/device/ibasetechnologies.net/isa-ib700.xml.in b/data/device/ibasetechnologies.net/isa-ib700.xml.in
index 9ee31cc..1654fcb 100644
--- a/data/device/ibasetechnologies.net/isa-ib700.xml.in
+++ b/data/device/ibasetechnologies.net/isa-ib700.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://ibasetechnologies.net/isa/ib700";>
     <name>ib700</name>
diff --git a/data/device/ibm.com/ps2-keyboard.xml.in b/data/device/ibm.com/ps2-keyboard.xml.in
index e00bca6..1d70e64 100644
--- a/data/device/ibm.com/ps2-keyboard.xml.in
+++ b/data/device/ibm.com/ps2-keyboard.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://ibm.com/ps2/keyboard";>
     <name>keyboard</name>
diff --git a/data/device/ibm.com/ps2-mouse.xml.in b/data/device/ibm.com/ps2-mouse.xml.in
index 820a15e..7e0a942 100644
--- a/data/device/ibm.com/ps2-mouse.xml.in
+++ b/data/device/ibm.com/ps2-mouse.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://ibm.com/ps2/mouse";>
     <name>mouse</name>
diff --git a/data/device/pcisig.com/pci-1000-0012.d/class.xml.in b/data/device/pcisig.com/pci-1000-0012.d/class.xml.in
index d5efba6..f45bb86 100644
--- a/data/device/pcisig.com/pci-1000-0012.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1000-0012.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1000/0012";>
     <name>lsi</name>
diff --git a/data/device/pcisig.com/pci-1013-00b8.d/class.xml.in b/data/device/pcisig.com/pci-1013-00b8.d/class.xml.in
index cca7c06..35d3da5 100644
--- a/data/device/pcisig.com/pci-1013-00b8.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1013-00b8.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1013/00b8";>
     <name>cirrus</name>
diff --git a/data/device/pcisig.com/pci-1022-2000.d/class.xml.in b/data/device/pcisig.com/pci-1022-2000.d/class.xml.in
index 102c7aa..fbdf15f 100644
--- a/data/device/pcisig.com/pci-1022-2000.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1022-2000.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1022/2000";>
     <name>pcnet</name>
diff --git a/data/device/pcisig.com/pci-10ec-8029.d/class.xml.in b/data/device/pcisig.com/pci-10ec-8029.d/class.xml.in
index de2e365..8d43026 100644
--- a/data/device/pcisig.com/pci-10ec-8029.d/class.xml.in
+++ b/data/device/pcisig.com/pci-10ec-8029.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/10ec/8029";>
     <name>ne2k_pci</name>
diff --git a/data/device/pcisig.com/pci-10ec-8139.d/class.xml.in b/data/device/pcisig.com/pci-10ec-8139.d/class.xml.in
index 738f7bb..18d4b22 100644
--- a/data/device/pcisig.com/pci-10ec-8139.d/class.xml.in
+++ b/data/device/pcisig.com/pci-10ec-8139.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/10ec/8139";>
     <name>rtl8139</name>
diff --git a/data/device/pcisig.com/pci-1234-1111.xml.in b/data/device/pcisig.com/pci-1234-1111.xml.in
index e7aa4ec..8fdc5e0 100644
--- a/data/device/pcisig.com/pci-1234-1111.xml.in
+++ b/data/device/pcisig.com/pci-1234-1111.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1234/1111";>
     <name>vga</name>
diff --git a/data/device/pcisig.com/pci-1274-5000.d/class.xml.in b/data/device/pcisig.com/pci-1274-5000.d/class.xml.in
index 918e390..7390dbc 100644
--- a/data/device/pcisig.com/pci-1274-5000.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1274-5000.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1274/5000";>
     <name>es1370</name>
diff --git a/data/device/pcisig.com/pci-15ad-0710.d/class.xml.in b/data/device/pcisig.com/pci-15ad-0710.d/class.xml.in
index e58aa32..ed7ac2a 100644
--- a/data/device/pcisig.com/pci-15ad-0710.d/class.xml.in
+++ b/data/device/pcisig.com/pci-15ad-0710.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/15ad/0710";>
     <name>vmvga</name>
diff --git a/data/device/pcisig.com/pci-1af4-1000.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1000.d/class.xml.in
index b699c08..8622506 100644
--- a/data/device/pcisig.com/pci-1af4-1000.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1000.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1000";>
     <name>virtio-net</name>
diff --git a/data/device/pcisig.com/pci-1af4-1001.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1001.d/class.xml.in
index 936eeb7..c50658b 100644
--- a/data/device/pcisig.com/pci-1af4-1001.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1001.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1001";>
     <name>virtio-block</name>
diff --git a/data/device/pcisig.com/pci-1af4-1002.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1002.d/class.xml.in
index e27c9d0..a09f0ac 100644
--- a/data/device/pcisig.com/pci-1af4-1002.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1002.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1002";>
     <name>virtio-balloon</name>
diff --git a/data/device/pcisig.com/pci-1af4-1003.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1003.d/class.xml.in
index a49ccbd..832a6d1 100644
--- a/data/device/pcisig.com/pci-1af4-1003.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1003.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1003";>
     <name>virtio-console</name>
diff --git a/data/device/pcisig.com/pci-1af4-1004.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1004.d/class.xml.in
index b440f31..57fdf05 100644
--- a/data/device/pcisig.com/pci-1af4-1004.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1004.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1004";>
     <name>virtio-scsi</name>
diff --git a/data/device/pcisig.com/pci-1af4-1005.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1005.d/class.xml.in
index ff87e76..ba5a2c7 100644
--- a/data/device/pcisig.com/pci-1af4-1005.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1005.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1005";>
     <name>virtio-rng</name>
diff --git a/data/device/pcisig.com/pci-1af4-1009.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1009.d/class.xml.in
index 7a6873b..d7a051d 100644
--- a/data/device/pcisig.com/pci-1af4-1009.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1009.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1009";>
     <name>virtio-9p</name>
diff --git a/data/device/pcisig.com/pci-1af4-1041.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1041.d/class.xml.in
index ebf70e5..469ae41 100644
--- a/data/device/pcisig.com/pci-1af4-1041.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1041.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1041";>
     <name>virtio1.0-net</name>
diff --git a/data/device/pcisig.com/pci-1af4-1042.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1042.d/class.xml.in
index e82d0d6..63674f3 100644
--- a/data/device/pcisig.com/pci-1af4-1042.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1042.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1042";>
     <name>virtio1.0-block</name>
diff --git a/data/device/pcisig.com/pci-1af4-1043.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1043.d/class.xml.in
index e82f909..643c8d7 100644
--- a/data/device/pcisig.com/pci-1af4-1043.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1043.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1043";>
     <name>virtio1.0-console</name>
diff --git a/data/device/pcisig.com/pci-1af4-1044.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1044.d/class.xml.in
index 208cd5f..e46bf36 100644
--- a/data/device/pcisig.com/pci-1af4-1044.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1044.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1044";>
     <name>virtio1.0-rng</name>
diff --git a/data/device/pcisig.com/pci-1af4-1045.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1045.d/class.xml.in
index 1fdf608..42a491f 100644
--- a/data/device/pcisig.com/pci-1af4-1045.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1045.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1045";>
     <name>virtio1.0-balloon</name>
diff --git a/data/device/pcisig.com/pci-1af4-1048.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1048.d/class.xml.in
index ca5b5ce..ea6ccf9 100644
--- a/data/device/pcisig.com/pci-1af4-1048.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1048.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1048";>
     <name>virtio1.0-scsi</name>
diff --git a/data/device/pcisig.com/pci-1af4-1049.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1049.d/class.xml.in
index 7213b35..939e191 100644
--- a/data/device/pcisig.com/pci-1af4-1049.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1049.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1049";>
     <name>virtio1.0-9p</name>
diff --git a/data/device/pcisig.com/pci-1af4-1050.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1050.d/class.xml.in
index 3e43256..dbc6f16 100644
--- a/data/device/pcisig.com/pci-1af4-1050.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1050.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1050";>
     <name>virtio1.0-gpu</name>
diff --git a/data/device/pcisig.com/pci-1af4-1052.d/class.xml.in b/data/device/pcisig.com/pci-1af4-1052.d/class.xml.in
index bd9e69d..bcadb14 100644
--- a/data/device/pcisig.com/pci-1af4-1052.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1af4-1052.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1af4/1052";>
     <name>virtio1.0-input</name>
diff --git a/data/device/pcisig.com/pci-1b36-0100.d/class.xml.in b/data/device/pcisig.com/pci-1b36-0100.d/class.xml.in
index 5d4936c..ca60813 100644
--- a/data/device/pcisig.com/pci-1b36-0100.d/class.xml.in
+++ b/data/device/pcisig.com/pci-1b36-0100.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/1b36/0100";>
     <name>qxl</name>
diff --git a/data/device/pcisig.com/pci-8086-100e.d/class.xml.in b/data/device/pcisig.com/pci-8086-100e.d/class.xml.in
index 52d4ad1..4d38d6b 100644
--- a/data/device/pcisig.com/pci-8086-100e.d/class.xml.in
+++ b/data/device/pcisig.com/pci-8086-100e.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/8086/100e";>
     <name>e1000</name>
diff --git a/data/device/pcisig.com/pci-8086-2415.d/class.xml.in b/data/device/pcisig.com/pci-8086-2415.d/class.xml.in
index 6fad456..3888157 100644
--- a/data/device/pcisig.com/pci-8086-2415.d/class.xml.in
+++ b/data/device/pcisig.com/pci-8086-2415.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/8086/2415";>
     <name>ac97</name>
diff --git a/data/device/pcisig.com/pci-8086-25ab.d/class.xml.in b/data/device/pcisig.com/pci-8086-25ab.d/class.xml.in
index 014e0f6..55df820 100644
--- a/data/device/pcisig.com/pci-8086-25ab.d/class.xml.in
+++ b/data/device/pcisig.com/pci-8086-25ab.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/8086/25ab";>
     <name>6300esb</name>
diff --git a/data/device/pcisig.com/pci-8086-2668.d/class.xml.in b/data/device/pcisig.com/pci-8086-2668.d/class.xml.in
index 7d52a66..1f1ca34 100644
--- a/data/device/pcisig.com/pci-8086-2668.d/class.xml.in
+++ b/data/device/pcisig.com/pci-8086-2668.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://pcisig.com/pci/8086/2668";>
     <name>ich6</name>
diff --git a/data/device/usb.org/usb-80ee-0021.d/class.xml.in b/data/device/usb.org/usb-80ee-0021.d/class.xml.in
index b8ff7a1..eff6fac 100644
--- a/data/device/usb.org/usb-80ee-0021.d/class.xml.in
+++ b/data/device/usb.org/usb-80ee-0021.d/class.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://usb.org/usb/80ee/0021";>
     <name>tablet</name>
diff --git a/data/device/xen.org/xen-console.xml.in b/data/device/xen.org/xen-console.xml.in
index 3b88307..5584525 100644
--- a/data/device/xen.org/xen-console.xml.in
+++ b/data/device/xen.org/xen-console.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/console";>
     <class>console</class>
diff --git a/data/device/xen.org/xen-pci.xml.in b/data/device/xen.org/xen-pci.xml.in
index f89c3fe..dcf69ae 100644
--- a/data/device/xen.org/xen-pci.xml.in
+++ b/data/device/xen.org/xen-pci.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/pci";>
     <class>input</class>
diff --git a/data/device/xen.org/xen-vbd.xml.in b/data/device/xen.org/xen-vbd.xml.in
index 426b4a1..99a888a 100644
--- a/data/device/xen.org/xen-vbd.xml.in
+++ b/data/device/xen.org/xen-vbd.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/vbd";>
     <class>block</class>
diff --git a/data/device/xen.org/xen-vfb.xml.in b/data/device/xen.org/xen-vfb.xml.in
index ba6f6cd..d02bd4b 100644
--- a/data/device/xen.org/xen-vfb.xml.in
+++ b/data/device/xen.org/xen-vfb.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/vfb";>
     <class>video</class>
diff --git a/data/device/xen.org/xen-vif.xml.in b/data/device/xen.org/xen-vif.xml.in
index b52dd28..37aedf1 100644
--- a/data/device/xen.org/xen-vif.xml.in
+++ b/data/device/xen.org/xen-vif.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/vif";>
     <class>net</class>
diff --git a/data/device/xen.org/xen-vkbd.xml.in b/data/device/xen.org/xen-vkbd.xml.in
index ca4ecd5..12ebebe 100644
--- a/data/device/xen.org/xen-vkbd.xml.in
+++ b/data/device/xen.org/xen-vkbd.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/vkbd";>
     <class>input</class>
diff --git a/data/device/xen.org/xen-vscsi.xml.in b/data/device/xen.org/xen-vscsi.xml.in
index dccb68c..d5557d0 100644
--- a/data/device/xen.org/xen-vscsi.xml.in
+++ b/data/device/xen.org/xen-vscsi.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/vscsi";>
     <class>block</class>
diff --git a/data/device/xen.org/xen-vtpm.xml.in b/data/device/xen.org/xen-vtpm.xml.in
index d678acf..e770500 100644
--- a/data/device/xen.org/xen-vtpm.xml.in
+++ b/data/device/xen.org/xen-vtpm.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <device id="http://xen.org/xen/vtpm";>
     <bus-type>xen</bus-type>
diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in
index 3880bb4..0b84742 100644
--- a/data/install-script/debian.org/debian-preseed-desktop.xml.in
+++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://debian.org/debian/preseed/desktop'>
     <profile>desktop</profile>
diff --git a/data/install-script/debian.org/debian-preseed-jeos.xml.in b/data/install-script/debian.org/debian-preseed-jeos.xml.in
index 801c4d1..43ce0cf 100644
--- a/data/install-script/debian.org/debian-preseed-jeos.xml.in
+++ b/data/install-script/debian.org/debian-preseed-jeos.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://debian.org/debian/preseed/jeos'>
     <profile>jeos</profile>
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index 0cd8bf6..1fefebb 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://fedoraproject.org/fedora/kickstart/desktop'>
     <profile>desktop</profile>
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index a14abf7..8b99dfe 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://fedoraproject.org/fedora/kickstart/jeos'>
     <profile>jeos</profile>
diff --git a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
index f524c74..9060877 100644
--- a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://microsoft.com/windows/cmd/desktop'>
     <profile>desktop</profile>
diff --git a/data/install-script/microsoft.com/windows-reg-desktop.xml.in b/data/install-script/microsoft.com/windows-reg-desktop.xml.in
index 8159ccc..61fbb5b 100644
--- a/data/install-script/microsoft.com/windows-reg-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-reg-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://microsoft.com/windows/reg/desktop'>
     <profile>desktop</profile>
diff --git a/data/install-script/microsoft.com/windows-sif-desktop.xml.in b/data/install-script/microsoft.com/windows-sif-desktop.xml.in
index c158954..8494471 100644
--- a/data/install-script/microsoft.com/windows-sif-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-sif-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://microsoft.com/windows/sif/desktop'>
     <profile>desktop</profile>
diff --git a/data/install-script/microsoft.com/windows-sif-jeos.xml.in b/data/install-script/microsoft.com/windows-sif-jeos.xml.in
index 75c498e..c2af8d2 100644
--- a/data/install-script/microsoft.com/windows-sif-jeos.xml.in
+++ b/data/install-script/microsoft.com/windows-sif-jeos.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://microsoft.com/windows/sif/jeos'>
     <profile>jeos</profile>
diff --git a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
index 59ec9e3..b399bd0 100644
--- a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://microsoft.com/windows/unattend/desktop'>
    <profile>desktop</profile>
diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
index 9dda319..3fd90e5 100644
--- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://microsoft.com/windows/unattend/jeos'>
     <profile>jeos</profile>
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
index 4855648..04399b5 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
 
   <!-- DESKTOP PROFILE -->
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
index 2dd243b..f21024f 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
 
   <!-- JEOS PROFILE -->
diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index ad012c0..1b917ee 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://redhat.com/rhel/kickstart/desktop'>
     <profile>desktop</profile>
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index 4ede138..db7ec7f 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://redhat.com/rhel/kickstart/jeos'>
     <profile>jeos</profile>
diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
index 9c3b802..c56f859 100644
--- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
+++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <install-script id='http://ubuntu.com/ubuntu/preseed/jeos'>
     <profile>jeos</profile>
diff --git a/data/os/altlinux.org/altlinux-1.0.xml.in b/data/os/altlinux.org/altlinux-1.0.xml.in
index 13f715e..054b8d4 100644
--- a/data/os/altlinux.org/altlinux-1.0.xml.in
+++ b/data/os/altlinux.org/altlinux-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/1.0";>
     <short-id>altlinux1.0</short-id>
diff --git a/data/os/altlinux.org/altlinux-2.0.xml.in b/data/os/altlinux.org/altlinux-2.0.xml.in
index b38be41..27ea8cf 100644
--- a/data/os/altlinux.org/altlinux-2.0.xml.in
+++ b/data/os/altlinux.org/altlinux-2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/2.0";>
     <short-id>altlinux2.0</short-id>
diff --git a/data/os/altlinux.org/altlinux-2.2.xml.in b/data/os/altlinux.org/altlinux-2.2.xml.in
index 3c5187c..209e35d 100644
--- a/data/os/altlinux.org/altlinux-2.2.xml.in
+++ b/data/os/altlinux.org/altlinux-2.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/2.2";>
     <short-id>altlinux2.2</short-id>
diff --git a/data/os/altlinux.org/altlinux-2.4.xml.in b/data/os/altlinux.org/altlinux-2.4.xml.in
index e61375b..d26ca0f 100644
--- a/data/os/altlinux.org/altlinux-2.4.xml.in
+++ b/data/os/altlinux.org/altlinux-2.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/2.4";>
     <short-id>altlinux2.4</short-id>
diff --git a/data/os/altlinux.org/altlinux-3.0.xml.in b/data/os/altlinux.org/altlinux-3.0.xml.in
index 032b979..31b39c8 100644
--- a/data/os/altlinux.org/altlinux-3.0.xml.in
+++ b/data/os/altlinux.org/altlinux-3.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/3.0";>
     <short-id>altlinux3.0</short-id>
diff --git a/data/os/altlinux.org/altlinux-4.0.xml.in b/data/os/altlinux.org/altlinux-4.0.xml.in
index 053d4c4..4364184 100644
--- a/data/os/altlinux.org/altlinux-4.0.xml.in
+++ b/data/os/altlinux.org/altlinux-4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/4.0";>
     <short-id>altlinux4.0</short-id>
diff --git a/data/os/altlinux.org/altlinux-4.1.xml.in b/data/os/altlinux.org/altlinux-4.1.xml.in
index d59a21d..2a9237e 100644
--- a/data/os/altlinux.org/altlinux-4.1.xml.in
+++ b/data/os/altlinux.org/altlinux-4.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/4.1";>
     <short-id>altlinux4.1</short-id>
diff --git a/data/os/altlinux.org/altlinux-5.0.xml.in b/data/os/altlinux.org/altlinux-5.0.xml.in
index c51a3e8..d2ceb33 100644
--- a/data/os/altlinux.org/altlinux-5.0.xml.in
+++ b/data/os/altlinux.org/altlinux-5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/5.0";>
     <short-id>altlinux5.0</short-id>
diff --git a/data/os/altlinux.org/altlinux-6.0.xml.in b/data/os/altlinux.org/altlinux-6.0.xml.in
index 689bbc7..c0b2e1b 100644
--- a/data/os/altlinux.org/altlinux-6.0.xml.in
+++ b/data/os/altlinux.org/altlinux-6.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/6.0";>
     <short-id>altlinux6.0</short-id>
diff --git a/data/os/altlinux.org/altlinux-7.0.xml.in b/data/os/altlinux.org/altlinux-7.0.xml.in
index 7b246d6..b759ea7 100644
--- a/data/os/altlinux.org/altlinux-7.0.xml.in
+++ b/data/os/altlinux.org/altlinux-7.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://altlinux.org/altlinux/7.0";>
     <short-id>altlinux7.0</short-id>
diff --git a/data/os/apple.com/macosx-10.0.xml.in b/data/os/apple.com/macosx-10.0.xml.in
index 1596dcc..0048c14 100644
--- a/data/os/apple.com/macosx-10.0.xml.in
+++ b/data/os/apple.com/macosx-10.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.0";>
     <short-id>macosx10.0</short-id>
diff --git a/data/os/apple.com/macosx-10.1.xml.in b/data/os/apple.com/macosx-10.1.xml.in
index 26c19e1..d3dbf08 100644
--- a/data/os/apple.com/macosx-10.1.xml.in
+++ b/data/os/apple.com/macosx-10.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.1";>
     <short-id>macosx10.1</short-id>
diff --git a/data/os/apple.com/macosx-10.2.xml.in b/data/os/apple.com/macosx-10.2.xml.in
index 48f5d30..0c9367a 100644
--- a/data/os/apple.com/macosx-10.2.xml.in
+++ b/data/os/apple.com/macosx-10.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.2";>
     <short-id>macosx10.2</short-id>
diff --git a/data/os/apple.com/macosx-10.3.xml.in b/data/os/apple.com/macosx-10.3.xml.in
index 26a7186..85a8556 100644
--- a/data/os/apple.com/macosx-10.3.xml.in
+++ b/data/os/apple.com/macosx-10.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.3";>
     <short-id>macosx10.3</short-id>
diff --git a/data/os/apple.com/macosx-10.4.xml.in b/data/os/apple.com/macosx-10.4.xml.in
index 64b51b1..fbd3499 100644
--- a/data/os/apple.com/macosx-10.4.xml.in
+++ b/data/os/apple.com/macosx-10.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.4";>
     <short-id>macosx10.4</short-id>
diff --git a/data/os/apple.com/macosx-10.5.xml.in b/data/os/apple.com/macosx-10.5.xml.in
index fb6d7ca..9771eeb 100644
--- a/data/os/apple.com/macosx-10.5.xml.in
+++ b/data/os/apple.com/macosx-10.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.5";>
     <short-id>macosx10.5</short-id>
diff --git a/data/os/apple.com/macosx-10.6.xml.in b/data/os/apple.com/macosx-10.6.xml.in
index 25beb50..e5fdff4 100644
--- a/data/os/apple.com/macosx-10.6.xml.in
+++ b/data/os/apple.com/macosx-10.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.6";>
     <short-id>macosx10.6</short-id>
diff --git a/data/os/apple.com/macosx-10.7.xml.in b/data/os/apple.com/macosx-10.7.xml.in
index 41f9a48..59cf838 100644
--- a/data/os/apple.com/macosx-10.7.xml.in
+++ b/data/os/apple.com/macosx-10.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://apple.com/macosx/10.7";>
     <short-id>macosx10.7</short-id>
diff --git a/data/os/centos.org/centos-6.0.xml.in b/data/os/centos.org/centos-6.0.xml.in
index e6e1634..07f6a92 100644
--- a/data/os/centos.org/centos-6.0.xml.in
+++ b/data/os/centos.org/centos-6.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.0";>
     <short-id>centos6.0</short-id>
diff --git a/data/os/centos.org/centos-6.1.xml.in b/data/os/centos.org/centos-6.1.xml.in
index eef9d5f..da115ca 100644
--- a/data/os/centos.org/centos-6.1.xml.in
+++ b/data/os/centos.org/centos-6.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.1";>
     <short-id>centos6.1</short-id>
diff --git a/data/os/centos.org/centos-6.2.xml.in b/data/os/centos.org/centos-6.2.xml.in
index b843589..fdd6df4 100644
--- a/data/os/centos.org/centos-6.2.xml.in
+++ b/data/os/centos.org/centos-6.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.2";>
     <short-id>centos6.2</short-id>
diff --git a/data/os/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in
index 4a9a274..c2b5c33 100644
--- a/data/os/centos.org/centos-6.3.xml.in
+++ b/data/os/centos.org/centos-6.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.3";>
     <short-id>centos6.3</short-id>
diff --git a/data/os/centos.org/centos-6.4.xml.in b/data/os/centos.org/centos-6.4.xml.in
index 50a7561..a523442 100644
--- a/data/os/centos.org/centos-6.4.xml.in
+++ b/data/os/centos.org/centos-6.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.4";>
     <short-id>centos6.4</short-id>
diff --git a/data/os/centos.org/centos-6.5.xml.in b/data/os/centos.org/centos-6.5.xml.in
index 4ad9f95..3503255 100644
--- a/data/os/centos.org/centos-6.5.xml.in
+++ b/data/os/centos.org/centos-6.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.5";>
     <short-id>centos6.5</short-id>
diff --git a/data/os/centos.org/centos-6.6.xml.in b/data/os/centos.org/centos-6.6.xml.in
index 334ddc3..17951e4 100644
--- a/data/os/centos.org/centos-6.6.xml.in
+++ b/data/os/centos.org/centos-6.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.6";>
     <short-id>centos6.6</short-id>
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index e5630a9..2b102d6 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/6.7";>
     <short-id>centos6.7</short-id>
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index f29f550..135faf7 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://centos.org/centos/7.0";>
     <short-id>centos7.0</short-id>
diff --git a/data/os/debian.org/debian-1.1.xml.in b/data/os/debian.org/debian-1.1.xml.in
index 79fcdbb..98cb80b 100644
--- a/data/os/debian.org/debian-1.1.xml.in
+++ b/data/os/debian.org/debian-1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/1.1";>
     <short-id>debian1.1</short-id>
diff --git a/data/os/debian.org/debian-1.2.xml.in b/data/os/debian.org/debian-1.2.xml.in
index ac4b88e..633aa9c 100644
--- a/data/os/debian.org/debian-1.2.xml.in
+++ b/data/os/debian.org/debian-1.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/1.2";>
     <short-id>debian1.2</short-id>
diff --git a/data/os/debian.org/debian-1.3.xml.in b/data/os/debian.org/debian-1.3.xml.in
index 4d96a31..90cf4bc 100644
--- a/data/os/debian.org/debian-1.3.xml.in
+++ b/data/os/debian.org/debian-1.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/1.3";>
     <short-id>debian1.3</short-id>
diff --git a/data/os/debian.org/debian-2.0.xml.in b/data/os/debian.org/debian-2.0.xml.in
index 4cd6bbf..6325aa9 100644
--- a/data/os/debian.org/debian-2.0.xml.in
+++ b/data/os/debian.org/debian-2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/2.0";>
     <short-id>debian2.0</short-id>
diff --git a/data/os/debian.org/debian-2.1.xml.in b/data/os/debian.org/debian-2.1.xml.in
index b0f3d3a..3454180 100644
--- a/data/os/debian.org/debian-2.1.xml.in
+++ b/data/os/debian.org/debian-2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/2.1";>
     <short-id>debian2.1</short-id>
diff --git a/data/os/debian.org/debian-2.2.xml.in b/data/os/debian.org/debian-2.2.xml.in
index 7d30c2a..c9c0466 100644
--- a/data/os/debian.org/debian-2.2.xml.in
+++ b/data/os/debian.org/debian-2.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/2.2";>
     <short-id>debian2.2</short-id>
diff --git a/data/os/debian.org/debian-3.1.xml.in b/data/os/debian.org/debian-3.1.xml.in
index 9a4629f..a3d4441 100644
--- a/data/os/debian.org/debian-3.1.xml.in
+++ b/data/os/debian.org/debian-3.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/3.1";>
     <short-id>debian3.1</short-id>
diff --git a/data/os/debian.org/debian-3.xml.in b/data/os/debian.org/debian-3.xml.in
index d2d9af3..a29cbdb 100644
--- a/data/os/debian.org/debian-3.xml.in
+++ b/data/os/debian.org/debian-3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/3";>
     <short-id>debian3</short-id>
diff --git a/data/os/debian.org/debian-4.xml.in b/data/os/debian.org/debian-4.xml.in
index ebcdbc4..d5148f0 100644
--- a/data/os/debian.org/debian-4.xml.in
+++ b/data/os/debian.org/debian-4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/4";>
     <short-id>debian4</short-id>
diff --git a/data/os/debian.org/debian-5.xml.in b/data/os/debian.org/debian-5.xml.in
index c23d489..c4b727a 100644
--- a/data/os/debian.org/debian-5.xml.in
+++ b/data/os/debian.org/debian-5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/5";>
     <short-id>debian5</short-id>
diff --git a/data/os/debian.org/debian-6.xml.in b/data/os/debian.org/debian-6.xml.in
index a962661..a0fc4d2 100644
--- a/data/os/debian.org/debian-6.xml.in
+++ b/data/os/debian.org/debian-6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/6";>
     <short-id>debian6</short-id>
diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in
index 4e5ff33..df26883 100644
--- a/data/os/debian.org/debian-7.xml.in
+++ b/data/os/debian.org/debian-7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/7";>
     <short-id>debian7</short-id>
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 7fd1d35..411b8c1 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/8";>
     <short-id>debian8</short-id>
diff --git a/data/os/debian.org/debian-testing.xml.in b/data/os/debian.org/debian-testing.xml.in
index a06fe3e..3c8ac12 100644
--- a/data/os/debian.org/debian-testing.xml.in
+++ b/data/os/debian.org/debian-testing.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://debian.org/debian/testing";>
     <short-id>debiantesting</short-id>
diff --git a/data/os/fedoraproject.org/fedora-1.xml.in b/data/os/fedoraproject.org/fedora-1.xml.in
index 009c7c7..27ad7e0 100644
--- a/data/os/fedoraproject.org/fedora-1.xml.in
+++ b/data/os/fedoraproject.org/fedora-1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/1";>
     <short-id>fedora1</short-id>
diff --git a/data/os/fedoraproject.org/fedora-10.xml.in b/data/os/fedoraproject.org/fedora-10.xml.in
index 1002e65..7415769 100644
--- a/data/os/fedoraproject.org/fedora-10.xml.in
+++ b/data/os/fedoraproject.org/fedora-10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/10";>
     <short-id>fedora10</short-id>
diff --git a/data/os/fedoraproject.org/fedora-11.xml.in b/data/os/fedoraproject.org/fedora-11.xml.in
index 90819ea..aedd647 100644
--- a/data/os/fedoraproject.org/fedora-11.xml.in
+++ b/data/os/fedoraproject.org/fedora-11.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/11";>
     <short-id>fedora11</short-id>
diff --git a/data/os/fedoraproject.org/fedora-12.xml.in b/data/os/fedoraproject.org/fedora-12.xml.in
index 7c1a96e..ce50728 100644
--- a/data/os/fedoraproject.org/fedora-12.xml.in
+++ b/data/os/fedoraproject.org/fedora-12.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/12";>
     <short-id>fedora12</short-id>
diff --git a/data/os/fedoraproject.org/fedora-13.xml.in b/data/os/fedoraproject.org/fedora-13.xml.in
index d43e7a5..dfac0eb 100644
--- a/data/os/fedoraproject.org/fedora-13.xml.in
+++ b/data/os/fedoraproject.org/fedora-13.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/13";>
     <short-id>fedora13</short-id>
diff --git a/data/os/fedoraproject.org/fedora-14.xml.in b/data/os/fedoraproject.org/fedora-14.xml.in
index c3041a9..bec5eac 100644
--- a/data/os/fedoraproject.org/fedora-14.xml.in
+++ b/data/os/fedoraproject.org/fedora-14.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/14";>
     <short-id>fedora14</short-id>
diff --git a/data/os/fedoraproject.org/fedora-15.xml.in b/data/os/fedoraproject.org/fedora-15.xml.in
index 4009866..a00ce9e 100644
--- a/data/os/fedoraproject.org/fedora-15.xml.in
+++ b/data/os/fedoraproject.org/fedora-15.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/15";>
     <short-id>fedora15</short-id>
diff --git a/data/os/fedoraproject.org/fedora-16.xml.in b/data/os/fedoraproject.org/fedora-16.xml.in
index 8afc8e9..b184705 100644
--- a/data/os/fedoraproject.org/fedora-16.xml.in
+++ b/data/os/fedoraproject.org/fedora-16.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/16";>
     <short-id>fedora16</short-id>
diff --git a/data/os/fedoraproject.org/fedora-17.xml.in b/data/os/fedoraproject.org/fedora-17.xml.in
index 4e2259f..50076f5 100644
--- a/data/os/fedoraproject.org/fedora-17.xml.in
+++ b/data/os/fedoraproject.org/fedora-17.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/17";>
     <short-id>fedora17</short-id>
diff --git a/data/os/fedoraproject.org/fedora-18.xml.in b/data/os/fedoraproject.org/fedora-18.xml.in
index 7962532..c302018 100644
--- a/data/os/fedoraproject.org/fedora-18.xml.in
+++ b/data/os/fedoraproject.org/fedora-18.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/18";>
     <short-id>fedora18</short-id>
diff --git a/data/os/fedoraproject.org/fedora-19.xml.in b/data/os/fedoraproject.org/fedora-19.xml.in
index 36f281c..73e66f1 100644
--- a/data/os/fedoraproject.org/fedora-19.xml.in
+++ b/data/os/fedoraproject.org/fedora-19.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/19";>
     <short-id>fedora19</short-id>
diff --git a/data/os/fedoraproject.org/fedora-2.xml.in b/data/os/fedoraproject.org/fedora-2.xml.in
index f14cd4a..06847ec 100644
--- a/data/os/fedoraproject.org/fedora-2.xml.in
+++ b/data/os/fedoraproject.org/fedora-2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/2";>
     <short-id>fedora2</short-id>
diff --git a/data/os/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
index df802cd..346345b 100644
--- a/data/os/fedoraproject.org/fedora-20.xml.in
+++ b/data/os/fedoraproject.org/fedora-20.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/20";>
     <short-id>fedora20</short-id>
diff --git a/data/os/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
index 2c30ed2..d7c2870 100644
--- a/data/os/fedoraproject.org/fedora-21.xml.in
+++ b/data/os/fedoraproject.org/fedora-21.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/21";>
     <short-id>fedora21</short-id>
diff --git a/data/os/fedoraproject.org/fedora-22.xml.in b/data/os/fedoraproject.org/fedora-22.xml.in
index 4ae1e95..df1718f 100644
--- a/data/os/fedoraproject.org/fedora-22.xml.in
+++ b/data/os/fedoraproject.org/fedora-22.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/22";>
     <short-id>fedora22</short-id>
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index 8eb9120..b884722 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/23";>
     <short-id>fedora23</short-id>
diff --git a/data/os/fedoraproject.org/fedora-24.xml.in b/data/os/fedoraproject.org/fedora-24.xml.in
index f19a67b..1b7f461 100644
--- a/data/os/fedoraproject.org/fedora-24.xml.in
+++ b/data/os/fedoraproject.org/fedora-24.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/24";>
     <short-id>fedora24</short-id>
diff --git a/data/os/fedoraproject.org/fedora-3.xml.in b/data/os/fedoraproject.org/fedora-3.xml.in
index b277dfb..6cfb48b 100644
--- a/data/os/fedoraproject.org/fedora-3.xml.in
+++ b/data/os/fedoraproject.org/fedora-3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/3";>
     <short-id>fedora3</short-id>
diff --git a/data/os/fedoraproject.org/fedora-4.xml.in b/data/os/fedoraproject.org/fedora-4.xml.in
index 3548bbe..f064779 100644
--- a/data/os/fedoraproject.org/fedora-4.xml.in
+++ b/data/os/fedoraproject.org/fedora-4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/4";>
     <short-id>fedora4</short-id>
diff --git a/data/os/fedoraproject.org/fedora-5.xml.in b/data/os/fedoraproject.org/fedora-5.xml.in
index af37c43..2bce9cd 100644
--- a/data/os/fedoraproject.org/fedora-5.xml.in
+++ b/data/os/fedoraproject.org/fedora-5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/5";>
     <short-id>fedora5</short-id>
diff --git a/data/os/fedoraproject.org/fedora-6.xml.in b/data/os/fedoraproject.org/fedora-6.xml.in
index 7c8d472..c80d8a7 100644
--- a/data/os/fedoraproject.org/fedora-6.xml.in
+++ b/data/os/fedoraproject.org/fedora-6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/6";>
     <short-id>fedora6</short-id>
diff --git a/data/os/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
index 621fcf5..03b15ba 100644
--- a/data/os/fedoraproject.org/fedora-7.xml.in
+++ b/data/os/fedoraproject.org/fedora-7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/7";>
     <short-id>fedora7</short-id>
diff --git a/data/os/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
index f41907e..8aae791 100644
--- a/data/os/fedoraproject.org/fedora-8.xml.in
+++ b/data/os/fedoraproject.org/fedora-8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/8";>
     <short-id>fedora8</short-id>
diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
index aa69a8b..a99ba46 100644
--- a/data/os/fedoraproject.org/fedora-9.xml.in
+++ b/data/os/fedoraproject.org/fedora-9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/9";>
     <short-id>fedora9</short-id>
diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index ae42e0f..1f513ec 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://fedoraproject.org/fedora/unknown";>
     <short-id>fedora-unknown</short-id>
diff --git a/data/os/freebsd.org/freebsd-1.0.xml.in b/data/os/freebsd.org/freebsd-1.0.xml.in
index 8bedb86..9927b7c 100644
--- a/data/os/freebsd.org/freebsd-1.0.xml.in
+++ b/data/os/freebsd.org/freebsd-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/1.0";>
     <short-id>freebsd1.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-10.0.xml.in b/data/os/freebsd.org/freebsd-10.0.xml.in
index be42136..0bb1f22 100644
--- a/data/os/freebsd.org/freebsd-10.0.xml.in
+++ b/data/os/freebsd.org/freebsd-10.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/10.0";>
     <short-id>freebsd10.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-10.1.xml.in b/data/os/freebsd.org/freebsd-10.1.xml.in
index f10bdc9..85a76dc 100644
--- a/data/os/freebsd.org/freebsd-10.1.xml.in
+++ b/data/os/freebsd.org/freebsd-10.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/10.1";>
     <short-id>freebsd10.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-10.2.xml.in b/data/os/freebsd.org/freebsd-10.2.xml.in
index bebd9b7..ef407e1 100644
--- a/data/os/freebsd.org/freebsd-10.2.xml.in
+++ b/data/os/freebsd.org/freebsd-10.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/10.2";>
     <short-id>freebsd10.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-10.3.xml.in b/data/os/freebsd.org/freebsd-10.3.xml.in
index 40d62e6..81ad514 100644
--- a/data/os/freebsd.org/freebsd-10.3.xml.in
+++ b/data/os/freebsd.org/freebsd-10.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/10.3";>
     <short-id>freebsd10.3</short-id>
diff --git a/data/os/freebsd.org/freebsd-2.0.5.xml.in b/data/os/freebsd.org/freebsd-2.0.5.xml.in
index 20413a2..744dcec 100644
--- a/data/os/freebsd.org/freebsd-2.0.5.xml.in
+++ b/data/os/freebsd.org/freebsd-2.0.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/2.0.5";>
     <short-id>freebsd2.0.5</short-id>
diff --git a/data/os/freebsd.org/freebsd-2.0.xml.in b/data/os/freebsd.org/freebsd-2.0.xml.in
index 51e0f83..4c28ced 100644
--- a/data/os/freebsd.org/freebsd-2.0.xml.in
+++ b/data/os/freebsd.org/freebsd-2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/2.0";>
     <short-id>freebsd2.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-2.2.8.xml.in b/data/os/freebsd.org/freebsd-2.2.8.xml.in
index 54ad7c0..47eec96 100644
--- a/data/os/freebsd.org/freebsd-2.2.8.xml.in
+++ b/data/os/freebsd.org/freebsd-2.2.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/2.2.8";>
     <short-id>freebsd2.2.8</short-id>
diff --git a/data/os/freebsd.org/freebsd-2.2.9.xml.in b/data/os/freebsd.org/freebsd-2.2.9.xml.in
index 966ce7f..c688e99 100644
--- a/data/os/freebsd.org/freebsd-2.2.9.xml.in
+++ b/data/os/freebsd.org/freebsd-2.2.9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/2.2.9";>
     <short-id>freebsd2.2.9</short-id>
diff --git a/data/os/freebsd.org/freebsd-3.0.xml.in b/data/os/freebsd.org/freebsd-3.0.xml.in
index ba33f02..aaab590 100644
--- a/data/os/freebsd.org/freebsd-3.0.xml.in
+++ b/data/os/freebsd.org/freebsd-3.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/3.0";>
     <short-id>freebsd3.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-3.2.xml.in b/data/os/freebsd.org/freebsd-3.2.xml.in
index 7cb177f..df1e843 100644
--- a/data/os/freebsd.org/freebsd-3.2.xml.in
+++ b/data/os/freebsd.org/freebsd-3.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/3.2";>
     <short-id>freebsd3.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.0.xml.in b/data/os/freebsd.org/freebsd-4.0.xml.in
index 9c8978b..1bf5a59 100644
--- a/data/os/freebsd.org/freebsd-4.0.xml.in
+++ b/data/os/freebsd.org/freebsd-4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.0";>
     <short-id>freebsd4.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.1.xml.in b/data/os/freebsd.org/freebsd-4.1.xml.in
index b696eb8..fb28ae9 100644
--- a/data/os/freebsd.org/freebsd-4.1.xml.in
+++ b/data/os/freebsd.org/freebsd-4.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.1";>
     <short-id>freebsd4.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.10.xml.in b/data/os/freebsd.org/freebsd-4.10.xml.in
index 7641367..52628fb 100644
--- a/data/os/freebsd.org/freebsd-4.10.xml.in
+++ b/data/os/freebsd.org/freebsd-4.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.10";>
     <short-id>freebsd4.10</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.11.xml.in b/data/os/freebsd.org/freebsd-4.11.xml.in
index 515205a..5cd50c0 100644
--- a/data/os/freebsd.org/freebsd-4.11.xml.in
+++ b/data/os/freebsd.org/freebsd-4.11.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.11";>
     <short-id>freebsd4.11</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.2.xml.in b/data/os/freebsd.org/freebsd-4.2.xml.in
index 1b1aeda..d30d957 100644
--- a/data/os/freebsd.org/freebsd-4.2.xml.in
+++ b/data/os/freebsd.org/freebsd-4.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.2";>
     <short-id>freebsd4.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.3.xml.in b/data/os/freebsd.org/freebsd-4.3.xml.in
index a8ef868..6e5c534 100644
--- a/data/os/freebsd.org/freebsd-4.3.xml.in
+++ b/data/os/freebsd.org/freebsd-4.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.3";>
     <short-id>freebsd4.3</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.4.xml.in b/data/os/freebsd.org/freebsd-4.4.xml.in
index af071ae..52764be 100644
--- a/data/os/freebsd.org/freebsd-4.4.xml.in
+++ b/data/os/freebsd.org/freebsd-4.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.4";>
     <short-id>freebsd4.4</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.5.xml.in b/data/os/freebsd.org/freebsd-4.5.xml.in
index 73738ab..2d24f2d 100644
--- a/data/os/freebsd.org/freebsd-4.5.xml.in
+++ b/data/os/freebsd.org/freebsd-4.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.5";>
     <short-id>freebsd4.5</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.6.xml.in b/data/os/freebsd.org/freebsd-4.6.xml.in
index 05317da..5edf707 100644
--- a/data/os/freebsd.org/freebsd-4.6.xml.in
+++ b/data/os/freebsd.org/freebsd-4.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.6";>
     <short-id>freebsd4.6</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.7.xml.in b/data/os/freebsd.org/freebsd-4.7.xml.in
index a62c74e..6f85b8e 100644
--- a/data/os/freebsd.org/freebsd-4.7.xml.in
+++ b/data/os/freebsd.org/freebsd-4.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.7";>
     <short-id>freebsd4.7</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.8.xml.in b/data/os/freebsd.org/freebsd-4.8.xml.in
index 667a03c..9fc6bb6 100644
--- a/data/os/freebsd.org/freebsd-4.8.xml.in
+++ b/data/os/freebsd.org/freebsd-4.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.8";>
     <short-id>freebsd4.8</short-id>
diff --git a/data/os/freebsd.org/freebsd-4.9.xml.in b/data/os/freebsd.org/freebsd-4.9.xml.in
index 7403c42..aaa4863 100644
--- a/data/os/freebsd.org/freebsd-4.9.xml.in
+++ b/data/os/freebsd.org/freebsd-4.9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/4.9";>
     <short-id>freebsd4.9</short-id>
diff --git a/data/os/freebsd.org/freebsd-5.0.xml.in b/data/os/freebsd.org/freebsd-5.0.xml.in
index 120ad7b..9195256 100644
--- a/data/os/freebsd.org/freebsd-5.0.xml.in
+++ b/data/os/freebsd.org/freebsd-5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/5.0";>
     <short-id>freebsd5.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-5.1.xml.in b/data/os/freebsd.org/freebsd-5.1.xml.in
index 2ebd263..c9ef921 100644
--- a/data/os/freebsd.org/freebsd-5.1.xml.in
+++ b/data/os/freebsd.org/freebsd-5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/5.1";>
     <short-id>freebsd5.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-5.2.1.xml.in b/data/os/freebsd.org/freebsd-5.2.1.xml.in
index e3cff9e..fd5cf63 100644
--- a/data/os/freebsd.org/freebsd-5.2.1.xml.in
+++ b/data/os/freebsd.org/freebsd-5.2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/5.2.1";>
     <short-id>freebsd5.2.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-5.2.xml.in b/data/os/freebsd.org/freebsd-5.2.xml.in
index 543a045..f9828cd 100644
--- a/data/os/freebsd.org/freebsd-5.2.xml.in
+++ b/data/os/freebsd.org/freebsd-5.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/5.2";>
     <short-id>freebsd5.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-5.3.xml.in b/data/os/freebsd.org/freebsd-5.3.xml.in
index 4b3216f..6354d84 100644
--- a/data/os/freebsd.org/freebsd-5.3.xml.in
+++ b/data/os/freebsd.org/freebsd-5.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/5.3";>
     <short-id>freebsd5.3</short-id>
diff --git a/data/os/freebsd.org/freebsd-5.4.xml.in b/data/os/freebsd.org/freebsd-5.4.xml.in
index 1b2c246..09c4653 100644
--- a/data/os/freebsd.org/freebsd-5.4.xml.in
+++ b/data/os/freebsd.org/freebsd-5.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/5.4";>
     <short-id>freebsd5.4</short-id>
diff --git a/data/os/freebsd.org/freebsd-5.5.xml.in b/data/os/freebsd.org/freebsd-5.5.xml.in
index 3987ca5..3d53d3a 100644
--- a/data/os/freebsd.org/freebsd-5.5.xml.in
+++ b/data/os/freebsd.org/freebsd-5.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/5.5";>
     <short-id>freebsd5.5</short-id>
diff --git a/data/os/freebsd.org/freebsd-6.0.xml.in b/data/os/freebsd.org/freebsd-6.0.xml.in
index ee7035c..fb61a2e 100644
--- a/data/os/freebsd.org/freebsd-6.0.xml.in
+++ b/data/os/freebsd.org/freebsd-6.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/6.0";>
     <short-id>freebsd6.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-6.1.xml.in b/data/os/freebsd.org/freebsd-6.1.xml.in
index 62aeded..f10e72c 100644
--- a/data/os/freebsd.org/freebsd-6.1.xml.in
+++ b/data/os/freebsd.org/freebsd-6.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/6.1";>
     <short-id>freebsd6.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-6.2.xml.in b/data/os/freebsd.org/freebsd-6.2.xml.in
index 38c63be..25c8ebb 100644
--- a/data/os/freebsd.org/freebsd-6.2.xml.in
+++ b/data/os/freebsd.org/freebsd-6.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/6.2";>
     <short-id>freebsd6.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-6.3.xml.in b/data/os/freebsd.org/freebsd-6.3.xml.in
index d7e4f6f..8abdbbe 100644
--- a/data/os/freebsd.org/freebsd-6.3.xml.in
+++ b/data/os/freebsd.org/freebsd-6.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/6.3";>
     <short-id>freebsd6.3</short-id>
diff --git a/data/os/freebsd.org/freebsd-6.4.xml.in b/data/os/freebsd.org/freebsd-6.4.xml.in
index 623bc83..5f6b7ea 100644
--- a/data/os/freebsd.org/freebsd-6.4.xml.in
+++ b/data/os/freebsd.org/freebsd-6.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/6.4";>
     <short-id>freebsd6.4</short-id>
diff --git a/data/os/freebsd.org/freebsd-7.0.xml.in b/data/os/freebsd.org/freebsd-7.0.xml.in
index 432ef50..74e74c4 100644
--- a/data/os/freebsd.org/freebsd-7.0.xml.in
+++ b/data/os/freebsd.org/freebsd-7.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/7.0";>
     <short-id>freebsd7.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-7.1.xml.in b/data/os/freebsd.org/freebsd-7.1.xml.in
index a0789db..692c180 100644
--- a/data/os/freebsd.org/freebsd-7.1.xml.in
+++ b/data/os/freebsd.org/freebsd-7.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/7.1";>
     <short-id>freebsd7.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-7.2.xml.in b/data/os/freebsd.org/freebsd-7.2.xml.in
index 419c349..4bc9cc3 100644
--- a/data/os/freebsd.org/freebsd-7.2.xml.in
+++ b/data/os/freebsd.org/freebsd-7.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/7.2";>
     <short-id>freebsd7.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-7.3.xml.in b/data/os/freebsd.org/freebsd-7.3.xml.in
index dc2cff2..5ce263c 100644
--- a/data/os/freebsd.org/freebsd-7.3.xml.in
+++ b/data/os/freebsd.org/freebsd-7.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/7.3";>
     <short-id>freebsd7.3</short-id>
diff --git a/data/os/freebsd.org/freebsd-7.4.xml.in b/data/os/freebsd.org/freebsd-7.4.xml.in
index f87286d..40556c1 100644
--- a/data/os/freebsd.org/freebsd-7.4.xml.in
+++ b/data/os/freebsd.org/freebsd-7.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/7.4";>
     <short-id>freebsd7.4</short-id>
diff --git a/data/os/freebsd.org/freebsd-8.0.xml.in b/data/os/freebsd.org/freebsd-8.0.xml.in
index 0fdbc0b..bdafed5 100644
--- a/data/os/freebsd.org/freebsd-8.0.xml.in
+++ b/data/os/freebsd.org/freebsd-8.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/8.0";>
     <short-id>freebsd8.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-8.1.xml.in b/data/os/freebsd.org/freebsd-8.1.xml.in
index e309228..81c0157 100644
--- a/data/os/freebsd.org/freebsd-8.1.xml.in
+++ b/data/os/freebsd.org/freebsd-8.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/8.1";>
     <short-id>freebsd8.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-8.2.xml.in b/data/os/freebsd.org/freebsd-8.2.xml.in
index d6aaf4a..53351bc 100644
--- a/data/os/freebsd.org/freebsd-8.2.xml.in
+++ b/data/os/freebsd.org/freebsd-8.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/8.2";>
     <short-id>freebsd8.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-8.3.xml.in b/data/os/freebsd.org/freebsd-8.3.xml.in
index 64a9aff..afc3ced 100644
--- a/data/os/freebsd.org/freebsd-8.3.xml.in
+++ b/data/os/freebsd.org/freebsd-8.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/8.3";>
     <short-id>freebsd8.3</short-id>
diff --git a/data/os/freebsd.org/freebsd-8.4.xml.in b/data/os/freebsd.org/freebsd-8.4.xml.in
index b67563a..b900d1c 100644
--- a/data/os/freebsd.org/freebsd-8.4.xml.in
+++ b/data/os/freebsd.org/freebsd-8.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/8.4";>
     <short-id>freebsd8.4</short-id>
diff --git a/data/os/freebsd.org/freebsd-9.0.xml.in b/data/os/freebsd.org/freebsd-9.0.xml.in
index 0ee4861..30bf61b 100644
--- a/data/os/freebsd.org/freebsd-9.0.xml.in
+++ b/data/os/freebsd.org/freebsd-9.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/9.0";>
     <short-id>freebsd9.0</short-id>
diff --git a/data/os/freebsd.org/freebsd-9.1.xml.in b/data/os/freebsd.org/freebsd-9.1.xml.in
index ab9592b..3c867c8 100644
--- a/data/os/freebsd.org/freebsd-9.1.xml.in
+++ b/data/os/freebsd.org/freebsd-9.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/9.1";>
     <short-id>freebsd9.1</short-id>
diff --git a/data/os/freebsd.org/freebsd-9.2.xml.in b/data/os/freebsd.org/freebsd-9.2.xml.in
index d5984ef..c483d36 100644
--- a/data/os/freebsd.org/freebsd-9.2.xml.in
+++ b/data/os/freebsd.org/freebsd-9.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/9.2";>
     <short-id>freebsd9.2</short-id>
diff --git a/data/os/freebsd.org/freebsd-9.3.xml.in b/data/os/freebsd.org/freebsd-9.3.xml.in
index 65f2749..cdb8c5d 100644
--- a/data/os/freebsd.org/freebsd-9.3.xml.in
+++ b/data/os/freebsd.org/freebsd-9.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://freebsd.org/freebsd/9.3";>
     <short-id>freebsd9.3</short-id>
diff --git a/data/os/gnome.org/gnome-3.6.xml.in b/data/os/gnome.org/gnome-3.6.xml.in
index 952e287..d89fdc1 100644
--- a/data/os/gnome.org/gnome-3.6.xml.in
+++ b/data/os/gnome.org/gnome-3.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://gnome.org/gnome/3.6";>
     <short-id>gnome3.6</short-id>
diff --git a/data/os/gnome.org/gnome-3.8.xml.in b/data/os/gnome.org/gnome-3.8.xml.in
index 696ed49..1579563 100644
--- a/data/os/gnome.org/gnome-3.8.xml.in
+++ b/data/os/gnome.org/gnome-3.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://gnome.org/gnome/3.8";>
     <short-id>gnome3.8</short-id>
diff --git a/data/os/gnome.org/gnome-continuous-3.10.xml.in b/data/os/gnome.org/gnome-continuous-3.10.xml.in
index a8b4830..cfc3859 100644
--- a/data/os/gnome.org/gnome-continuous-3.10.xml.in
+++ b/data/os/gnome.org/gnome-continuous-3.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://gnome.org/gnome-continuous/3.10";>
     <short-id>gnome-continuous-3.10</short-id>
diff --git a/data/os/gnome.org/gnome-continuous-3.12.xml.in b/data/os/gnome.org/gnome-continuous-3.12.xml.in
index befe384..a0ccfaf 100644
--- a/data/os/gnome.org/gnome-continuous-3.12.xml.in
+++ b/data/os/gnome.org/gnome-continuous-3.12.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://gnome.org/gnome-continuous/3.12";>
     <short-id>gnome-continuous-3.12</short-id>
diff --git a/data/os/gnome.org/gnome-continuous-3.14.xml.in b/data/os/gnome.org/gnome-continuous-3.14.xml.in
index 692cc79..b4007cd 100644
--- a/data/os/gnome.org/gnome-continuous-3.14.xml.in
+++ b/data/os/gnome.org/gnome-continuous-3.14.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://gnome.org/gnome-continuous/3.14";>
     <short-id>gnome-continuous-3.14</short-id>
diff --git a/data/os/mageia.org/mageia-1.xml.in b/data/os/mageia.org/mageia-1.xml.in
index 197b291..01bc3f4 100644
--- a/data/os/mageia.org/mageia-1.xml.in
+++ b/data/os/mageia.org/mageia-1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mageia.org/mageia/1";>
     <short-id>mageia1</short-id>
diff --git a/data/os/mageia.org/mageia-2.xml.in b/data/os/mageia.org/mageia-2.xml.in
index 3a15c80..bf28230 100644
--- a/data/os/mageia.org/mageia-2.xml.in
+++ b/data/os/mageia.org/mageia-2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mageia.org/mageia/2";>
     <short-id>mageia2</short-id>
diff --git a/data/os/mageia.org/mageia-3.xml.in b/data/os/mageia.org/mageia-3.xml.in
index 1230d7e..0a3e1bc 100644
--- a/data/os/mageia.org/mageia-3.xml.in
+++ b/data/os/mageia.org/mageia-3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mageia.org/mageia/3";>
     <short-id>mageia3</short-id>
diff --git a/data/os/mandriva.com/mandrake-10.0.xml.in b/data/os/mandriva.com/mandrake-10.0.xml.in
index 92f4380..956b1c5 100644
--- a/data/os/mandriva.com/mandrake-10.0.xml.in
+++ b/data/os/mandriva.com/mandrake-10.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/10.0";>
     <short-id>mandrake10.0</short-id>
diff --git a/data/os/mandriva.com/mandrake-10.1.xml.in b/data/os/mandriva.com/mandrake-10.1.xml.in
index 3d1022d..f008ca0 100644
--- a/data/os/mandriva.com/mandrake-10.1.xml.in
+++ b/data/os/mandriva.com/mandrake-10.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/10.1";>
     <short-id>mandrake10.1</short-id>
diff --git a/data/os/mandriva.com/mandrake-10.2.xml.in b/data/os/mandriva.com/mandrake-10.2.xml.in
index 7f8cce3..83b72f3 100644
--- a/data/os/mandriva.com/mandrake-10.2.xml.in
+++ b/data/os/mandriva.com/mandrake-10.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/10.2";>
     <short-id>mandrake10.2</short-id>
diff --git a/data/os/mandriva.com/mandrake-5.1.xml.in b/data/os/mandriva.com/mandrake-5.1.xml.in
index eabfd03..54ed14f 100644
--- a/data/os/mandriva.com/mandrake-5.1.xml.in
+++ b/data/os/mandriva.com/mandrake-5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/5.1";>
     <short-id>mandrake5.1</short-id>
diff --git a/data/os/mandriva.com/mandrake-5.2.xml.in b/data/os/mandriva.com/mandrake-5.2.xml.in
index 6c7b2e9..8294d59 100644
--- a/data/os/mandriva.com/mandrake-5.2.xml.in
+++ b/data/os/mandriva.com/mandrake-5.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/5.2";>
     <short-id>mandrake5.2</short-id>
diff --git a/data/os/mandriva.com/mandrake-5.3.xml.in b/data/os/mandriva.com/mandrake-5.3.xml.in
index a1e46f9..675fab4 100644
--- a/data/os/mandriva.com/mandrake-5.3.xml.in
+++ b/data/os/mandriva.com/mandrake-5.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/5.3";>
     <short-id>mandrake5.3</short-id>
diff --git a/data/os/mandriva.com/mandrake-6.0.xml.in b/data/os/mandriva.com/mandrake-6.0.xml.in
index 8a5c4ef..891c757 100644
--- a/data/os/mandriva.com/mandrake-6.0.xml.in
+++ b/data/os/mandriva.com/mandrake-6.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/6.0";>
     <short-id>mandrake6.0</short-id>
diff --git a/data/os/mandriva.com/mandrake-6.1.xml.in b/data/os/mandriva.com/mandrake-6.1.xml.in
index 5a9ba6f..b26b5cf 100644
--- a/data/os/mandriva.com/mandrake-6.1.xml.in
+++ b/data/os/mandriva.com/mandrake-6.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/6.1";>
     <short-id>mandrake6.1</short-id>
diff --git a/data/os/mandriva.com/mandrake-7.0.xml.in b/data/os/mandriva.com/mandrake-7.0.xml.in
index bbc1345..65efdcf 100644
--- a/data/os/mandriva.com/mandrake-7.0.xml.in
+++ b/data/os/mandriva.com/mandrake-7.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/7.0";>
     <short-id>mandrake7.0</short-id>
diff --git a/data/os/mandriva.com/mandrake-7.1.xml.in b/data/os/mandriva.com/mandrake-7.1.xml.in
index 7037423..46a54ff 100644
--- a/data/os/mandriva.com/mandrake-7.1.xml.in
+++ b/data/os/mandriva.com/mandrake-7.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/7.1";>
     <short-id>mandrake7.1</short-id>
diff --git a/data/os/mandriva.com/mandrake-7.2.xml.in b/data/os/mandriva.com/mandrake-7.2.xml.in
index b525ec1..a02facf 100644
--- a/data/os/mandriva.com/mandrake-7.2.xml.in
+++ b/data/os/mandriva.com/mandrake-7.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/7.2";>
     <short-id>mandrake7.2</short-id>
diff --git a/data/os/mandriva.com/mandrake-8.0.xml.in b/data/os/mandriva.com/mandrake-8.0.xml.in
index 7fb19f7..bb1dcb9 100644
--- a/data/os/mandriva.com/mandrake-8.0.xml.in
+++ b/data/os/mandriva.com/mandrake-8.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/8.0";>
     <short-id>mandrake8.0</short-id>
diff --git a/data/os/mandriva.com/mandrake-8.1.xml.in b/data/os/mandriva.com/mandrake-8.1.xml.in
index 8d2959a..30fa8f0 100644
--- a/data/os/mandriva.com/mandrake-8.1.xml.in
+++ b/data/os/mandriva.com/mandrake-8.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/8.1";>
     <short-id>mandrake8.1</short-id>
diff --git a/data/os/mandriva.com/mandrake-8.2.xml.in b/data/os/mandriva.com/mandrake-8.2.xml.in
index 6fcfedf..f7de8ca 100644
--- a/data/os/mandriva.com/mandrake-8.2.xml.in
+++ b/data/os/mandriva.com/mandrake-8.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/8.2";>
     <short-id>mandrake8.2</short-id>
diff --git a/data/os/mandriva.com/mandrake-9.0.xml.in b/data/os/mandriva.com/mandrake-9.0.xml.in
index 08986c7..fb74cbf 100644
--- a/data/os/mandriva.com/mandrake-9.0.xml.in
+++ b/data/os/mandriva.com/mandrake-9.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/9.0";>
     <short-id>mandrake9.0</short-id>
diff --git a/data/os/mandriva.com/mandrake-9.1.xml.in b/data/os/mandriva.com/mandrake-9.1.xml.in
index 8cba25a..a12265b 100644
--- a/data/os/mandriva.com/mandrake-9.1.xml.in
+++ b/data/os/mandriva.com/mandrake-9.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/9.1";>
     <short-id>mandrake9.1</short-id>
diff --git a/data/os/mandriva.com/mandrake-9.2.xml.in b/data/os/mandriva.com/mandrake-9.2.xml.in
index 094e780..4cb7790 100644
--- a/data/os/mandriva.com/mandrake-9.2.xml.in
+++ b/data/os/mandriva.com/mandrake-9.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandrake/9.2";>
     <short-id>mandrake9.2</short-id>
diff --git a/data/os/mandriva.com/mandriva-2006.0.xml.in b/data/os/mandriva.com/mandriva-2006.0.xml.in
index c5a11b3..6769a20 100644
--- a/data/os/mandriva.com/mandriva-2006.0.xml.in
+++ b/data/os/mandriva.com/mandriva-2006.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2006.0";>
     <short-id>mandriva2006.0</short-id>
diff --git a/data/os/mandriva.com/mandriva-2007.1.xml.in b/data/os/mandriva.com/mandriva-2007.1.xml.in
index 237e559..4e21568 100644
--- a/data/os/mandriva.com/mandriva-2007.1.xml.in
+++ b/data/os/mandriva.com/mandriva-2007.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2007.1";>
     <short-id>mandriva2007.1</short-id>
diff --git a/data/os/mandriva.com/mandriva-2007.xml.in b/data/os/mandriva.com/mandriva-2007.xml.in
index b8e5dca..9831884 100644
--- a/data/os/mandriva.com/mandriva-2007.xml.in
+++ b/data/os/mandriva.com/mandriva-2007.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2007";>
     <short-id>mandriva2007</short-id>
diff --git a/data/os/mandriva.com/mandriva-2008.0.xml.in b/data/os/mandriva.com/mandriva-2008.0.xml.in
index 35b143e..8fabcb6 100644
--- a/data/os/mandriva.com/mandriva-2008.0.xml.in
+++ b/data/os/mandriva.com/mandriva-2008.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2008.0";>
     <short-id>mandriva2008.0</short-id>
diff --git a/data/os/mandriva.com/mandriva-2008.1.xml.in b/data/os/mandriva.com/mandriva-2008.1.xml.in
index 1c22874..4f6f050 100644
--- a/data/os/mandriva.com/mandriva-2008.1.xml.in
+++ b/data/os/mandriva.com/mandriva-2008.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2008.1";>
     <short-id>mandriva2008.1</short-id>
diff --git a/data/os/mandriva.com/mandriva-2009.0.xml.in b/data/os/mandriva.com/mandriva-2009.0.xml.in
index a235f0d..5290aa7 100644
--- a/data/os/mandriva.com/mandriva-2009.0.xml.in
+++ b/data/os/mandriva.com/mandriva-2009.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2009.0";>
     <short-id>mandriva2009.0</short-id>
diff --git a/data/os/mandriva.com/mandriva-2009.1.xml.in b/data/os/mandriva.com/mandriva-2009.1.xml.in
index d0b1c17..797bd51 100644
--- a/data/os/mandriva.com/mandriva-2009.1.xml.in
+++ b/data/os/mandriva.com/mandriva-2009.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2009.1";>
     <short-id>mandriva2009.1</short-id>
diff --git a/data/os/mandriva.com/mandriva-2010.0.xml.in b/data/os/mandriva.com/mandriva-2010.0.xml.in
index 26f28ad..d340d2d 100644
--- a/data/os/mandriva.com/mandriva-2010.0.xml.in
+++ b/data/os/mandriva.com/mandriva-2010.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2010.0";>
     <short-id>mandriva2010.0</short-id>
diff --git a/data/os/mandriva.com/mandriva-2010.1.xml.in b/data/os/mandriva.com/mandriva-2010.1.xml.in
index 2d26ebb..ba4f8e3 100644
--- a/data/os/mandriva.com/mandriva-2010.1.xml.in
+++ b/data/os/mandriva.com/mandriva-2010.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2010.1";>
     <short-id>mandriva2010.1</short-id>
diff --git a/data/os/mandriva.com/mandriva-2010.2.xml.in b/data/os/mandriva.com/mandriva-2010.2.xml.in
index 31043fe..5fc3a7e 100644
--- a/data/os/mandriva.com/mandriva-2010.2.xml.in
+++ b/data/os/mandriva.com/mandriva-2010.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2010.2";>
     <short-id>mandriva2010.2</short-id>
diff --git a/data/os/mandriva.com/mandriva-2011.xml.in b/data/os/mandriva.com/mandriva-2011.xml.in
index e101e86..da40055 100644
--- a/data/os/mandriva.com/mandriva-2011.xml.in
+++ b/data/os/mandriva.com/mandriva-2011.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mandriva/2011";>
     <short-id>mandriva2011</short-id>
diff --git a/data/os/mandriva.com/mbs-1.0.xml.in b/data/os/mandriva.com/mbs-1.0.xml.in
index c8041cd..147a1c1 100644
--- a/data/os/mandriva.com/mbs-1.0.xml.in
+++ b/data/os/mandriva.com/mbs-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mbs/1.0";>
     <short-id>mbs1.0</short-id>
diff --git a/data/os/mandriva.com/mes-5.0.xml.in b/data/os/mandriva.com/mes-5.0.xml.in
index 5663502..ed63525 100644
--- a/data/os/mandriva.com/mes-5.0.xml.in
+++ b/data/os/mandriva.com/mes-5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mes/5.0";>
     <short-id>mes5</short-id>
diff --git a/data/os/mandriva.com/mes-5.1.xml.in b/data/os/mandriva.com/mes-5.1.xml.in
index 9426d2a..ab7bbcf 100644
--- a/data/os/mandriva.com/mes-5.1.xml.in
+++ b/data/os/mandriva.com/mes-5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://mandriva.com/mes/5.1";>
     <short-id>mes5.1</short-id>
diff --git a/data/os/microsoft.com/msdos-6.22.xml.in b/data/os/microsoft.com/msdos-6.22.xml.in
index a6a3b21..497f8c0 100644
--- a/data/os/microsoft.com/msdos-6.22.xml.in
+++ b/data/os/microsoft.com/msdos-6.22.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/msdos/6.22";>
     <short-id>msdos6.22</short-id>
diff --git a/data/os/microsoft.com/win-1.0.xml.in b/data/os/microsoft.com/win-1.0.xml.in
index 2eb4580..ff08ba3 100644
--- a/data/os/microsoft.com/win-1.0.xml.in
+++ b/data/os/microsoft.com/win-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/1.0";>
     <short-id>win1.0</short-id>
diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index 514c6fe..6062d59 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/10";>
     <short-id>win10</short-id>
diff --git a/data/os/microsoft.com/win-2.0.xml.in b/data/os/microsoft.com/win-2.0.xml.in
index ac47b98..c1a6f3c 100644
--- a/data/os/microsoft.com/win-2.0.xml.in
+++ b/data/os/microsoft.com/win-2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2.0";>
     <short-id>win2.0</short-id>
diff --git a/data/os/microsoft.com/win-2.1.xml.in b/data/os/microsoft.com/win-2.1.xml.in
index 9c3a0ef..eec6050 100644
--- a/data/os/microsoft.com/win-2.1.xml.in
+++ b/data/os/microsoft.com/win-2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2.1";>
     <short-id>win2.1</short-id>
diff --git a/data/os/microsoft.com/win-2k.xml.in b/data/os/microsoft.com/win-2k.xml.in
index b844475..cd0a7e6 100644
--- a/data/os/microsoft.com/win-2k.xml.in
+++ b/data/os/microsoft.com/win-2k.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2k";>
     <short-id>win2k</short-id>
diff --git a/data/os/microsoft.com/win-2k12.xml.in b/data/os/microsoft.com/win-2k12.xml.in
index d7e97f2..c65fb8f 100644
--- a/data/os/microsoft.com/win-2k12.xml.in
+++ b/data/os/microsoft.com/win-2k12.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2k12";>
     <short-id>win2k12</short-id>
diff --git a/data/os/microsoft.com/win-2k12r2.xml.in b/data/os/microsoft.com/win-2k12r2.xml.in
index 6359235..473ffda 100644
--- a/data/os/microsoft.com/win-2k12r2.xml.in
+++ b/data/os/microsoft.com/win-2k12r2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2k12r2";>
     <short-id>win2k12r2</short-id>
diff --git a/data/os/microsoft.com/win-2k3.xml.in b/data/os/microsoft.com/win-2k3.xml.in
index 07b24ac..958c124 100644
--- a/data/os/microsoft.com/win-2k3.xml.in
+++ b/data/os/microsoft.com/win-2k3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2k3";>
     <short-id>win2k3</short-id>
diff --git a/data/os/microsoft.com/win-2k3r2.xml.in b/data/os/microsoft.com/win-2k3r2.xml.in
index 6fa201b..83fb749 100644
--- a/data/os/microsoft.com/win-2k3r2.xml.in
+++ b/data/os/microsoft.com/win-2k3r2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2k3r2";>
     <short-id>win2k3r2</short-id>
diff --git a/data/os/microsoft.com/win-2k8.xml.in b/data/os/microsoft.com/win-2k8.xml.in
index 55526dd..63fb066 100644
--- a/data/os/microsoft.com/win-2k8.xml.in
+++ b/data/os/microsoft.com/win-2k8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2k8";>
     <short-id>win2k8</short-id>
diff --git a/data/os/microsoft.com/win-2k8r2.xml.in b/data/os/microsoft.com/win-2k8r2.xml.in
index f063659..2edb169 100644
--- a/data/os/microsoft.com/win-2k8r2.xml.in
+++ b/data/os/microsoft.com/win-2k8r2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/2k8r2";>
     <short-id>win2k8r2</short-id>
diff --git a/data/os/microsoft.com/win-3.1.xml.in b/data/os/microsoft.com/win-3.1.xml.in
index 733dfd1..98e3fac 100644
--- a/data/os/microsoft.com/win-3.1.xml.in
+++ b/data/os/microsoft.com/win-3.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/3.1";>
     <short-id>win3.1</short-id>
diff --git a/data/os/microsoft.com/win-7.xml.in b/data/os/microsoft.com/win-7.xml.in
index 6b499ef..1e6e042 100644
--- a/data/os/microsoft.com/win-7.xml.in
+++ b/data/os/microsoft.com/win-7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/7";>
     <short-id>win7</short-id>
diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in
index 8489853..4312f81 100644
--- a/data/os/microsoft.com/win-8.1.xml.in
+++ b/data/os/microsoft.com/win-8.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/8.1";>
     <short-id>win8.1</short-id>
diff --git a/data/os/microsoft.com/win-8.xml.in b/data/os/microsoft.com/win-8.xml.in
index 6d23020..408e390 100644
--- a/data/os/microsoft.com/win-8.xml.in
+++ b/data/os/microsoft.com/win-8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/8";>
     <short-id>win8</short-id>
diff --git a/data/os/microsoft.com/win-95.xml.in b/data/os/microsoft.com/win-95.xml.in
index 4cfaf2a..69654ad 100644
--- a/data/os/microsoft.com/win-95.xml.in
+++ b/data/os/microsoft.com/win-95.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/95";>
     <short-id>win95</short-id>
diff --git a/data/os/microsoft.com/win-98.xml.in b/data/os/microsoft.com/win-98.xml.in
index 50aa74e..0e88012 100644
--- a/data/os/microsoft.com/win-98.xml.in
+++ b/data/os/microsoft.com/win-98.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/98";>
     <short-id>win98</short-id>
diff --git a/data/os/microsoft.com/win-me.xml.in b/data/os/microsoft.com/win-me.xml.in
index ea18bd7..e6fa35e 100644
--- a/data/os/microsoft.com/win-me.xml.in
+++ b/data/os/microsoft.com/win-me.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/me";>
     <short-id>winme</short-id>
diff --git a/data/os/microsoft.com/win-vista.xml.in b/data/os/microsoft.com/win-vista.xml.in
index d67219d..770be67 100644
--- a/data/os/microsoft.com/win-vista.xml.in
+++ b/data/os/microsoft.com/win-vista.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/vista";>
     <short-id>winvista</short-id>
diff --git a/data/os/microsoft.com/win-xp.xml.in b/data/os/microsoft.com/win-xp.xml.in
index 36edd07..ca0b660 100644
--- a/data/os/microsoft.com/win-xp.xml.in
+++ b/data/os/microsoft.com/win-xp.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/win/xp";>
     <short-id>winxp</short-id>
diff --git a/data/os/microsoft.com/winnt-3.1.xml.in b/data/os/microsoft.com/winnt-3.1.xml.in
index 1171e13..b885cb7 100644
--- a/data/os/microsoft.com/winnt-3.1.xml.in
+++ b/data/os/microsoft.com/winnt-3.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/winnt/3.1";>
     <short-id>winnt3.1</short-id>
diff --git a/data/os/microsoft.com/winnt-3.5.xml.in b/data/os/microsoft.com/winnt-3.5.xml.in
index f175c2c..36c1354 100644
--- a/data/os/microsoft.com/winnt-3.5.xml.in
+++ b/data/os/microsoft.com/winnt-3.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/winnt/3.5";>
     <short-id>winnt3.5</short-id>
diff --git a/data/os/microsoft.com/winnt-3.51.xml.in b/data/os/microsoft.com/winnt-3.51.xml.in
index a7bd702..720be00 100644
--- a/data/os/microsoft.com/winnt-3.51.xml.in
+++ b/data/os/microsoft.com/winnt-3.51.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/winnt/3.51";>
     <short-id>winnt3.51</short-id>
diff --git a/data/os/microsoft.com/winnt-4.0.xml.in b/data/os/microsoft.com/winnt-4.0.xml.in
index dd6b2d7..47baf89 100644
--- a/data/os/microsoft.com/winnt-4.0.xml.in
+++ b/data/os/microsoft.com/winnt-4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://microsoft.com/winnt/4.0";>
     <short-id>winnt4.0</short-id>
diff --git a/data/os/netbsd.org/netbsd-0.8.xml.in b/data/os/netbsd.org/netbsd-0.8.xml.in
index 7ebbcea..3f14f04 100644
--- a/data/os/netbsd.org/netbsd-0.8.xml.in
+++ b/data/os/netbsd.org/netbsd-0.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/0.8";>
     <short-id>netbsd0.8</short-id>
diff --git a/data/os/netbsd.org/netbsd-0.9.xml.in b/data/os/netbsd.org/netbsd-0.9.xml.in
index 10fb08b..3305ada 100644
--- a/data/os/netbsd.org/netbsd-0.9.xml.in
+++ b/data/os/netbsd.org/netbsd-0.9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/0.9";>
     <short-id>netbsd0.9</short-id>
diff --git a/data/os/netbsd.org/netbsd-1.0.xml.in b/data/os/netbsd.org/netbsd-1.0.xml.in
index daa92b4..d359a84 100644
--- a/data/os/netbsd.org/netbsd-1.0.xml.in
+++ b/data/os/netbsd.org/netbsd-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/1.0";>
     <short-id>netbsd1.0</short-id>
diff --git a/data/os/netbsd.org/netbsd-1.1.xml.in b/data/os/netbsd.org/netbsd-1.1.xml.in
index 5ff903b..f814988 100644
--- a/data/os/netbsd.org/netbsd-1.1.xml.in
+++ b/data/os/netbsd.org/netbsd-1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/1.1";>
     <short-id>netbsd1.1</short-id>
diff --git a/data/os/netbsd.org/netbsd-1.2.xml.in b/data/os/netbsd.org/netbsd-1.2.xml.in
index 2ea8103..5d7a731 100644
--- a/data/os/netbsd.org/netbsd-1.2.xml.in
+++ b/data/os/netbsd.org/netbsd-1.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/1.2";>
     <short-id>netbsd1.2</short-id>
diff --git a/data/os/netbsd.org/netbsd-1.3.xml.in b/data/os/netbsd.org/netbsd-1.3.xml.in
index 69d8df6..5060247 100644
--- a/data/os/netbsd.org/netbsd-1.3.xml.in
+++ b/data/os/netbsd.org/netbsd-1.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/1.3";>
     <short-id>netbsd1.3</short-id>
diff --git a/data/os/netbsd.org/netbsd-1.4.xml.in b/data/os/netbsd.org/netbsd-1.4.xml.in
index 6c7aec6..5aa6c25 100644
--- a/data/os/netbsd.org/netbsd-1.4.xml.in
+++ b/data/os/netbsd.org/netbsd-1.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/1.4";>
     <short-id>netbsd1.4</short-id>
diff --git a/data/os/netbsd.org/netbsd-1.5.xml.in b/data/os/netbsd.org/netbsd-1.5.xml.in
index 83de362..7991e2d 100644
--- a/data/os/netbsd.org/netbsd-1.5.xml.in
+++ b/data/os/netbsd.org/netbsd-1.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/1.5";>
     <short-id>netbsd1.5</short-id>
diff --git a/data/os/netbsd.org/netbsd-1.6.xml.in b/data/os/netbsd.org/netbsd-1.6.xml.in
index 62a95ed..97623f1 100644
--- a/data/os/netbsd.org/netbsd-1.6.xml.in
+++ b/data/os/netbsd.org/netbsd-1.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/1.6";>
     <short-id>netbsd1.6</short-id>
diff --git a/data/os/netbsd.org/netbsd-2.0.xml.in b/data/os/netbsd.org/netbsd-2.0.xml.in
index 3de5d0c..3a331b9 100644
--- a/data/os/netbsd.org/netbsd-2.0.xml.in
+++ b/data/os/netbsd.org/netbsd-2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/2.0";>
     <short-id>netbsd2.0</short-id>
diff --git a/data/os/netbsd.org/netbsd-3.0.xml.in b/data/os/netbsd.org/netbsd-3.0.xml.in
index 60cf633..dab3600 100644
--- a/data/os/netbsd.org/netbsd-3.0.xml.in
+++ b/data/os/netbsd.org/netbsd-3.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/3.0";>
     <short-id>netbsd3.0</short-id>
diff --git a/data/os/netbsd.org/netbsd-4.0.xml.in b/data/os/netbsd.org/netbsd-4.0.xml.in
index 425e14f..36390d2 100644
--- a/data/os/netbsd.org/netbsd-4.0.xml.in
+++ b/data/os/netbsd.org/netbsd-4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/4.0";>
     <short-id>netbsd4.0</short-id>
diff --git a/data/os/netbsd.org/netbsd-5.0.xml.in b/data/os/netbsd.org/netbsd-5.0.xml.in
index 320c9e7..0001637 100644
--- a/data/os/netbsd.org/netbsd-5.0.xml.in
+++ b/data/os/netbsd.org/netbsd-5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/5.0";>
     <short-id>netbsd5.0</short-id>
diff --git a/data/os/netbsd.org/netbsd-5.1.xml.in b/data/os/netbsd.org/netbsd-5.1.xml.in
index c7ccb08..ccfbfba 100644
--- a/data/os/netbsd.org/netbsd-5.1.xml.in
+++ b/data/os/netbsd.org/netbsd-5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://netbsd.org/netbsd/5.1";>
     <short-id>netbsd5.1</short-id>
diff --git a/data/os/novell.com/netware-4.xml.in b/data/os/novell.com/netware-4.xml.in
index 0c3bd59..7e07b7f 100644
--- a/data/os/novell.com/netware-4.xml.in
+++ b/data/os/novell.com/netware-4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://novell.com/netware/4";>
     <short-id>netware4</short-id>
diff --git a/data/os/novell.com/netware-5.xml.in b/data/os/novell.com/netware-5.xml.in
index fce790b..5a69907 100644
--- a/data/os/novell.com/netware-5.xml.in
+++ b/data/os/novell.com/netware-5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://novell.com/netware/5";>
     <short-id>netware5</short-id>
diff --git a/data/os/novell.com/netware-6.xml.in b/data/os/novell.com/netware-6.xml.in
index 175f9e3..a298b59 100644
--- a/data/os/novell.com/netware-6.xml.in
+++ b/data/os/novell.com/netware-6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://novell.com/netware/6";>
     <short-id>netware6</short-id>
diff --git a/data/os/openbsd.org/openbsd-4.2.xml.in b/data/os/openbsd.org/openbsd-4.2.xml.in
index fe84888..8328730 100644
--- a/data/os/openbsd.org/openbsd-4.2.xml.in
+++ b/data/os/openbsd.org/openbsd-4.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/4.2";>
     <short-id>openbsd4.2</short-id>
diff --git a/data/os/openbsd.org/openbsd-4.3.xml.in b/data/os/openbsd.org/openbsd-4.3.xml.in
index 49e9a46..1b54167 100644
--- a/data/os/openbsd.org/openbsd-4.3.xml.in
+++ b/data/os/openbsd.org/openbsd-4.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/4.3";>
     <short-id>openbsd4.3</short-id>
diff --git a/data/os/openbsd.org/openbsd-4.4.xml.in b/data/os/openbsd.org/openbsd-4.4.xml.in
index 047b28e..cc8d6e2 100644
--- a/data/os/openbsd.org/openbsd-4.4.xml.in
+++ b/data/os/openbsd.org/openbsd-4.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/4.4";>
     <short-id>openbsd4.4</short-id>
diff --git a/data/os/openbsd.org/openbsd-4.5.xml.in b/data/os/openbsd.org/openbsd-4.5.xml.in
index da86b15..b4a6818 100644
--- a/data/os/openbsd.org/openbsd-4.5.xml.in
+++ b/data/os/openbsd.org/openbsd-4.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/4.5";>
     <short-id>openbsd4.5</short-id>
diff --git a/data/os/openbsd.org/openbsd-4.8.xml.in b/data/os/openbsd.org/openbsd-4.8.xml.in
index 43911c9..983fcf3 100644
--- a/data/os/openbsd.org/openbsd-4.8.xml.in
+++ b/data/os/openbsd.org/openbsd-4.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/4.8";>
     <short-id>openbsd4.8</short-id>
diff --git a/data/os/openbsd.org/openbsd-4.9.xml.in b/data/os/openbsd.org/openbsd-4.9.xml.in
index fe00aa0..d000f0d 100644
--- a/data/os/openbsd.org/openbsd-4.9.xml.in
+++ b/data/os/openbsd.org/openbsd-4.9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/4.9";>
     <short-id>openbsd4.9</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.0.xml.in b/data/os/openbsd.org/openbsd-5.0.xml.in
index be1832e..7d4f257 100644
--- a/data/os/openbsd.org/openbsd-5.0.xml.in
+++ b/data/os/openbsd.org/openbsd-5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.0";>
     <short-id>openbsd5.0</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.1.xml.in b/data/os/openbsd.org/openbsd-5.1.xml.in
index f424fde..c9d7471 100644
--- a/data/os/openbsd.org/openbsd-5.1.xml.in
+++ b/data/os/openbsd.org/openbsd-5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.1";>
     <short-id>openbsd5.1</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.2.xml.in b/data/os/openbsd.org/openbsd-5.2.xml.in
index 4fb671f..65d6dea 100644
--- a/data/os/openbsd.org/openbsd-5.2.xml.in
+++ b/data/os/openbsd.org/openbsd-5.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.2";>
     <short-id>openbsd5.2</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.3.xml.in b/data/os/openbsd.org/openbsd-5.3.xml.in
index 596812f..e3e28d6 100644
--- a/data/os/openbsd.org/openbsd-5.3.xml.in
+++ b/data/os/openbsd.org/openbsd-5.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.3";>
     <short-id>openbsd5.3</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.4.xml.in b/data/os/openbsd.org/openbsd-5.4.xml.in
index 59597f9..340de3a 100644
--- a/data/os/openbsd.org/openbsd-5.4.xml.in
+++ b/data/os/openbsd.org/openbsd-5.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.4";>
     <short-id>openbsd5.4</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.5.xml.in b/data/os/openbsd.org/openbsd-5.5.xml.in
index fff156e..2da4d1f 100644
--- a/data/os/openbsd.org/openbsd-5.5.xml.in
+++ b/data/os/openbsd.org/openbsd-5.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.5";>
     <short-id>openbsd5.5</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.6.xml.in b/data/os/openbsd.org/openbsd-5.6.xml.in
index 5d56728..394ab27 100644
--- a/data/os/openbsd.org/openbsd-5.6.xml.in
+++ b/data/os/openbsd.org/openbsd-5.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.6";>
     <short-id>openbsd5.6</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.7.xml.in b/data/os/openbsd.org/openbsd-5.7.xml.in
index 8866094..7057380 100644
--- a/data/os/openbsd.org/openbsd-5.7.xml.in
+++ b/data/os/openbsd.org/openbsd-5.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.7";>
     <short-id>openbsd5.7</short-id>
diff --git a/data/os/openbsd.org/openbsd-5.8.xml.in b/data/os/openbsd.org/openbsd-5.8.xml.in
index 77dbb0c..eac3610 100644
--- a/data/os/openbsd.org/openbsd-5.8.xml.in
+++ b/data/os/openbsd.org/openbsd-5.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://openbsd.org/openbsd/5.8";>
     <short-id>openbsd5.8</short-id>
diff --git a/data/os/opensuse.org/opensuse-10.2.xml.in b/data/os/opensuse.org/opensuse-10.2.xml.in
index f8e127f..55699c2 100644
--- a/data/os/opensuse.org/opensuse-10.2.xml.in
+++ b/data/os/opensuse.org/opensuse-10.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/10.2";>
     <short-id>opensuse10.2</short-id>
diff --git a/data/os/opensuse.org/opensuse-10.3.xml.in b/data/os/opensuse.org/opensuse-10.3.xml.in
index 930c9ef..85572ea 100644
--- a/data/os/opensuse.org/opensuse-10.3.xml.in
+++ b/data/os/opensuse.org/opensuse-10.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/10.3";>
     <short-id>opensuse10.3</short-id>
diff --git a/data/os/opensuse.org/opensuse-11.0.xml.in b/data/os/opensuse.org/opensuse-11.0.xml.in
index 043567a..eac4b21 100644
--- a/data/os/opensuse.org/opensuse-11.0.xml.in
+++ b/data/os/opensuse.org/opensuse-11.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/11.0";>
     <short-id>opensuse11.0</short-id>
diff --git a/data/os/opensuse.org/opensuse-11.1.xml.in b/data/os/opensuse.org/opensuse-11.1.xml.in
index 9dedb33..e5b574b 100644
--- a/data/os/opensuse.org/opensuse-11.1.xml.in
+++ b/data/os/opensuse.org/opensuse-11.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/11.1";>
     <short-id>opensuse11.1</short-id>
diff --git a/data/os/opensuse.org/opensuse-11.2.xml.in b/data/os/opensuse.org/opensuse-11.2.xml.in
index 2588eff..5ef4692 100644
--- a/data/os/opensuse.org/opensuse-11.2.xml.in
+++ b/data/os/opensuse.org/opensuse-11.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/11.2";>
     <short-id>opensuse11.2</short-id>
diff --git a/data/os/opensuse.org/opensuse-11.3.xml.in b/data/os/opensuse.org/opensuse-11.3.xml.in
index b199817..bdb7a20 100644
--- a/data/os/opensuse.org/opensuse-11.3.xml.in
+++ b/data/os/opensuse.org/opensuse-11.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/11.3";>
     <short-id>opensuse11.3</short-id>
diff --git a/data/os/opensuse.org/opensuse-11.4.xml.in b/data/os/opensuse.org/opensuse-11.4.xml.in
index 1cd85c2..0b9bf83 100644
--- a/data/os/opensuse.org/opensuse-11.4.xml.in
+++ b/data/os/opensuse.org/opensuse-11.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/11.4";>
     <short-id>opensuse11.4</short-id>
diff --git a/data/os/opensuse.org/opensuse-12.1.xml.in b/data/os/opensuse.org/opensuse-12.1.xml.in
index 22028bd..0eb9420 100644
--- a/data/os/opensuse.org/opensuse-12.1.xml.in
+++ b/data/os/opensuse.org/opensuse-12.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/12.1";>
     <short-id>opensuse12.1</short-id>
diff --git a/data/os/opensuse.org/opensuse-12.2.xml.in b/data/os/opensuse.org/opensuse-12.2.xml.in
index 489db12..adf4ebc 100644
--- a/data/os/opensuse.org/opensuse-12.2.xml.in
+++ b/data/os/opensuse.org/opensuse-12.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/12.2";>
     <short-id>opensuse12.2</short-id>
diff --git a/data/os/opensuse.org/opensuse-12.3.xml.in b/data/os/opensuse.org/opensuse-12.3.xml.in
index 8a68922..dc39529 100644
--- a/data/os/opensuse.org/opensuse-12.3.xml.in
+++ b/data/os/opensuse.org/opensuse-12.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/12.3";>
     <short-id>opensuse12.3</short-id>
diff --git a/data/os/opensuse.org/opensuse-13.1.xml.in b/data/os/opensuse.org/opensuse-13.1.xml.in
index ddd82d4..33d5f70 100644
--- a/data/os/opensuse.org/opensuse-13.1.xml.in
+++ b/data/os/opensuse.org/opensuse-13.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/13.1";>
     <short-id>opensuse13.1</short-id>
diff --git a/data/os/opensuse.org/opensuse-13.2.xml.in b/data/os/opensuse.org/opensuse-13.2.xml.in
index 6f07fc7..2fdf6c6 100644
--- a/data/os/opensuse.org/opensuse-13.2.xml.in
+++ b/data/os/opensuse.org/opensuse-13.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/13.2";>
     <short-id>opensuse13.2</short-id>
diff --git a/data/os/opensuse.org/opensuse-42.1.xml.in b/data/os/opensuse.org/opensuse-42.1.xml.in
index 9647746..c46a57a 100644
--- a/data/os/opensuse.org/opensuse-42.1.xml.in
+++ b/data/os/opensuse.org/opensuse-42.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/42.1";>
     <short-id>opensuse42.1</short-id>
diff --git a/data/os/opensuse.org/opensuse-factory.xml.in b/data/os/opensuse.org/opensuse-factory.xml.in
index c20f107..67567b5 100644
--- a/data/os/opensuse.org/opensuse-factory.xml.in
+++ b/data/os/opensuse.org/opensuse-factory.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/factory";>
     <short-id>opensuse-factory</short-id>
diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
index 23673fe..3876417 100644
--- a/data/os/opensuse.org/opensuse-tumbleweed.xml.in
+++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/tumbleweed";>
     <short-id>opensusetumbleweed</short-id>
diff --git a/data/os/opensuse.org/opensuse-unknown.xml.in b/data/os/opensuse.org/opensuse-unknown.xml.in
index 8887562..7e87c3e 100644
--- a/data/os/opensuse.org/opensuse-unknown.xml.in
+++ b/data/os/opensuse.org/opensuse-unknown.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://opensuse.org/opensuse/unknown";>
     <short-id>opensuse-unknown</short-id>
diff --git a/data/os/oracle.com/solaris-11.xml.in b/data/os/oracle.com/solaris-11.xml.in
index 9cf0b60..7c97e3d 100644
--- a/data/os/oracle.com/solaris-11.xml.in
+++ b/data/os/oracle.com/solaris-11.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://oracle.com/solaris/11";>
     <short-id>solaris11</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.1.xml.in b/data/os/redhat.com/rhel-2.1.1.xml.in
index be87729..028012e 100644
--- a/data/os/redhat.com/rhel-2.1.1.xml.in
+++ b/data/os/redhat.com/rhel-2.1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1.1";>
     <short-id>rhel2.1.1</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.2.xml.in b/data/os/redhat.com/rhel-2.1.2.xml.in
index 98b9ccc..2cf1a65 100644
--- a/data/os/redhat.com/rhel-2.1.2.xml.in
+++ b/data/os/redhat.com/rhel-2.1.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1.2";>
     <short-id>rhel2.1.2</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.3.xml.in b/data/os/redhat.com/rhel-2.1.3.xml.in
index 824a6ec..11760da 100644
--- a/data/os/redhat.com/rhel-2.1.3.xml.in
+++ b/data/os/redhat.com/rhel-2.1.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1.3";>
     <short-id>rhel2.1.3</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.4.xml.in b/data/os/redhat.com/rhel-2.1.4.xml.in
index 3d2ccef..00ed781 100644
--- a/data/os/redhat.com/rhel-2.1.4.xml.in
+++ b/data/os/redhat.com/rhel-2.1.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1.4";>
     <short-id>rhel2.1.4</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.5.xml.in b/data/os/redhat.com/rhel-2.1.5.xml.in
index 2d26df1..2c90591 100644
--- a/data/os/redhat.com/rhel-2.1.5.xml.in
+++ b/data/os/redhat.com/rhel-2.1.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1.5";>
     <short-id>rhel2.1.5</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.6.xml.in b/data/os/redhat.com/rhel-2.1.6.xml.in
index ec3d22a..235aeff 100644
--- a/data/os/redhat.com/rhel-2.1.6.xml.in
+++ b/data/os/redhat.com/rhel-2.1.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1.6";>
     <short-id>rhel2.1.6</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.7.xml.in b/data/os/redhat.com/rhel-2.1.7.xml.in
index a90d53c..8f5f05d 100644
--- a/data/os/redhat.com/rhel-2.1.7.xml.in
+++ b/data/os/redhat.com/rhel-2.1.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1.7";>
     <short-id>rhel2.1.7</short-id>
diff --git a/data/os/redhat.com/rhel-2.1.xml.in b/data/os/redhat.com/rhel-2.1.xml.in
index cbf4c15..849dc27 100644
--- a/data/os/redhat.com/rhel-2.1.xml.in
+++ b/data/os/redhat.com/rhel-2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/2.1";>
     <short-id>rhel2.1</short-id>
diff --git a/data/os/redhat.com/rhel-3.1.xml.in b/data/os/redhat.com/rhel-3.1.xml.in
index 2f4caa0..548d573 100644
--- a/data/os/redhat.com/rhel-3.1.xml.in
+++ b/data/os/redhat.com/rhel-3.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.1";>
     <short-id>rhel3.1</short-id>
diff --git a/data/os/redhat.com/rhel-3.2.xml.in b/data/os/redhat.com/rhel-3.2.xml.in
index dbd8d8d..3517c38 100644
--- a/data/os/redhat.com/rhel-3.2.xml.in
+++ b/data/os/redhat.com/rhel-3.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.2";>
     <short-id>rhel3.2</short-id>
diff --git a/data/os/redhat.com/rhel-3.3.xml.in b/data/os/redhat.com/rhel-3.3.xml.in
index ae4786e..6800a0a 100644
--- a/data/os/redhat.com/rhel-3.3.xml.in
+++ b/data/os/redhat.com/rhel-3.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.3";>
     <short-id>rhel3.3</short-id>
diff --git a/data/os/redhat.com/rhel-3.4.xml.in b/data/os/redhat.com/rhel-3.4.xml.in
index 5f485a8..ddfa080 100644
--- a/data/os/redhat.com/rhel-3.4.xml.in
+++ b/data/os/redhat.com/rhel-3.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.4";>
     <short-id>rhel3.4</short-id>
diff --git a/data/os/redhat.com/rhel-3.5.xml.in b/data/os/redhat.com/rhel-3.5.xml.in
index 388bf7c..6515b94 100644
--- a/data/os/redhat.com/rhel-3.5.xml.in
+++ b/data/os/redhat.com/rhel-3.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.5";>
     <short-id>rhel3.5</short-id>
diff --git a/data/os/redhat.com/rhel-3.6.xml.in b/data/os/redhat.com/rhel-3.6.xml.in
index e395e48..1f01264 100644
--- a/data/os/redhat.com/rhel-3.6.xml.in
+++ b/data/os/redhat.com/rhel-3.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.6";>
     <short-id>rhel3.6</short-id>
diff --git a/data/os/redhat.com/rhel-3.7.xml.in b/data/os/redhat.com/rhel-3.7.xml.in
index c3227de..a876f6a 100644
--- a/data/os/redhat.com/rhel-3.7.xml.in
+++ b/data/os/redhat.com/rhel-3.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.7";>
     <short-id>rhel3.7</short-id>
diff --git a/data/os/redhat.com/rhel-3.8.xml.in b/data/os/redhat.com/rhel-3.8.xml.in
index db1c0fd..b24d6e7 100644
--- a/data/os/redhat.com/rhel-3.8.xml.in
+++ b/data/os/redhat.com/rhel-3.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.8";>
     <short-id>rhel3.8</short-id>
diff --git a/data/os/redhat.com/rhel-3.9.xml.in b/data/os/redhat.com/rhel-3.9.xml.in
index 0c68d9f..8a7652a 100644
--- a/data/os/redhat.com/rhel-3.9.xml.in
+++ b/data/os/redhat.com/rhel-3.9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3.9";>
     <short-id>rhel3.9</short-id>
diff --git a/data/os/redhat.com/rhel-3.xml.in b/data/os/redhat.com/rhel-3.xml.in
index e6a7f8c..b77e3b2 100644
--- a/data/os/redhat.com/rhel-3.xml.in
+++ b/data/os/redhat.com/rhel-3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/3";>
     <short-id>rhel3</short-id>
diff --git a/data/os/redhat.com/rhel-4.0.xml.in b/data/os/redhat.com/rhel-4.0.xml.in
index 905e75d..33b48ef 100644
--- a/data/os/redhat.com/rhel-4.0.xml.in
+++ b/data/os/redhat.com/rhel-4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.0";>
     <short-id>rhel4.0</short-id>
diff --git a/data/os/redhat.com/rhel-4.1.xml.in b/data/os/redhat.com/rhel-4.1.xml.in
index 637d5ce..dfd1e45 100644
--- a/data/os/redhat.com/rhel-4.1.xml.in
+++ b/data/os/redhat.com/rhel-4.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.1";>
     <short-id>rhel4.1</short-id>
diff --git a/data/os/redhat.com/rhel-4.2.xml.in b/data/os/redhat.com/rhel-4.2.xml.in
index 176de6d..1eb527f 100644
--- a/data/os/redhat.com/rhel-4.2.xml.in
+++ b/data/os/redhat.com/rhel-4.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.2";>
     <short-id>rhel4.2</short-id>
diff --git a/data/os/redhat.com/rhel-4.3.xml.in b/data/os/redhat.com/rhel-4.3.xml.in
index 3b949fb..6dc3dad 100644
--- a/data/os/redhat.com/rhel-4.3.xml.in
+++ b/data/os/redhat.com/rhel-4.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.3";>
     <short-id>rhel4.3</short-id>
diff --git a/data/os/redhat.com/rhel-4.4.xml.in b/data/os/redhat.com/rhel-4.4.xml.in
index bbc43b9..b98c0d6 100644
--- a/data/os/redhat.com/rhel-4.4.xml.in
+++ b/data/os/redhat.com/rhel-4.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.4";>
     <short-id>rhel4.4</short-id>
diff --git a/data/os/redhat.com/rhel-4.5.xml.in b/data/os/redhat.com/rhel-4.5.xml.in
index 65d349f..90b9892 100644
--- a/data/os/redhat.com/rhel-4.5.xml.in
+++ b/data/os/redhat.com/rhel-4.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.5";>
     <short-id>rhel4.5</short-id>
diff --git a/data/os/redhat.com/rhel-4.6.xml.in b/data/os/redhat.com/rhel-4.6.xml.in
index f525d3f..84ad720 100644
--- a/data/os/redhat.com/rhel-4.6.xml.in
+++ b/data/os/redhat.com/rhel-4.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.6";>
     <short-id>rhel4.6</short-id>
diff --git a/data/os/redhat.com/rhel-4.7.xml.in b/data/os/redhat.com/rhel-4.7.xml.in
index b238f89..61e6395 100644
--- a/data/os/redhat.com/rhel-4.7.xml.in
+++ b/data/os/redhat.com/rhel-4.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.7";>
     <short-id>rhel4.7</short-id>
diff --git a/data/os/redhat.com/rhel-4.8.xml.in b/data/os/redhat.com/rhel-4.8.xml.in
index 51c36ea..9293389 100644
--- a/data/os/redhat.com/rhel-4.8.xml.in
+++ b/data/os/redhat.com/rhel-4.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.8";>
     <short-id>rhel4.8</short-id>
diff --git a/data/os/redhat.com/rhel-4.9.xml.in b/data/os/redhat.com/rhel-4.9.xml.in
index 155d991..083e75d 100644
--- a/data/os/redhat.com/rhel-4.9.xml.in
+++ b/data/os/redhat.com/rhel-4.9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/4.9";>
     <short-id>rhel4.9</short-id>
diff --git a/data/os/redhat.com/rhel-5.0.xml.in b/data/os/redhat.com/rhel-5.0.xml.in
index 88c20cb..d6dc846 100644
--- a/data/os/redhat.com/rhel-5.0.xml.in
+++ b/data/os/redhat.com/rhel-5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.0";>
     <short-id>rhel5.0</short-id>
diff --git a/data/os/redhat.com/rhel-5.1.xml.in b/data/os/redhat.com/rhel-5.1.xml.in
index 2034f34..013cddb 100644
--- a/data/os/redhat.com/rhel-5.1.xml.in
+++ b/data/os/redhat.com/rhel-5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.1";>
     <short-id>rhel5.1</short-id>
diff --git a/data/os/redhat.com/rhel-5.10.xml.in b/data/os/redhat.com/rhel-5.10.xml.in
index 2308f6e..8bdf653 100644
--- a/data/os/redhat.com/rhel-5.10.xml.in
+++ b/data/os/redhat.com/rhel-5.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.10";>
     <short-id>rhel5.10</short-id>
diff --git a/data/os/redhat.com/rhel-5.11.xml.in b/data/os/redhat.com/rhel-5.11.xml.in
index 4feb884..a8a295c 100644
--- a/data/os/redhat.com/rhel-5.11.xml.in
+++ b/data/os/redhat.com/rhel-5.11.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.11";>
     <short-id>rhel5.11</short-id>
diff --git a/data/os/redhat.com/rhel-5.2.xml.in b/data/os/redhat.com/rhel-5.2.xml.in
index cf31b32..0633a57 100644
--- a/data/os/redhat.com/rhel-5.2.xml.in
+++ b/data/os/redhat.com/rhel-5.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.2";>
     <short-id>rhel5.2</short-id>
diff --git a/data/os/redhat.com/rhel-5.3.xml.in b/data/os/redhat.com/rhel-5.3.xml.in
index 4b26159..c07f363 100644
--- a/data/os/redhat.com/rhel-5.3.xml.in
+++ b/data/os/redhat.com/rhel-5.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.3";>
     <short-id>rhel5.3</short-id>
diff --git a/data/os/redhat.com/rhel-5.4.xml.in b/data/os/redhat.com/rhel-5.4.xml.in
index dd59c87..2806fa5 100644
--- a/data/os/redhat.com/rhel-5.4.xml.in
+++ b/data/os/redhat.com/rhel-5.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.4";>
     <short-id>rhel5.4</short-id>
diff --git a/data/os/redhat.com/rhel-5.5.xml.in b/data/os/redhat.com/rhel-5.5.xml.in
index adbd0a5..3fa31be 100644
--- a/data/os/redhat.com/rhel-5.5.xml.in
+++ b/data/os/redhat.com/rhel-5.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.5";>
     <short-id>rhel5.5</short-id>
diff --git a/data/os/redhat.com/rhel-5.6.xml.in b/data/os/redhat.com/rhel-5.6.xml.in
index 329078a..b335c0a 100644
--- a/data/os/redhat.com/rhel-5.6.xml.in
+++ b/data/os/redhat.com/rhel-5.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.6";>
     <short-id>rhel5.6</short-id>
diff --git a/data/os/redhat.com/rhel-5.7.xml.in b/data/os/redhat.com/rhel-5.7.xml.in
index 70a5ca4..f949ef1 100644
--- a/data/os/redhat.com/rhel-5.7.xml.in
+++ b/data/os/redhat.com/rhel-5.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.7";>
     <short-id>rhel5.7</short-id>
diff --git a/data/os/redhat.com/rhel-5.8.xml.in b/data/os/redhat.com/rhel-5.8.xml.in
index aff9497..6ef0621 100644
--- a/data/os/redhat.com/rhel-5.8.xml.in
+++ b/data/os/redhat.com/rhel-5.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.8";>
     <short-id>rhel5.8</short-id>
diff --git a/data/os/redhat.com/rhel-5.9.xml.in b/data/os/redhat.com/rhel-5.9.xml.in
index 13fc4f0..16f6e36 100644
--- a/data/os/redhat.com/rhel-5.9.xml.in
+++ b/data/os/redhat.com/rhel-5.9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/5.9";>
     <short-id>rhel5.9</short-id>
diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in
index 9616677..b2e058f 100644
--- a/data/os/redhat.com/rhel-6.0.xml.in
+++ b/data/os/redhat.com/rhel-6.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.0";>
     <short-id>rhel6.0</short-id>
diff --git a/data/os/redhat.com/rhel-6.1.xml.in b/data/os/redhat.com/rhel-6.1.xml.in
index efe13a5..dda363e 100644
--- a/data/os/redhat.com/rhel-6.1.xml.in
+++ b/data/os/redhat.com/rhel-6.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.1";>
     <short-id>rhel6.1</short-id>
diff --git a/data/os/redhat.com/rhel-6.2.xml.in b/data/os/redhat.com/rhel-6.2.xml.in
index d6e037d..dec3549 100644
--- a/data/os/redhat.com/rhel-6.2.xml.in
+++ b/data/os/redhat.com/rhel-6.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.2";>
     <short-id>rhel6.2</short-id>
diff --git a/data/os/redhat.com/rhel-6.3.xml.in b/data/os/redhat.com/rhel-6.3.xml.in
index c6fb36f..374daf1 100644
--- a/data/os/redhat.com/rhel-6.3.xml.in
+++ b/data/os/redhat.com/rhel-6.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.3";>
     <short-id>rhel6.3</short-id>
diff --git a/data/os/redhat.com/rhel-6.4.xml.in b/data/os/redhat.com/rhel-6.4.xml.in
index 5bc9da2..4d827c5 100644
--- a/data/os/redhat.com/rhel-6.4.xml.in
+++ b/data/os/redhat.com/rhel-6.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.4";>
     <short-id>rhel6.4</short-id>
diff --git a/data/os/redhat.com/rhel-6.5.xml.in b/data/os/redhat.com/rhel-6.5.xml.in
index d9db1ca..c736dad 100644
--- a/data/os/redhat.com/rhel-6.5.xml.in
+++ b/data/os/redhat.com/rhel-6.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.5";>
     <short-id>rhel6.5</short-id>
diff --git a/data/os/redhat.com/rhel-6.6.xml.in b/data/os/redhat.com/rhel-6.6.xml.in
index 1b137bb..f281aaf 100644
--- a/data/os/redhat.com/rhel-6.6.xml.in
+++ b/data/os/redhat.com/rhel-6.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.6";>
     <short-id>rhel6.6</short-id>
diff --git a/data/os/redhat.com/rhel-6.7.xml.in b/data/os/redhat.com/rhel-6.7.xml.in
index da66388..fd39da5 100644
--- a/data/os/redhat.com/rhel-6.7.xml.in
+++ b/data/os/redhat.com/rhel-6.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.7";>
     <short-id>rhel6.7</short-id>
diff --git a/data/os/redhat.com/rhel-6.8.xml.in b/data/os/redhat.com/rhel-6.8.xml.in
index f58bd0e..3679cf0 100644
--- a/data/os/redhat.com/rhel-6.8.xml.in
+++ b/data/os/redhat.com/rhel-6.8.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/6.8";>
     <short-id>rhel6.8</short-id>
diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index b917af0..bdf6231 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/7.0";>
     <short-id>rhel7.0</short-id>
diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
index 1b46f10..984e82a 100644
--- a/data/os/redhat.com/rhel-7.1.xml.in
+++ b/data/os/redhat.com/rhel-7.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/7.1";>
     <short-id>rhel7.1</short-id>
diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 52d7b30..ab78cf8 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel/7.2";>
     <short-id>rhel7.2</short-id>
diff --git a/data/os/redhat.com/rhel-atomic-7.0.xml.in b/data/os/redhat.com/rhel-atomic-7.0.xml.in
index 5628134..cb9434e 100644
--- a/data/os/redhat.com/rhel-atomic-7.0.xml.in
+++ b/data/os/redhat.com/rhel-atomic-7.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel-atomic/7.0";>
     <short-id>rhel-atomic-7.0</short-id>
diff --git a/data/os/redhat.com/rhel-atomic-7.1.xml.in b/data/os/redhat.com/rhel-atomic-7.1.xml.in
index f07a47e..d01a70e 100644
--- a/data/os/redhat.com/rhel-atomic-7.1.xml.in
+++ b/data/os/redhat.com/rhel-atomic-7.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel-atomic/7.1";>
     <short-id>rhel-atomic-7.1</short-id>
diff --git a/data/os/redhat.com/rhel-atomic-7.2.xml.in b/data/os/redhat.com/rhel-atomic-7.2.xml.in
index 3f39e35..4734ed5 100644
--- a/data/os/redhat.com/rhel-atomic-7.2.xml.in
+++ b/data/os/redhat.com/rhel-atomic-7.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhel-atomic/7.2";>
     <short-id>rhel-atomic-7.2</short-id>
diff --git a/data/os/redhat.com/rhl-1.0.xml.in b/data/os/redhat.com/rhl-1.0.xml.in
index 3e81262..5540444 100644
--- a/data/os/redhat.com/rhl-1.0.xml.in
+++ b/data/os/redhat.com/rhl-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/1.0";>
     <short-id>rhl1.0</short-id>
diff --git a/data/os/redhat.com/rhl-1.1.xml.in b/data/os/redhat.com/rhl-1.1.xml.in
index 331b0a5..88a42da 100644
--- a/data/os/redhat.com/rhl-1.1.xml.in
+++ b/data/os/redhat.com/rhl-1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/1.1";>
     <short-id>rhl1.1</short-id>
diff --git a/data/os/redhat.com/rhl-2.0.xml.in b/data/os/redhat.com/rhl-2.0.xml.in
index 7484910..1391498 100644
--- a/data/os/redhat.com/rhl-2.0.xml.in
+++ b/data/os/redhat.com/rhl-2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/2.0";>
     <short-id>rhl2.0</short-id>
diff --git a/data/os/redhat.com/rhl-2.1.xml.in b/data/os/redhat.com/rhl-2.1.xml.in
index ff5a0bd..97f92be 100644
--- a/data/os/redhat.com/rhl-2.1.xml.in
+++ b/data/os/redhat.com/rhl-2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/2.1";>
     <short-id>rhl2.1</short-id>
diff --git a/data/os/redhat.com/rhl-3.0.3.xml.in b/data/os/redhat.com/rhl-3.0.3.xml.in
index 7d7eecb..13dc0d9 100644
--- a/data/os/redhat.com/rhl-3.0.3.xml.in
+++ b/data/os/redhat.com/rhl-3.0.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/3.0.3";>
     <short-id>rhl3.0.3</short-id>
diff --git a/data/os/redhat.com/rhl-4.0.xml.in b/data/os/redhat.com/rhl-4.0.xml.in
index faa1dbd..a3af60f 100644
--- a/data/os/redhat.com/rhl-4.0.xml.in
+++ b/data/os/redhat.com/rhl-4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/4.0";>
     <short-id>rhl4.0</short-id>
diff --git a/data/os/redhat.com/rhl-4.1.xml.in b/data/os/redhat.com/rhl-4.1.xml.in
index 848bc60..656d531 100644
--- a/data/os/redhat.com/rhl-4.1.xml.in
+++ b/data/os/redhat.com/rhl-4.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/4.1";>
     <short-id>rhl4.1</short-id>
diff --git a/data/os/redhat.com/rhl-4.2.xml.in b/data/os/redhat.com/rhl-4.2.xml.in
index 6e655c9..568a6ba 100644
--- a/data/os/redhat.com/rhl-4.2.xml.in
+++ b/data/os/redhat.com/rhl-4.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/4.2";>
     <short-id>rhl4.2</short-id>
diff --git a/data/os/redhat.com/rhl-5.0.xml.in b/data/os/redhat.com/rhl-5.0.xml.in
index da91d2f..05410c2 100644
--- a/data/os/redhat.com/rhl-5.0.xml.in
+++ b/data/os/redhat.com/rhl-5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/5.0";>
     <short-id>rhl5.0</short-id>
diff --git a/data/os/redhat.com/rhl-5.1.xml.in b/data/os/redhat.com/rhl-5.1.xml.in
index da7239f..b6a5811 100644
--- a/data/os/redhat.com/rhl-5.1.xml.in
+++ b/data/os/redhat.com/rhl-5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/5.1";>
     <short-id>rhl5.1</short-id>
diff --git a/data/os/redhat.com/rhl-5.2.xml.in b/data/os/redhat.com/rhl-5.2.xml.in
index 28f5bb8..84af9ba 100644
--- a/data/os/redhat.com/rhl-5.2.xml.in
+++ b/data/os/redhat.com/rhl-5.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/5.2";>
     <short-id>rhl5.2</short-id>
diff --git a/data/os/redhat.com/rhl-6.0.xml.in b/data/os/redhat.com/rhl-6.0.xml.in
index 146e5b0..e59c6b3 100644
--- a/data/os/redhat.com/rhl-6.0.xml.in
+++ b/data/os/redhat.com/rhl-6.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/6.0";>
     <short-id>rhl6.0</short-id>
diff --git a/data/os/redhat.com/rhl-6.1.xml.in b/data/os/redhat.com/rhl-6.1.xml.in
index 1ca60ab..2d055cf 100644
--- a/data/os/redhat.com/rhl-6.1.xml.in
+++ b/data/os/redhat.com/rhl-6.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/6.1";>
     <short-id>rhl6.1</short-id>
diff --git a/data/os/redhat.com/rhl-6.2.xml.in b/data/os/redhat.com/rhl-6.2.xml.in
index 1106604..aa13cad 100644
--- a/data/os/redhat.com/rhl-6.2.xml.in
+++ b/data/os/redhat.com/rhl-6.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/6.2";>
     <short-id>rhl6.2</short-id>
diff --git a/data/os/redhat.com/rhl-7.1.xml.in b/data/os/redhat.com/rhl-7.1.xml.in
index 79beaab..5a1e796 100644
--- a/data/os/redhat.com/rhl-7.1.xml.in
+++ b/data/os/redhat.com/rhl-7.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/7.1";>
     <short-id>rhl7.1</short-id>
diff --git a/data/os/redhat.com/rhl-7.2.xml.in b/data/os/redhat.com/rhl-7.2.xml.in
index 9223bd2..63421cd 100644
--- a/data/os/redhat.com/rhl-7.2.xml.in
+++ b/data/os/redhat.com/rhl-7.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/7.2";>
     <short-id>rhl7.2</short-id>
diff --git a/data/os/redhat.com/rhl-7.3.xml.in b/data/os/redhat.com/rhl-7.3.xml.in
index dad1185..a2c49ce 100644
--- a/data/os/redhat.com/rhl-7.3.xml.in
+++ b/data/os/redhat.com/rhl-7.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/7.3";>
     <short-id>rhl7.3</short-id>
diff --git a/data/os/redhat.com/rhl-7.xml.in b/data/os/redhat.com/rhl-7.xml.in
index 15bc79c..d7d2588 100644
--- a/data/os/redhat.com/rhl-7.xml.in
+++ b/data/os/redhat.com/rhl-7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/7";>
     <short-id>rhl7</short-id>
diff --git a/data/os/redhat.com/rhl-8.0.xml.in b/data/os/redhat.com/rhl-8.0.xml.in
index 584ebea..fc618c1 100644
--- a/data/os/redhat.com/rhl-8.0.xml.in
+++ b/data/os/redhat.com/rhl-8.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/8.0";>
     <short-id>rhl8.0</short-id>
diff --git a/data/os/redhat.com/rhl-9.xml.in b/data/os/redhat.com/rhl-9.xml.in
index 7f64e47..91b4e28 100644
--- a/data/os/redhat.com/rhl-9.xml.in
+++ b/data/os/redhat.com/rhl-9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://redhat.com/rhl/9";>
     <short-id>rhl9</short-id>
diff --git a/data/os/sun.com/opensolaris-2009.06.xml.in b/data/os/sun.com/opensolaris-2009.06.xml.in
index 8db3b6d..c5e324f 100644
--- a/data/os/sun.com/opensolaris-2009.06.xml.in
+++ b/data/os/sun.com/opensolaris-2009.06.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://sun.com/opensolaris/2009.06";>
     <short-id>opensolaris2009.06</short-id>
diff --git a/data/os/sun.com/solaris-10.xml.in b/data/os/sun.com/solaris-10.xml.in
index 24ce5b6..7081e56 100644
--- a/data/os/sun.com/solaris-10.xml.in
+++ b/data/os/sun.com/solaris-10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://sun.com/solaris/10";>
     <short-id>solaris10</short-id>
diff --git a/data/os/sun.com/solaris-9.xml.in b/data/os/sun.com/solaris-9.xml.in
index dc3b9c9..9655c9f 100644
--- a/data/os/sun.com/solaris-9.xml.in
+++ b/data/os/sun.com/solaris-9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://sun.com/solaris/9";>
     <short-id>solaris9</short-id>
diff --git a/data/os/suse.com/sled-10.xml.in b/data/os/suse.com/sled-10.xml.in
index e0ef330..0c3b96f 100644
--- a/data/os/suse.com/sled-10.xml.in
+++ b/data/os/suse.com/sled-10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/10";>
     <short-id>sled10</short-id>
diff --git a/data/os/suse.com/sled-11.1.xml.in b/data/os/suse.com/sled-11.1.xml.in
index 5dd3083..fc2da73 100644
--- a/data/os/suse.com/sled-11.1.xml.in
+++ b/data/os/suse.com/sled-11.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/11.1";>
     <short-id>sled11sp1</short-id>
diff --git a/data/os/suse.com/sled-11.2.xml.in b/data/os/suse.com/sled-11.2.xml.in
index 3dd5dda..c4de2de 100644
--- a/data/os/suse.com/sled-11.2.xml.in
+++ b/data/os/suse.com/sled-11.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/11.2";>
     <short-id>sled11sp2</short-id>
diff --git a/data/os/suse.com/sled-11.3.xml.in b/data/os/suse.com/sled-11.3.xml.in
index 7822ca0..d8724ef 100644
--- a/data/os/suse.com/sled-11.3.xml.in
+++ b/data/os/suse.com/sled-11.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/11.3";>
     <short-id>sled11sp3</short-id>
diff --git a/data/os/suse.com/sled-11.4.xml.in b/data/os/suse.com/sled-11.4.xml.in
index 5519cde..685e50b 100644
--- a/data/os/suse.com/sled-11.4.xml.in
+++ b/data/os/suse.com/sled-11.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/11.4";>
     <short-id>sled11sp4</short-id>
diff --git a/data/os/suse.com/sled-11.xml.in b/data/os/suse.com/sled-11.xml.in
index 9469017..589de8a 100644
--- a/data/os/suse.com/sled-11.xml.in
+++ b/data/os/suse.com/sled-11.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/11";>
     <short-id>sled11</short-id>
diff --git a/data/os/suse.com/sled-12.1.xml.in b/data/os/suse.com/sled-12.1.xml.in
index 8838023..e556da0 100644
--- a/data/os/suse.com/sled-12.1.xml.in
+++ b/data/os/suse.com/sled-12.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/12.1";>
     <short-id>sled12sp1</short-id>
diff --git a/data/os/suse.com/sled-12.xml.in b/data/os/suse.com/sled-12.xml.in
index cac2f44..0c67116 100644
--- a/data/os/suse.com/sled-12.xml.in
+++ b/data/os/suse.com/sled-12.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/12";>
     <short-id>sled12</short-id>
diff --git a/data/os/suse.com/sled-9.xml.in b/data/os/suse.com/sled-9.xml.in
index ae4342f..f27c82f 100644
--- a/data/os/suse.com/sled-9.xml.in
+++ b/data/os/suse.com/sled-9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sled/9";>
     <short-id>sled9</short-id>
diff --git a/data/os/suse.com/sles-10.xml.in b/data/os/suse.com/sles-10.xml.in
index 691943b..0738127 100644
--- a/data/os/suse.com/sles-10.xml.in
+++ b/data/os/suse.com/sles-10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/10";>
     <short-id>sles10</short-id>
diff --git a/data/os/suse.com/sles-11.1.xml.in b/data/os/suse.com/sles-11.1.xml.in
index 1c87a11..abd1303 100644
--- a/data/os/suse.com/sles-11.1.xml.in
+++ b/data/os/suse.com/sles-11.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/11.1";>
     <short-id>sles11sp1</short-id>
diff --git a/data/os/suse.com/sles-11.2.xml.in b/data/os/suse.com/sles-11.2.xml.in
index 341bac6..11621c6 100644
--- a/data/os/suse.com/sles-11.2.xml.in
+++ b/data/os/suse.com/sles-11.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/11.2";>
     <short-id>sles11sp2</short-id>
diff --git a/data/os/suse.com/sles-11.3.xml.in b/data/os/suse.com/sles-11.3.xml.in
index 0f3523b..1d17915 100644
--- a/data/os/suse.com/sles-11.3.xml.in
+++ b/data/os/suse.com/sles-11.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/11.3";>
     <short-id>sles11sp3</short-id>
diff --git a/data/os/suse.com/sles-11.4.xml.in b/data/os/suse.com/sles-11.4.xml.in
index 3dca227..aa2b560 100644
--- a/data/os/suse.com/sles-11.4.xml.in
+++ b/data/os/suse.com/sles-11.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/11.4";>
     <short-id>sles11sp4</short-id>
diff --git a/data/os/suse.com/sles-11.xml.in b/data/os/suse.com/sles-11.xml.in
index ad4bd51..a031c6b 100644
--- a/data/os/suse.com/sles-11.xml.in
+++ b/data/os/suse.com/sles-11.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/11";>
     <short-id>sles11</short-id>
diff --git a/data/os/suse.com/sles-12.1.xml.in b/data/os/suse.com/sles-12.1.xml.in
index d0ed265..0011f42 100644
--- a/data/os/suse.com/sles-12.1.xml.in
+++ b/data/os/suse.com/sles-12.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/12.1";>
     <short-id>sles12sp1</short-id>
diff --git a/data/os/suse.com/sles-12.xml.in b/data/os/suse.com/sles-12.xml.in
index a51eac9..1bd0358 100644
--- a/data/os/suse.com/sles-12.xml.in
+++ b/data/os/suse.com/sles-12.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/12";>
     <short-id>sles12</short-id>
diff --git a/data/os/suse.com/sles-9.xml.in b/data/os/suse.com/sles-9.xml.in
index b196eb4..27949cf 100644
--- a/data/os/suse.com/sles-9.xml.in
+++ b/data/os/suse.com/sles-9.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://suse.com/sles/9";>
     <short-id>sles9</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in
index 17999ac..6a0d759 100644
--- a/data/os/ubuntu.com/ubuntu-10.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/10.04";>
     <short-id>ubuntu10.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-10.10.xml.in b/data/os/ubuntu.com/ubuntu-10.10.xml.in
index 8b32fac..b5129cb 100644
--- a/data/os/ubuntu.com/ubuntu-10.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-10.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/10.10";>
     <short-id>ubuntu10.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-11.04.xml.in b/data/os/ubuntu.com/ubuntu-11.04.xml.in
index d4b5aa0..c0640fc 100644
--- a/data/os/ubuntu.com/ubuntu-11.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-11.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/11.04";>
     <short-id>ubuntu11.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-11.10.xml.in b/data/os/ubuntu.com/ubuntu-11.10.xml.in
index 2f7b53f..768602f 100644
--- a/data/os/ubuntu.com/ubuntu-11.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-11.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/11.10";>
     <short-id>ubuntu11.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
index 36c6937..3054dda 100644
--- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/12.04";>
     <short-id>ubuntu12.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in
index 3424617..e8391b7 100644
--- a/data/os/ubuntu.com/ubuntu-12.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/12.10";>
     <short-id>ubuntu12.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in
index dd4e271..07fe3ac 100644
--- a/data/os/ubuntu.com/ubuntu-13.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/13.04";>
     <short-id>ubuntu13.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in
index dd3e70a..ae03f0b 100644
--- a/data/os/ubuntu.com/ubuntu-13.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/13.10";>
     <short-id>ubuntu13.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
index a42dbfc..c8d286a 100644
--- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/14.04";>
     <short-id>ubuntu14.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
index 970fa23..4c71132 100644
--- a/data/os/ubuntu.com/ubuntu-14.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/14.10";>
     <short-id>ubuntu14.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
index 63c4b5b..e9426be 100644
--- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/15.04";>
     <short-id>ubuntu15.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
index 980737e..c394761 100644
--- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/15.10";>
     <short-id>ubuntu15.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
index e74da77..5300c0c 100644
--- a/data/os/ubuntu.com/ubuntu-16.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/16.04";>
     <short-id>ubuntu16.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-4.10.xml.in b/data/os/ubuntu.com/ubuntu-4.10.xml.in
index 6f0d76e..45577ec 100644
--- a/data/os/ubuntu.com/ubuntu-4.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-4.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/4.10";>
     <short-id>ubuntu4.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-5.04.xml.in b/data/os/ubuntu.com/ubuntu-5.04.xml.in
index 5085120..1478d17 100644
--- a/data/os/ubuntu.com/ubuntu-5.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-5.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/5.04";>
     <short-id>ubuntu5.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-5.10.xml.in b/data/os/ubuntu.com/ubuntu-5.10.xml.in
index 2347521..3ff92df 100644
--- a/data/os/ubuntu.com/ubuntu-5.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-5.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/5.10";>
     <short-id>ubuntu5.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in
index d668c56..54dfc4c 100644
--- a/data/os/ubuntu.com/ubuntu-6.06.xml.in
+++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/6.06";>
     <short-id>ubuntu6.06</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-6.10.xml.in b/data/os/ubuntu.com/ubuntu-6.10.xml.in
index da3f9c4..296de86 100644
--- a/data/os/ubuntu.com/ubuntu-6.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-6.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/6.10";>
     <short-id>ubuntu6.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-7.04.xml.in b/data/os/ubuntu.com/ubuntu-7.04.xml.in
index 6bf8b5c..ef553a2 100644
--- a/data/os/ubuntu.com/ubuntu-7.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-7.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/7.04";>
     <short-id>ubuntu7.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-7.10.xml.in b/data/os/ubuntu.com/ubuntu-7.10.xml.in
index b6b3175..450f896 100644
--- a/data/os/ubuntu.com/ubuntu-7.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-7.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/7.10";>
     <short-id>ubuntu7.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in
index f89ff79..6a47512 100644
--- a/data/os/ubuntu.com/ubuntu-8.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-8.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/8.04";>
     <short-id>ubuntu8.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-8.10.xml.in b/data/os/ubuntu.com/ubuntu-8.10.xml.in
index a965d82..b70f3c9 100644
--- a/data/os/ubuntu.com/ubuntu-8.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-8.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/8.10";>
     <short-id>ubuntu8.10</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in
index 4d7c272..865d221 100644
--- a/data/os/ubuntu.com/ubuntu-9.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-9.04.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/9.04";>
     <short-id>ubuntu9.04</short-id>
diff --git a/data/os/ubuntu.com/ubuntu-9.10.xml.in b/data/os/ubuntu.com/ubuntu-9.10.xml.in
index 3b032a1..adca28e 100644
--- a/data/os/ubuntu.com/ubuntu-9.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-9.10.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <os id="http://ubuntu.com/ubuntu/9.10";>
     <short-id>ubuntu9.10</short-id>
diff --git a/data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
index e7de95d..c41a6f5 100644
--- a/data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
+++ b/data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://linux-kvm.org/qemu-kvm/1.0.1";>
     <short-id>qemu-kvm-1.0.1</short-id>
diff --git a/data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
index 65fff94..ca2c415 100644
--- a/data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
+++ b/data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://linux-kvm.org/qemu-kvm/1.0";>
     <short-id>qemu-kvm-1.0</short-id>
diff --git a/data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
index 2c160f0..927aa93 100644
--- a/data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
+++ b/data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://linux-kvm.org/qemu-kvm/1.1.0";>
     <short-id>qemu-kvm-1.1.0</short-id>
diff --git a/data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in
index d7e7e7a..a82fa8e 100644
--- a/data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in
+++ b/data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://linux-kvm.org/qemu-kvm/1.1.1";>
     <short-id>qemu-kvm-1.1.1</short-id>
diff --git a/data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in
index 67c9793..1ef475f 100644
--- a/data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in
+++ b/data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://linux-kvm.org/qemu-kvm/1.1.2";>
     <short-id>qemu-kvm-1.1.2</short-id>
diff --git a/data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in b/data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in
index bdeec1d..968cfda 100644
--- a/data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in
+++ b/data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://linux-kvm.org/qemu-kvm/1.2.0";>
     <short-id>qemu-kvm-1.2.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.0.1.xml.in b/data/platform/qemu.org/qemu-1.0.1.xml.in
index cc551b3..c918957 100644
--- a/data/platform/qemu.org/qemu-1.0.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.0.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.0.1";>
     <short-id>qemu-1.0.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.0.xml.in b/data/platform/qemu.org/qemu-1.0.xml.in
index b8fe09a..7a0fd79 100644
--- a/data/platform/qemu.org/qemu-1.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.0";>
     <short-id>qemu-1.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.1.1-1.xml.in b/data/platform/qemu.org/qemu-1.1.1-1.xml.in
index c69f30b..9ee0cc5 100644
--- a/data/platform/qemu.org/qemu-1.1.1-1.xml.in
+++ b/data/platform/qemu.org/qemu-1.1.1-1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.1.1-1";>
     <short-id>qemu-1.1.1-1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.1.1.xml.in b/data/platform/qemu.org/qemu-1.1.1.xml.in
index 93bb167..c0702b0 100644
--- a/data/platform/qemu.org/qemu-1.1.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.1.1";>
     <short-id>qemu-1.1.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.1.2.xml.in b/data/platform/qemu.org/qemu-1.1.2.xml.in
index 40a73c4..61fee42 100644
--- a/data/platform/qemu.org/qemu-1.1.2.xml.in
+++ b/data/platform/qemu.org/qemu-1.1.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.1.2";>
     <short-id>qemu-1.1.2</short-id>
diff --git a/data/platform/qemu.org/qemu-1.1.xml.in b/data/platform/qemu.org/qemu-1.1.xml.in
index ed4afcc..de1da73 100644
--- a/data/platform/qemu.org/qemu-1.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.1";>
     <short-id>qemu-1.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.2.0.xml.in b/data/platform/qemu.org/qemu-1.2.0.xml.in
index c1a17cd..7e2152a 100644
--- a/data/platform/qemu.org/qemu-1.2.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.2.0";>
     <short-id>qemu-1.2.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.2.1.xml.in b/data/platform/qemu.org/qemu-1.2.1.xml.in
index 34394ad..527414e 100644
--- a/data/platform/qemu.org/qemu-1.2.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.2.1";>
     <short-id>qemu-1.2.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.2.2.xml.in b/data/platform/qemu.org/qemu-1.2.2.xml.in
index 3338ca9..5be9a84 100644
--- a/data/platform/qemu.org/qemu-1.2.2.xml.in
+++ b/data/platform/qemu.org/qemu-1.2.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.2.2";>
     <short-id>qemu-1.2.2</short-id>
diff --git a/data/platform/qemu.org/qemu-1.3.0.xml.in b/data/platform/qemu.org/qemu-1.3.0.xml.in
index 55c5bee..12c9b5f 100644
--- a/data/platform/qemu.org/qemu-1.3.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.3.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.3.0";>
     <short-id>qemu-1.3.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.3.1.xml.in b/data/platform/qemu.org/qemu-1.3.1.xml.in
index 4ab0d07..19eb254 100644
--- a/data/platform/qemu.org/qemu-1.3.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.3.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.3.1";>
     <short-id>qemu-1.3.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.4.0.xml.in b/data/platform/qemu.org/qemu-1.4.0.xml.in
index f93f7fd..2a537ad 100644
--- a/data/platform/qemu.org/qemu-1.4.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.4.0";>
     <short-id>qemu-1.4.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.4.1.xml.in b/data/platform/qemu.org/qemu-1.4.1.xml.in
index b3e662b..c31ed88 100644
--- a/data/platform/qemu.org/qemu-1.4.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.4.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.4.1";>
     <short-id>qemu-1.4.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.4.2.xml.in b/data/platform/qemu.org/qemu-1.4.2.xml.in
index c15dcc5..49bcec4 100644
--- a/data/platform/qemu.org/qemu-1.4.2.xml.in
+++ b/data/platform/qemu.org/qemu-1.4.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.4.2";>
     <short-id>qemu-1.4.2</short-id>
diff --git a/data/platform/qemu.org/qemu-1.5.0.xml.in b/data/platform/qemu.org/qemu-1.5.0.xml.in
index 03ccb40..d0191e3 100644
--- a/data/platform/qemu.org/qemu-1.5.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.5.0";>
     <short-id>qemu-1.5.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.5.1.xml.in b/data/platform/qemu.org/qemu-1.5.1.xml.in
index 8124250..5bab3ed 100644
--- a/data/platform/qemu.org/qemu-1.5.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.5.1";>
     <short-id>qemu-1.5.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.5.2.xml.in b/data/platform/qemu.org/qemu-1.5.2.xml.in
index 1b9376c..0e2fd22 100644
--- a/data/platform/qemu.org/qemu-1.5.2.xml.in
+++ b/data/platform/qemu.org/qemu-1.5.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.5.2";>
     <short-id>qemu-1.5.2</short-id>
diff --git a/data/platform/qemu.org/qemu-1.5.3.xml.in b/data/platform/qemu.org/qemu-1.5.3.xml.in
index 047a746..69c3da3 100644
--- a/data/platform/qemu.org/qemu-1.5.3.xml.in
+++ b/data/platform/qemu.org/qemu-1.5.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.5.3";>
     <short-id>qemu-1.5.3</short-id>
diff --git a/data/platform/qemu.org/qemu-1.6.0.xml.in b/data/platform/qemu.org/qemu-1.6.0.xml.in
index 6085312..6b00aab 100644
--- a/data/platform/qemu.org/qemu-1.6.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.6.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.6.0";>
     <short-id>qemu-1.6.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.6.1.xml.in b/data/platform/qemu.org/qemu-1.6.1.xml.in
index e7781b4..1392c7e 100644
--- a/data/platform/qemu.org/qemu-1.6.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.6.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.6.1";>
     <short-id>qemu-1.6.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.6.2.xml.in b/data/platform/qemu.org/qemu-1.6.2.xml.in
index 4634b37..1d68c93 100644
--- a/data/platform/qemu.org/qemu-1.6.2.xml.in
+++ b/data/platform/qemu.org/qemu-1.6.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.6.2";>
     <short-id>qemu-1.6.2</short-id>
diff --git a/data/platform/qemu.org/qemu-1.7.0.xml.in b/data/platform/qemu.org/qemu-1.7.0.xml.in
index 700e1a8..afc1893 100644
--- a/data/platform/qemu.org/qemu-1.7.0.xml.in
+++ b/data/platform/qemu.org/qemu-1.7.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.7.0";>
     <short-id>qemu-1.7.0</short-id>
diff --git a/data/platform/qemu.org/qemu-1.7.1.xml.in b/data/platform/qemu.org/qemu-1.7.1.xml.in
index 9f54563..24a53bc 100644
--- a/data/platform/qemu.org/qemu-1.7.1.xml.in
+++ b/data/platform/qemu.org/qemu-1.7.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.7.1";>
     <short-id>qemu-1.7.1</short-id>
diff --git a/data/platform/qemu.org/qemu-1.7.2.xml.in b/data/platform/qemu.org/qemu-1.7.2.xml.in
index baff997..1f8b71a 100644
--- a/data/platform/qemu.org/qemu-1.7.2.xml.in
+++ b/data/platform/qemu.org/qemu-1.7.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/1.7.2";>
     <short-id>qemu-1.7.2</short-id>
diff --git a/data/platform/qemu.org/qemu-2.0.0.xml.in b/data/platform/qemu.org/qemu-2.0.0.xml.in
index fbc1fb9..22a7997 100644
--- a/data/platform/qemu.org/qemu-2.0.0.xml.in
+++ b/data/platform/qemu.org/qemu-2.0.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.0.0";>
     <short-id>qemu-2.0.0</short-id>
diff --git a/data/platform/qemu.org/qemu-2.0.1.xml.in b/data/platform/qemu.org/qemu-2.0.1.xml.in
index a3c6e1f..8f175cf 100644
--- a/data/platform/qemu.org/qemu-2.0.1.xml.in
+++ b/data/platform/qemu.org/qemu-2.0.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.0.1";>
     <short-id>qemu-2.0.1</short-id>
diff --git a/data/platform/qemu.org/qemu-2.0.2.xml.in b/data/platform/qemu.org/qemu-2.0.2.xml.in
index fbc4775..d7de25a 100644
--- a/data/platform/qemu.org/qemu-2.0.2.xml.in
+++ b/data/platform/qemu.org/qemu-2.0.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.0.2";>
     <short-id>qemu-2.0.2</short-id>
diff --git a/data/platform/qemu.org/qemu-2.1.0.xml.in b/data/platform/qemu.org/qemu-2.1.0.xml.in
index a295fb1..3a23431 100644
--- a/data/platform/qemu.org/qemu-2.1.0.xml.in
+++ b/data/platform/qemu.org/qemu-2.1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.1.0";>
     <short-id>qemu-2.1.0</short-id>
diff --git a/data/platform/qemu.org/qemu-2.1.1.xml.in b/data/platform/qemu.org/qemu-2.1.1.xml.in
index f3fa843..03cee93 100644
--- a/data/platform/qemu.org/qemu-2.1.1.xml.in
+++ b/data/platform/qemu.org/qemu-2.1.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.1.1";>
     <short-id>qemu-2.1.1</short-id>
diff --git a/data/platform/qemu.org/qemu-2.1.2.xml.in b/data/platform/qemu.org/qemu-2.1.2.xml.in
index b42faf3..da8354d 100644
--- a/data/platform/qemu.org/qemu-2.1.2.xml.in
+++ b/data/platform/qemu.org/qemu-2.1.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.1.2";>
     <short-id>qemu-2.1.2</short-id>
diff --git a/data/platform/qemu.org/qemu-2.1.3.xml.in b/data/platform/qemu.org/qemu-2.1.3.xml.in
index 2a4bc52..8cc13af 100644
--- a/data/platform/qemu.org/qemu-2.1.3.xml.in
+++ b/data/platform/qemu.org/qemu-2.1.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.1.3";>
     <short-id>qemu-2.1.3</short-id>
diff --git a/data/platform/qemu.org/qemu-2.2.0.xml.in b/data/platform/qemu.org/qemu-2.2.0.xml.in
index 816bac5..1e82c1e 100644
--- a/data/platform/qemu.org/qemu-2.2.0.xml.in
+++ b/data/platform/qemu.org/qemu-2.2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.2.0";>
     <short-id>qemu-2.2.0</short-id>
diff --git a/data/platform/qemu.org/qemu-2.2.1.xml.in b/data/platform/qemu.org/qemu-2.2.1.xml.in
index 41dc4f5..ca0d746 100644
--- a/data/platform/qemu.org/qemu-2.2.1.xml.in
+++ b/data/platform/qemu.org/qemu-2.2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.2.1";>
     <short-id>qemu-2.2.1</short-id>
diff --git a/data/platform/qemu.org/qemu-2.3.0.xml.in b/data/platform/qemu.org/qemu-2.3.0.xml.in
index f809938..a25543d 100644
--- a/data/platform/qemu.org/qemu-2.3.0.xml.in
+++ b/data/platform/qemu.org/qemu-2.3.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://qemu.org/qemu/2.3.0";>
     <short-id>qemu-2.3.0</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in b/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
index 25a9cd1..c62c9ce 100644
--- a/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.0.3.5.0";>
     <short-id>xen-rhel-3.0.3.5.0</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
index 935e417..6d06074 100644
--- a/data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.1.0.5.1";>
     <short-id>xen-rhel-3.1.0.5.1</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
index 41cb987..75d4d08 100644
--- a/data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.1.0.5.2";>
     <short-id>xen-rhel-3.1.0.5.2</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
index 75ebcfa..95dfa16 100644
--- a/data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.1.0.5.3";>
     <short-id>xen-rhel-3.1.0.5.3</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
index 347e648..9b1b3bb 100644
--- a/data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.1.0.5.4";>
     <short-id>xen-rhel-3.1.0.5.4</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
index ab7b937..4635b99 100644
--- a/data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.1.0.5.5";>
     <short-id>xen-rhel-3.1.0.5.5</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
index d7a9cc3..8c022e6 100644
--- a/data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.1.0.5.6";>
     <short-id>xen-rhel-3.1.0.5.6</short-id>
diff --git a/data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in b/data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
index f220ca4..8502825 100644
--- a/data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
+++ b/data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://redhat.com/xen-rhel/3.1.0.5.7";>
     <short-id>xen-rhel-3.1.0.5.7</short-id>
diff --git a/data/platform/xen.org/xen-3.0.2.xml.in b/data/platform/xen.org/xen-3.0.2.xml.in
index 250366b..7c07d64 100644
--- a/data/platform/xen.org/xen-3.0.2.xml.in
+++ b/data/platform/xen.org/xen-3.0.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.0.2";>
     <short-id>xen-3.0.2</short-id>
diff --git a/data/platform/xen.org/xen-3.0.3.xml.in b/data/platform/xen.org/xen-3.0.3.xml.in
index c628b94..8cb7618 100644
--- a/data/platform/xen.org/xen-3.0.3.xml.in
+++ b/data/platform/xen.org/xen-3.0.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.0.3";>
     <short-id>xen-3.0.3</short-id>
diff --git a/data/platform/xen.org/xen-3.0.4.xml.in b/data/platform/xen.org/xen-3.0.4.xml.in
index 4479d97..ff3b1a0 100644
--- a/data/platform/xen.org/xen-3.0.4.xml.in
+++ b/data/platform/xen.org/xen-3.0.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.0.4";>
     <short-id>xen-3.0.4</short-id>
diff --git a/data/platform/xen.org/xen-3.1.0.xml.in b/data/platform/xen.org/xen-3.1.0.xml.in
index ca59426..7f645f1 100644
--- a/data/platform/xen.org/xen-3.1.0.xml.in
+++ b/data/platform/xen.org/xen-3.1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.1.0";>
     <short-id>xen-3.1.0</short-id>
diff --git a/data/platform/xen.org/xen-3.1.3.xml.in b/data/platform/xen.org/xen-3.1.3.xml.in
index 7ab1e34..607c880 100644
--- a/data/platform/xen.org/xen-3.1.3.xml.in
+++ b/data/platform/xen.org/xen-3.1.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.1.3";>
     <short-id>xen-3.1.3</short-id>
diff --git a/data/platform/xen.org/xen-3.1.4.xml.in b/data/platform/xen.org/xen-3.1.4.xml.in
index a6658e3..930ba79 100644
--- a/data/platform/xen.org/xen-3.1.4.xml.in
+++ b/data/platform/xen.org/xen-3.1.4.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.1.4";>
     <short-id>xen-3.1.4</short-id>
diff --git a/data/platform/xen.org/xen-3.2.0.xml.in b/data/platform/xen.org/xen-3.2.0.xml.in
index 3bb1ee8..d6a6908 100644
--- a/data/platform/xen.org/xen-3.2.0.xml.in
+++ b/data/platform/xen.org/xen-3.2.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.2.0";>
     <short-id>xen-3.2.0</short-id>
diff --git a/data/platform/xen.org/xen-3.2.1.xml.in b/data/platform/xen.org/xen-3.2.1.xml.in
index 3b46ca4..d57efb0 100644
--- a/data/platform/xen.org/xen-3.2.1.xml.in
+++ b/data/platform/xen.org/xen-3.2.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.2.1";>
     <short-id>xen-3.2.1</short-id>
diff --git a/data/platform/xen.org/xen-3.2.2.xml.in b/data/platform/xen.org/xen-3.2.2.xml.in
index b2002f1..2de2a8d 100644
--- a/data/platform/xen.org/xen-3.2.2.xml.in
+++ b/data/platform/xen.org/xen-3.2.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.2.2";>
     <short-id>xen-3.2.2</short-id>
diff --git a/data/platform/xen.org/xen-3.2.3.xml.in b/data/platform/xen.org/xen-3.2.3.xml.in
index f896720..66873c6 100644
--- a/data/platform/xen.org/xen-3.2.3.xml.in
+++ b/data/platform/xen.org/xen-3.2.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.2.3";>
     <short-id>xen-3.2.3</short-id>
diff --git a/data/platform/xen.org/xen-3.3.0.xml.in b/data/platform/xen.org/xen-3.3.0.xml.in
index 2621d5a..6a3f054 100644
--- a/data/platform/xen.org/xen-3.3.0.xml.in
+++ b/data/platform/xen.org/xen-3.3.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.3.0";>
     <short-id>xen-3.3.0</short-id>
diff --git a/data/platform/xen.org/xen-3.3.1.xml.in b/data/platform/xen.org/xen-3.3.1.xml.in
index 18d215f..d1cddff 100644
--- a/data/platform/xen.org/xen-3.3.1.xml.in
+++ b/data/platform/xen.org/xen-3.3.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.3.1";>
     <short-id>xen-3.3.1</short-id>
diff --git a/data/platform/xen.org/xen-3.3.2.xml.in b/data/platform/xen.org/xen-3.3.2.xml.in
index 2adee23..95ea133 100644
--- a/data/platform/xen.org/xen-3.3.2.xml.in
+++ b/data/platform/xen.org/xen-3.3.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.3.2";>
     <short-id>xen-3.3.2</short-id>
diff --git a/data/platform/xen.org/xen-3.4.0.xml.in b/data/platform/xen.org/xen-3.4.0.xml.in
index 92fe38a..253f319 100644
--- a/data/platform/xen.org/xen-3.4.0.xml.in
+++ b/data/platform/xen.org/xen-3.4.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.4.0";>
     <short-id>xen-3.4.0</short-id>
diff --git a/data/platform/xen.org/xen-3.4.1.xml.in b/data/platform/xen.org/xen-3.4.1.xml.in
index 0332312..53794f8 100644
--- a/data/platform/xen.org/xen-3.4.1.xml.in
+++ b/data/platform/xen.org/xen-3.4.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.4.1";>
     <short-id>xen-3.4.1</short-id>
diff --git a/data/platform/xen.org/xen-3.4.2.xml.in b/data/platform/xen.org/xen-3.4.2.xml.in
index 6e6b8c0..452202b 100644
--- a/data/platform/xen.org/xen-3.4.2.xml.in
+++ b/data/platform/xen.org/xen-3.4.2.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.4.2";>
     <short-id>xen-3.4.2</short-id>
diff --git a/data/platform/xen.org/xen-3.4.3.xml.in b/data/platform/xen.org/xen-3.4.3.xml.in
index 248761f..a9a6d6c 100644
--- a/data/platform/xen.org/xen-3.4.3.xml.in
+++ b/data/platform/xen.org/xen-3.4.3.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/3.4.3";>
     <short-id>xen-3.4.3</short-id>
diff --git a/data/platform/xen.org/xen-4.0.0.xml.in b/data/platform/xen.org/xen-4.0.0.xml.in
index 53e3359..6073375 100644
--- a/data/platform/xen.org/xen-4.0.0.xml.in
+++ b/data/platform/xen.org/xen-4.0.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/4.0.0";>
     <short-id>xen-4.0.0</short-id>
diff --git a/data/platform/xen.org/xen-4.0.1.xml.in b/data/platform/xen.org/xen-4.0.1.xml.in
index 4f21bd7..42ca59a 100644
--- a/data/platform/xen.org/xen-4.0.1.xml.in
+++ b/data/platform/xen.org/xen-4.0.1.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/4.0.1";>
     <short-id>xen-4.0.1</short-id>
diff --git a/data/platform/xen.org/xen-4.1.0.xml.in b/data/platform/xen.org/xen-4.1.0.xml.in
index 89b5cd1..66cb636 100644
--- a/data/platform/xen.org/xen-4.1.0.xml.in
+++ b/data/platform/xen.org/xen-4.1.0.xml.in
@@ -1,5 +1,5 @@
 <libosinfo version="0.0.1">
-<!-- Licensed under the GNU General Public License version 2.1 or later.
+<!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
   <platform id="http://xen.org/xen/4.1.0";>
     <short-id>xen-4.1.0</short-id>
-- 
2.10.1

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux