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

[virt-tools-list] [libosinfo 2/5] Also translate database strings



From: "Zeeshan Ali (Khattak)" <zeeshanak gnome org>

---
 data/devices/Makefile.am         |   14 +-
 data/devices/qemu-pci.xml        |  152 -----
 data/devices/qemu-pci.xml.in     |  152 +++++
 data/devices/qemu-ps2.xml        |   20 -
 data/devices/qemu-ps2.xml.in     |   20 +
 data/devices/qemu-usb.xml        |   14 -
 data/devices/qemu-usb.xml.in     |   14 +
 data/devices/virtio-pci.xml      |   54 --
 data/devices/virtio-pci.xml.in   |   54 ++
 data/devices/xen.xml             |   28 -
 data/devices/xen.xml.in          |   28 +
 data/hypervisors/Makefile.am     |    8 +-
 data/hypervisors/rhel-xen.xml    |  131 ----
 data/hypervisors/rhel-xen.xml.in |  131 ++++
 data/hypervisors/xen.xml         |  287 --------
 data/hypervisors/xen.xml.in      |  287 ++++++++
 data/oses/Makefile.am            |   44 +-
 data/oses/centos.xml             |   39 --
 data/oses/centos.xml.in          |   39 ++
 data/oses/debian.xml             |  212 ------
 data/oses/debian.xml.in          |  212 ++++++
 data/oses/dos.xml                |   10 -
 data/oses/dos.xml.in             |   10 +
 data/oses/fedora.xml             | 1374 --------------------------------------
 data/oses/fedora.xml.in          | 1374 ++++++++++++++++++++++++++++++++++++++
 data/oses/freebsd.xml            |  521 ---------------
 data/oses/freebsd.xml.in         |  521 +++++++++++++++
 data/oses/gnome.xml              |   32 -
 data/oses/gnome.xml.in           |   32 +
 data/oses/macos.xml              |  102 ---
 data/oses/macos.xml.in           |  102 +++
 data/oses/mandrake.xml           |  219 ------
 data/oses/mandrake.xml.in        |  219 ++++++
 data/oses/mandriva.xml           |  166 -----
 data/oses/mandriva.xml.in        |  166 +++++
 data/oses/netbsd.xml             |  183 -----
 data/oses/netbsd.xml.in          |  183 +++++
 data/oses/netware.xml            |   29 -
 data/oses/netware.xml.in         |   29 +
 data/oses/openbsd.xml            |  210 ------
 data/oses/openbsd.xml.in         |  210 ++++++
 data/oses/opensuse.xml           |  238 -------
 data/oses/opensuse.xml.in        |  238 +++++++
 data/oses/rhel.xml               |  727 --------------------
 data/oses/rhel.xml.in            |  727 ++++++++++++++++++++
 data/oses/rhl.xml                |  285 --------
 data/oses/rhl.xml.in             |  285 ++++++++
 data/oses/solaris.xml            |   39 --
 data/oses/solaris.xml.in         |   39 ++
 data/oses/suse.xml               |   88 ---
 data/oses/suse.xml.in            |   88 +++
 data/oses/ubuntu.xml             | 1186 --------------------------------
 data/oses/ubuntu.xml.in          | 1186 ++++++++++++++++++++++++++++++++
 data/oses/windows.xml            |  771 ---------------------
 data/oses/windows.xml.in         |  771 +++++++++++++++++++++
 po/POTFILES.in                   |   26 +
 56 files changed, 7186 insertions(+), 7140 deletions(-)
 delete mode 100644 data/devices/qemu-pci.xml
 create mode 100644 data/devices/qemu-pci.xml.in
 delete mode 100644 data/devices/qemu-ps2.xml
 create mode 100644 data/devices/qemu-ps2.xml.in
 delete mode 100644 data/devices/qemu-usb.xml
 create mode 100644 data/devices/qemu-usb.xml.in
 delete mode 100644 data/devices/virtio-pci.xml
 create mode 100644 data/devices/virtio-pci.xml.in
 delete mode 100644 data/devices/xen.xml
 create mode 100644 data/devices/xen.xml.in
 delete mode 100644 data/hypervisors/rhel-xen.xml
 create mode 100644 data/hypervisors/rhel-xen.xml.in
 delete mode 100644 data/hypervisors/xen.xml
 create mode 100644 data/hypervisors/xen.xml.in
 delete mode 100644 data/oses/centos.xml
 create mode 100644 data/oses/centos.xml.in
 delete mode 100644 data/oses/debian.xml
 create mode 100644 data/oses/debian.xml.in
 delete mode 100644 data/oses/dos.xml
 create mode 100644 data/oses/dos.xml.in
 delete mode 100644 data/oses/fedora.xml
 create mode 100644 data/oses/fedora.xml.in
 delete mode 100644 data/oses/freebsd.xml
 create mode 100644 data/oses/freebsd.xml.in
 delete mode 100644 data/oses/gnome.xml
 create mode 100644 data/oses/gnome.xml.in
 delete mode 100644 data/oses/macos.xml
 create mode 100644 data/oses/macos.xml.in
 delete mode 100644 data/oses/mandrake.xml
 create mode 100644 data/oses/mandrake.xml.in
 delete mode 100644 data/oses/mandriva.xml
 create mode 100644 data/oses/mandriva.xml.in
 delete mode 100644 data/oses/netbsd.xml
 create mode 100644 data/oses/netbsd.xml.in
 delete mode 100644 data/oses/netware.xml
 create mode 100644 data/oses/netware.xml.in
 delete mode 100644 data/oses/openbsd.xml
 create mode 100644 data/oses/openbsd.xml.in
 delete mode 100644 data/oses/opensuse.xml
 create mode 100644 data/oses/opensuse.xml.in
 delete mode 100644 data/oses/rhel.xml
 create mode 100644 data/oses/rhel.xml.in
 delete mode 100644 data/oses/rhl.xml
 create mode 100644 data/oses/rhl.xml.in
 delete mode 100644 data/oses/solaris.xml
 create mode 100644 data/oses/solaris.xml.in
 delete mode 100644 data/oses/suse.xml
 create mode 100644 data/oses/suse.xml.in
 delete mode 100644 data/oses/ubuntu.xml
 create mode 100644 data/oses/ubuntu.xml.in
 delete mode 100644 data/oses/windows.xml
 create mode 100644 data/oses/windows.xml.in

diff --git a/data/devices/Makefile.am b/data/devices/Makefile.am
index be6ed76..b0fed4a 100644
--- a/data/devices/Makefile.am
+++ b/data/devices/Makefile.am
@@ -1,5 +1,15 @@
 
 databasedir = $(pkgdatadir)/db/devices/
-database_DATA = xen.xml qemu-pci.xml qemu-usb.xml qemu-ps2.xml virtio-pci.xml
+database_in_files = \
+  xen.xml.in 	    \
+  qemu-pci.xml.in   \
+  qemu-usb.xml.in   \
+  qemu-ps2.xml.in   \
+  virtio-pci.xml.in
+  $(NULL)
 
-EXTRA_DIST = $(database_DATA)
+database_DATA = $(database_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/devices/qemu-pci.xml b/data/devices/qemu-pci.xml
deleted file mode 100644
index b9b21e0..0000000
--- a/data/devices/qemu-pci.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<!-- PCI devices from various QEMU/KVM(s) -->
-<libosinfo version="0.0.1">
-
-  <!-- Block devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012";>
-    <name>lsi</name>
-    <bus-type>pci</bus-type>
-    <class>block</class>
-    <vendor>LSI Logic / Symbios Logic</vendor>
-    <vendor-id>1000</vendor-id>
-    <product>53c895a</product>
-    <product-id>0012</product-id>
-  </device>
-
-  <!-- Video devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111";>
-    <name>vga</name>
-    <bus-type>pci</bus-type>
-    <class>video</class>
-    <vendor>QEMU</vendor>
-    <vendor-id>1234</vendor-id>
-    <product>VGA</product>
-    <product-id>1111</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8";>
-    <name>cirrus</name>
-    <bus-type>pci</bus-type>
-    <class>video</class>
-    <vendor>Cirrus Logic</vendor>
-    <vendor-id>1013</vendor-id>
-    <product>GD 5446</product>
-    <product-id>00b8</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710";>
-    <name>vmvga</name>
-    <bus-type>pci</bus-type>
-    <class>video</class>
-    <vendor>VMWare</vendor>
-    <vendor-id>15ad</vendor-id>
-    <product>VGA</product>
-    <product-id>0710</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100";>
-    <name>qxl</name>
-    <bus-type>pci</bus-type>
-    <class>video</class>
-    <vendor>Red Hat, Inc</vendor>
-    <vendor-id>1b36</vendor-id>
-    <product>QXL</product>
-    <product-id>0100</product-id>
-  </device>
-
-
-  <!-- Network devices -->
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029";>
-    <name>ne2k_pci</name>
-    <bus-type>pci</bus-type>
-    <class>net</class>
-    <vendor>Realtek Semiconductor Co., Ltd.</vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8029(AS)</product>
-    <product-id>8029</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000";>
-    <name>pcnet</name>
-    <bus-type>pci</bus-type>
-    <class>net</class>
-    <vendor>Advanced Micro Devices [AMD]</vendor>
-    <vendor-id>1022</vendor-id>
-    <product>79c970 [PCnet32 LANCE]</product>
-    <product-id>2000</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139";>
-    <name>rtl8139</name>
-    <bus-type>pci</bus-type>
-    <class>net</class>
-    <vendor>Realtek Semiconductor Co., Ltd.</vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8139/8139C/8139C+</product>
-    <product-id>8139</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e";>
-    <name>e1000</name>
-    <bus-type>pci</bus-type>
-    <vendor>Intel Corporation</vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82540EM Gigabit Ethernet Controller</product>
-    <product-id>100e</product-id>
-  </device>
-
-
-  <!-- Audio devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000";>
-    <name>es1370</name>
-    <bus-type>pci</bus-type>
-    <class>audio</class>
-    <vendor>Ensoniq</vendor>
-    <vendor-id>1274</vendor-id>
-    <product>ES1370 [AudioPCI]</product>
-    <product-id>5000</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415";>
-    <name>ac97</name>
-    <bus-type>pci</bus-type>
-    <class>audio</class>
-    <vendor>Intel Corporation</vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801AA AC'97 Audio Controller</product>
-    <product-id>2415</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668";>
-    <name>ich6</name>
-    <bus-type>pci</bus-type>
-    <class>audio</class>
-    <vendor>Intel Corporation</vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</product>
-    <product-id>2668</product-id>
-  </device>
-
-
-  <!-- Watchdog devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab";>
-    <name>6300esb</name>
-    <bus-type>pci</bus-type>
-    <class>watchdog</class>
-    <vendor>Intel Corporation</vendor>
-    <vendor-id>8086</vendor-id>
-    <product>6300ESB Watchdog Timer</product>
-    <product-id>25ab</product-id>
-  </device>
-
-  <device id="isa://ib700">
-    <name>ib700</name>
-    <bus-type>isa</bus-type>
-    <class>watchdog</class>
-    <product>iBASE 700</product>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
new file mode 100644
index 0000000..b9b21e0
--- /dev/null
+++ b/data/devices/qemu-pci.xml.in
@@ -0,0 +1,152 @@
+<!-- PCI devices from various QEMU/KVM(s) -->
+<libosinfo version="0.0.1">
+
+  <!-- Block devices -->
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012";>
+    <name>lsi</name>
+    <bus-type>pci</bus-type>
+    <class>block</class>
+    <vendor>LSI Logic / Symbios Logic</vendor>
+    <vendor-id>1000</vendor-id>
+    <product>53c895a</product>
+    <product-id>0012</product-id>
+  </device>
+
+  <!-- Video devices -->
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111";>
+    <name>vga</name>
+    <bus-type>pci</bus-type>
+    <class>video</class>
+    <vendor>QEMU</vendor>
+    <vendor-id>1234</vendor-id>
+    <product>VGA</product>
+    <product-id>1111</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8";>
+    <name>cirrus</name>
+    <bus-type>pci</bus-type>
+    <class>video</class>
+    <vendor>Cirrus Logic</vendor>
+    <vendor-id>1013</vendor-id>
+    <product>GD 5446</product>
+    <product-id>00b8</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710";>
+    <name>vmvga</name>
+    <bus-type>pci</bus-type>
+    <class>video</class>
+    <vendor>VMWare</vendor>
+    <vendor-id>15ad</vendor-id>
+    <product>VGA</product>
+    <product-id>0710</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100";>
+    <name>qxl</name>
+    <bus-type>pci</bus-type>
+    <class>video</class>
+    <vendor>Red Hat, Inc</vendor>
+    <vendor-id>1b36</vendor-id>
+    <product>QXL</product>
+    <product-id>0100</product-id>
+  </device>
+
+
+  <!-- Network devices -->
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029";>
+    <name>ne2k_pci</name>
+    <bus-type>pci</bus-type>
+    <class>net</class>
+    <vendor>Realtek Semiconductor Co., Ltd.</vendor>
+    <vendor-id>10ec</vendor-id>
+    <product>RTL-8029(AS)</product>
+    <product-id>8029</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000";>
+    <name>pcnet</name>
+    <bus-type>pci</bus-type>
+    <class>net</class>
+    <vendor>Advanced Micro Devices [AMD]</vendor>
+    <vendor-id>1022</vendor-id>
+    <product>79c970 [PCnet32 LANCE]</product>
+    <product-id>2000</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139";>
+    <name>rtl8139</name>
+    <bus-type>pci</bus-type>
+    <class>net</class>
+    <vendor>Realtek Semiconductor Co., Ltd.</vendor>
+    <vendor-id>10ec</vendor-id>
+    <product>RTL-8139/8139C/8139C+</product>
+    <product-id>8139</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e";>
+    <name>e1000</name>
+    <bus-type>pci</bus-type>
+    <vendor>Intel Corporation</vendor>
+    <vendor-id>8086</vendor-id>
+    <product>82540EM Gigabit Ethernet Controller</product>
+    <product-id>100e</product-id>
+  </device>
+
+
+  <!-- Audio devices -->
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000";>
+    <name>es1370</name>
+    <bus-type>pci</bus-type>
+    <class>audio</class>
+    <vendor>Ensoniq</vendor>
+    <vendor-id>1274</vendor-id>
+    <product>ES1370 [AudioPCI]</product>
+    <product-id>5000</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415";>
+    <name>ac97</name>
+    <bus-type>pci</bus-type>
+    <class>audio</class>
+    <vendor>Intel Corporation</vendor>
+    <vendor-id>8086</vendor-id>
+    <product>82801AA AC'97 Audio Controller</product>
+    <product-id>2415</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668";>
+    <name>ich6</name>
+    <bus-type>pci</bus-type>
+    <class>audio</class>
+    <vendor>Intel Corporation</vendor>
+    <vendor-id>8086</vendor-id>
+    <product>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</product>
+    <product-id>2668</product-id>
+  </device>
+
+
+  <!-- Watchdog devices -->
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab";>
+    <name>6300esb</name>
+    <bus-type>pci</bus-type>
+    <class>watchdog</class>
+    <vendor>Intel Corporation</vendor>
+    <vendor-id>8086</vendor-id>
+    <product>6300ESB Watchdog Timer</product>
+    <product-id>25ab</product-id>
+  </device>
+
+  <device id="isa://ib700">
+    <name>ib700</name>
+    <bus-type>isa</bus-type>
+    <class>watchdog</class>
+    <product>iBASE 700</product>
+  </device>
+
+</libosinfo>
diff --git a/data/devices/qemu-ps2.xml b/data/devices/qemu-ps2.xml
deleted file mode 100644
index 4524b94..0000000
--- a/data/devices/qemu-ps2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- PS2 devices for QEMU/KVM(s) -->
-<libosinfo version="0.0.1">
-
-  <device id="http://qemu.org/ps2/keyboard";>
-    <name>keyboard</name>
-    <bus-type>ps2</bus-type>
-    <class>input</class>
-    <vendor>Qemu/KVM</vendor>
-    <product>Keyboard</product>
-  </device>
-
-  <device id="http://qemu.org/ps2/mouse";>
-    <name>mouse</name>
-    <bus-type>ps2</bus-type>
-    <class>input</class>
-    <vendor>Qemu/KVM</vendor>
-    <product>Mouse</product>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/qemu-ps2.xml.in b/data/devices/qemu-ps2.xml.in
new file mode 100644
index 0000000..4524b94
--- /dev/null
+++ b/data/devices/qemu-ps2.xml.in
@@ -0,0 +1,20 @@
+<!-- PS2 devices for QEMU/KVM(s) -->
+<libosinfo version="0.0.1">
+
+  <device id="http://qemu.org/ps2/keyboard";>
+    <name>keyboard</name>
+    <bus-type>ps2</bus-type>
+    <class>input</class>
+    <vendor>Qemu/KVM</vendor>
+    <product>Keyboard</product>
+  </device>
+
+  <device id="http://qemu.org/ps2/mouse";>
+    <name>mouse</name>
+    <bus-type>ps2</bus-type>
+    <class>input</class>
+    <vendor>Qemu/KVM</vendor>
+    <product>Mouse</product>
+  </device>
+
+</libosinfo>
diff --git a/data/devices/qemu-usb.xml b/data/devices/qemu-usb.xml
deleted file mode 100644
index 34ca07a..0000000
--- a/data/devices/qemu-usb.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- USB devices from various QEMU/KVM(s) -->
-<libosinfo version="0.0.1">
-
-  <device id="http://www.linux-usb.org/usb.ids/80ee/0021";>
-    <name>tablet</name>
-    <bus-type>usb</bus-type>
-    <class>input</class>
-    <vendor>VirtualBox</vendor>
-    <vendor-id>80ee</vendor-id>
-    <product>Tablet</product>
-    <product-id>0021</product-id>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/qemu-usb.xml.in b/data/devices/qemu-usb.xml.in
new file mode 100644
index 0000000..34ca07a
--- /dev/null
+++ b/data/devices/qemu-usb.xml.in
@@ -0,0 +1,14 @@
+<!-- USB devices from various QEMU/KVM(s) -->
+<libosinfo version="0.0.1">
+
+  <device id="http://www.linux-usb.org/usb.ids/80ee/0021";>
+    <name>tablet</name>
+    <bus-type>usb</bus-type>
+    <class>input</class>
+    <vendor>VirtualBox</vendor>
+    <vendor-id>80ee</vendor-id>
+    <product>Tablet</product>
+    <product-id>0021</product-id>
+  </device>
+
+</libosinfo>
diff --git a/data/devices/virtio-pci.xml b/data/devices/virtio-pci.xml
deleted file mode 100644
index b9f4804..0000000
--- a/data/devices/virtio-pci.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- VirtIO PCI devices -->
-<libosinfo version="0.0.1">
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000";>
-    <name>virtio-net</name>
-    <bus-type>pci</bus-type>
-    <class>net</class>
-    <vendor>Red Hat, Inc</vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio network device</product>
-    <product-id>1000</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001";>
-    <name>virtio-block</name>
-    <bus-type>pci</bus-type>
-    <class>block</class>
-    <vendor>Red Hat, Inc</vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio block device</product>
-    <product-id>1001</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002";>
-    <name>virtio-balloon</name>
-    <bus-type>pci</bus-type>
-    <class>memory.balloon</class>
-    <vendor>Red Hat, Inc</vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio memory balloon</product>
-    <product-id>1002</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003";>
-    <name>virtio-console</name>
-    <bus-type>pci</bus-type>
-    <class>console</class>
-    <vendor>Red Hat, Inc</vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio console</product>
-    <product-id>1003</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009";>
-    <name>virtio-9p</name>
-    <bus-type>pci</bus-type>
-    <class>filesystem</class>
-    <vendor>Red Hat, Inc</vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio 9p</product>
-    <product-id>1009</product-id>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in
new file mode 100644
index 0000000..b9f4804
--- /dev/null
+++ b/data/devices/virtio-pci.xml.in
@@ -0,0 +1,54 @@
+<!-- VirtIO PCI devices -->
+<libosinfo version="0.0.1">
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000";>
+    <name>virtio-net</name>
+    <bus-type>pci</bus-type>
+    <class>net</class>
+    <vendor>Red Hat, Inc</vendor>
+    <vendor-id>1af4</vendor-id>
+    <product>Virtio network device</product>
+    <product-id>1000</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001";>
+    <name>virtio-block</name>
+    <bus-type>pci</bus-type>
+    <class>block</class>
+    <vendor>Red Hat, Inc</vendor>
+    <vendor-id>1af4</vendor-id>
+    <product>Virtio block device</product>
+    <product-id>1001</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002";>
+    <name>virtio-balloon</name>
+    <bus-type>pci</bus-type>
+    <class>memory.balloon</class>
+    <vendor>Red Hat, Inc</vendor>
+    <vendor-id>1af4</vendor-id>
+    <product>Virtio memory balloon</product>
+    <product-id>1002</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003";>
+    <name>virtio-console</name>
+    <bus-type>pci</bus-type>
+    <class>console</class>
+    <vendor>Red Hat, Inc</vendor>
+    <vendor-id>1af4</vendor-id>
+    <product>Virtio console</product>
+    <product-id>1003</product-id>
+  </device>
+
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009";>
+    <name>virtio-9p</name>
+    <bus-type>pci</bus-type>
+    <class>filesystem</class>
+    <vendor>Red Hat, Inc</vendor>
+    <vendor-id>1af4</vendor-id>
+    <product>Virtio 9p</product>
+    <product-id>1009</product-id>
+  </device>
+
+</libosinfo>
diff --git a/data/devices/xen.xml b/data/devices/xen.xml
deleted file mode 100644
index 8065fec..0000000
--- a/data/devices/xen.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Xen 3.x / 4.x paravirt devices -->
-<libosinfo version="0.0.1">
-
-  <device id="http://xen.org/devices/block";>
-    <class>block</class>
-    <bus-type>xen</bus-type>
-    <name>xen-block</name>
-  </device>
-
-  <device id="http://xen.org/devices/net";>
-    <class>net</class>
-    <bus-type>xen</bus-type>
-    <name>xen-net</name>
-  </device>
-
-  <device id="http://xen.org/devices/console";>
-    <class>console</class>
-    <bus-type>xen</bus-type>
-    <name>xen-console</name>
-  </device>
-
-  <device id="http://xen.org/devices/framebuffer";>
-    <class>video</class>
-    <bus-type>xen</bus-type>
-    <name>xen-pvfb</name>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/xen.xml.in b/data/devices/xen.xml.in
new file mode 100644
index 0000000..8065fec
--- /dev/null
+++ b/data/devices/xen.xml.in
@@ -0,0 +1,28 @@
+<!-- Xen 3.x / 4.x paravirt devices -->
+<libosinfo version="0.0.1">
+
+  <device id="http://xen.org/devices/block";>
+    <class>block</class>
+    <bus-type>xen</bus-type>
+    <name>xen-block</name>
+  </device>
+
+  <device id="http://xen.org/devices/net";>
+    <class>net</class>
+    <bus-type>xen</bus-type>
+    <name>xen-net</name>
+  </device>
+
+  <device id="http://xen.org/devices/console";>
+    <class>console</class>
+    <bus-type>xen</bus-type>
+    <name>xen-console</name>
+  </device>
+
+  <device id="http://xen.org/devices/framebuffer";>
+    <class>video</class>
+    <bus-type>xen</bus-type>
+    <name>xen-pvfb</name>
+  </device>
+
+</libosinfo>
diff --git a/data/hypervisors/Makefile.am b/data/hypervisors/Makefile.am
index 2d7041a..823da6f 100644
--- a/data/hypervisors/Makefile.am
+++ b/data/hypervisors/Makefile.am
@@ -1,5 +1,11 @@
 
 databasedir = $(pkgdatadir)/db/hypervisors/
-database_DATA = rhel-xen.xml xen.xml
+database_in_files = rhel-xen.xml.in xen.xml.in
+
+database_DATA = $(database_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(database_in_files) $(database_DATA)
 
 EXTRA_DIST = $(database_DATA)
diff --git a/data/hypervisors/rhel-xen.xml b/data/hypervisors/rhel-xen.xml
deleted file mode 100644
index e3757a3..0000000
--- a/data/hypervisors/rhel-xen.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <platform id="http://redhat.com/rhel/5.0/xen/3.0.3";>
-    <short-id>xen-3.0.3-rhel-5.0</short-id>
-    <name>Xen 3.0.3 (RHEL 5.0)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.0.3</version>
-
-    <derives-from id="http://xen.org/xen/3.0.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.1/xen/3.1.0";>
-    <short-id>xen-3.1.0-rhel-5.1</short-id>
-    <name>Xen 3.1.0 (RHEL 5.1)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.2/xen/3.1.0";>
-    <short-id>xen-3.1.0-rhel-5.2</short-id>
-    <name>Xen 3.1.0 (RHEL 5.2)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.3/xen/3.1.0";>
-    <short-id>xen-3.1.0-rhel-5.3</short-id>
-    <name>Xen 3.1.0 (RHEL 5.3)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.4/xen/3.1.0";>
-    <short-id>xen-3.1.0-rhel-5.4</short-id>
-    <name>Xen 3.1.0 (RHEL 5.4)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.5/xen/3.1.0";>
-    <short-id>xen-3.1.0-rhel-5.5</short-id>
-    <name>Xen 3.1.0 (RHEL 5.5)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.6/xen/3.1.0";>
-    <short-id>xen-3.1.0-rhel-5.6</short-id>
-    <name>Xen 3.1.0 (RHEL 5.6)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.7/xen/3.1.0";>
-    <short-id>xen-3.1.0-rhel-5.7</short-id>
-    <name>Xen 3.1.0 (RHEL 5.7)</name>
-    <vendor>Red Hat, Inc.</vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-</libosinfo>
diff --git a/data/hypervisors/rhel-xen.xml.in b/data/hypervisors/rhel-xen.xml.in
new file mode 100644
index 0000000..e3757a3
--- /dev/null
+++ b/data/hypervisors/rhel-xen.xml.in
@@ -0,0 +1,131 @@
+<libosinfo version="0.0.1">
+
+  <platform id="http://redhat.com/rhel/5.0/xen/3.0.3";>
+    <short-id>xen-3.0.3-rhel-5.0</short-id>
+    <name>Xen 3.0.3 (RHEL 5.0)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.0.3</version>
+
+    <derives-from id="http://xen.org/xen/3.0.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://redhat.com/rhel/5.1/xen/3.1.0";>
+    <short-id>xen-3.1.0-rhel-5.1</short-id>
+    <name>Xen 3.1.0 (RHEL 5.1)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://redhat.com/rhel/5.2/xen/3.1.0";>
+    <short-id>xen-3.1.0-rhel-5.2</short-id>
+    <name>Xen 3.1.0 (RHEL 5.2)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://redhat.com/rhel/5.3/xen/3.1.0";>
+    <short-id>xen-3.1.0-rhel-5.3</short-id>
+    <name>Xen 3.1.0 (RHEL 5.3)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://redhat.com/rhel/5.4/xen/3.1.0";>
+    <short-id>xen-3.1.0-rhel-5.4</short-id>
+    <name>Xen 3.1.0 (RHEL 5.4)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://redhat.com/rhel/5.5/xen/3.1.0";>
+    <short-id>xen-3.1.0-rhel-5.5</short-id>
+    <name>Xen 3.1.0 (RHEL 5.5)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://redhat.com/rhel/5.6/xen/3.1.0";>
+    <short-id>xen-3.1.0-rhel-5.6</short-id>
+    <name>Xen 3.1.0 (RHEL 5.6)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://redhat.com/rhel/5.7/xen/3.1.0";>
+    <short-id>xen-3.1.0-rhel-5.7</short-id>
+    <name>Xen 3.1.0 (RHEL 5.7)</name>
+    <vendor>Red Hat, Inc.</vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+</libosinfo>
diff --git a/data/hypervisors/xen.xml b/data/hypervisors/xen.xml
deleted file mode 100644
index d42c823..0000000
--- a/data/hypervisors/xen.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- Official Xen Project releases -->
-<libosinfo version="0.0.1">
-
-  <platform id="http://xen.org/xen/3.0.2";>
-    <short-id>xen-3.0.2</short-id>
-    <name>Xen 3.0.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.0.2</version>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.0.3";>
-    <short-id>xen-3.0.3</short-id>
-    <name>Xen 3.0.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.0.3</version>
-    <upgrades id="http://xen.org/xen/3.0.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.0.4";>
-    <short-id>xen-3.0.4</short-id>
-    <name>Xen 3.0.4</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.0.4</version>
-    <upgrades id="http://xen.org/xen/3.0.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.1.3";>
-    <short-id>xen-3.1.3</short-id>
-    <name>Xen 3.1.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.1.3</version>
-    <upgrades id="http://xen.org/xen/3.0.4"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.1.4";>
-    <short-id>xen-3.1.4</short-id>
-    <name>Xen 3.1.4</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.1.4</version>
-    <upgrades id="http://xen.org/xen/3.1.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.0";>
-    <short-id>xen-3.2.0</short-id>
-    <name>Xen 3.2.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.2.0</version>
-    <upgrades id="http://xen.org/xen/3.1.4"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.1";>
-    <short-id>xen-3.2.1</short-id>
-    <name>Xen 3.2.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.2.1</version>
-    <upgrades id="http://xen.org/xen/3.2.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.2";>
-    <short-id>xen-3.2.2</short-id>
-    <name>Xen 3.2.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.2.2</version>
-    <upgrades id="http://xen.org/xen/3.2.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.3";>
-    <short-id>xen-3.2.3</short-id>
-    <name>Xen 3.2.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.2.3</version>
-    <upgrades id="http://xen.org/xen/3.2.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.3.0";>
-    <short-id>xen-3.3.0</short-id>
-    <name>Xen 3.3.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.3.0</version>
-    <upgrades id="http://xen.org/xen/3.2.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.3.1";>
-    <short-id>xen-3.3.1</short-id>
-    <name>Xen 3.3.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.3.1</version>
-    <upgrades id="http://xen.org/xen/3.3.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.3.2";>
-    <short-id>xen-3.3.2</short-id>
-    <name>Xen 3.3.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.3.2</version>
-    <upgrades id="http://xen.org/xen/3.3.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.0";>
-    <short-id>xen-3.4.0</short-id>
-    <name>Xen 3.4.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.4.0</version>
-    <upgrades id="http://xen.org/xen/3.3.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.1";>
-    <short-id>xen-3.4.1</short-id>
-    <name>Xen 3.4.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.4.1</version>
-    <upgrades id="http://xen.org/xen/3.4.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.2";>
-    <short-id>xen-3.4.2</short-id>
-    <name>Xen 3.4.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.4.2</version>
-    <upgrades id="http://xen.org/xen/3.4.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.3";>
-    <short-id>xen-3.4.3</short-id>
-    <name>Xen 3.4.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>3.4.3</version>
-    <upgrades id="http://xen.org/xen/3.4.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/4.0.0";>
-    <short-id>xen-4.0.0</short-id>
-    <name>Xen 4.0.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>4.0.0</version>
-    <upgrades id="http://xen.org/xen/3.4.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/4.0.1";>
-    <short-id>xen-4.0.1</short-id>
-    <name>Xen 4.0.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>4.0.1</version>
-    <upgrades id="http://xen.org/xen/4.0.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/4.1.0";>
-    <short-id>xen-4.1.0</short-id>
-    <name>Xen 4.1.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
-    <version>4.1.0</version>
-    <upgrades id="http://xen.org/xen/4.0.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-
-</libosinfo>
diff --git a/data/hypervisors/xen.xml.in b/data/hypervisors/xen.xml.in
new file mode 100644
index 0000000..d42c823
--- /dev/null
+++ b/data/hypervisors/xen.xml.in
@@ -0,0 +1,287 @@
+<!-- Official Xen Project releases -->
+<libosinfo version="0.0.1">
+
+  <platform id="http://xen.org/xen/3.0.2";>
+    <short-id>xen-3.0.2</short-id>
+    <name>Xen 3.0.2</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.0.2</version>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.0.3";>
+    <short-id>xen-3.0.3</short-id>
+    <name>Xen 3.0.3</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.0.3</version>
+    <upgrades id="http://xen.org/xen/3.0.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.0.4";>
+    <short-id>xen-3.0.4</short-id>
+    <name>Xen 3.0.4</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.0.4</version>
+    <upgrades id="http://xen.org/xen/3.0.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.1.3";>
+    <short-id>xen-3.1.3</short-id>
+    <name>Xen 3.1.3</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.1.3</version>
+    <upgrades id="http://xen.org/xen/3.0.4"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.1.4";>
+    <short-id>xen-3.1.4</short-id>
+    <name>Xen 3.1.4</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.1.4</version>
+    <upgrades id="http://xen.org/xen/3.1.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.2.0";>
+    <short-id>xen-3.2.0</short-id>
+    <name>Xen 3.2.0</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.2.0</version>
+    <upgrades id="http://xen.org/xen/3.1.4"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.2.1";>
+    <short-id>xen-3.2.1</short-id>
+    <name>Xen 3.2.1</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.2.1</version>
+    <upgrades id="http://xen.org/xen/3.2.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.2.2";>
+    <short-id>xen-3.2.2</short-id>
+    <name>Xen 3.2.2</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.2.2</version>
+    <upgrades id="http://xen.org/xen/3.2.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.2.3";>
+    <short-id>xen-3.2.3</short-id>
+    <name>Xen 3.2.3</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.2.3</version>
+    <upgrades id="http://xen.org/xen/3.2.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.3.0";>
+    <short-id>xen-3.3.0</short-id>
+    <name>Xen 3.3.0</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.3.0</version>
+    <upgrades id="http://xen.org/xen/3.2.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.3.1";>
+    <short-id>xen-3.3.1</short-id>
+    <name>Xen 3.3.1</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.3.1</version>
+    <upgrades id="http://xen.org/xen/3.3.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.3.2";>
+    <short-id>xen-3.3.2</short-id>
+    <name>Xen 3.3.2</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.3.2</version>
+    <upgrades id="http://xen.org/xen/3.3.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.4.0";>
+    <short-id>xen-3.4.0</short-id>
+    <name>Xen 3.4.0</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.4.0</version>
+    <upgrades id="http://xen.org/xen/3.3.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.4.1";>
+    <short-id>xen-3.4.1</short-id>
+    <name>Xen 3.4.1</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.4.1</version>
+    <upgrades id="http://xen.org/xen/3.4.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.4.2";>
+    <short-id>xen-3.4.2</short-id>
+    <name>Xen 3.4.2</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.4.2</version>
+    <upgrades id="http://xen.org/xen/3.4.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/3.4.3";>
+    <short-id>xen-3.4.3</short-id>
+    <name>Xen 3.4.3</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>3.4.3</version>
+    <upgrades id="http://xen.org/xen/3.4.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/4.0.0";>
+    <short-id>xen-4.0.0</short-id>
+    <name>Xen 4.0.0</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>4.0.0</version>
+    <upgrades id="http://xen.org/xen/3.4.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/4.0.1";>
+    <short-id>xen-4.0.1</short-id>
+    <name>Xen 4.0.1</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>4.0.1</version>
+    <upgrades id="http://xen.org/xen/4.0.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+  <platform id="http://xen.org/xen/4.1.0";>
+    <short-id>xen-4.1.0</short-id>
+    <name>Xen 4.1.0</name>
+    <vendor>Citrix Systems, Inc.</vendor>
+    <version>4.1.0</version>
+    <upgrades id="http://xen.org/xen/4.0.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+
+
+</libosinfo>
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index fd0b9ae..288c2ee 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -1,24 +1,28 @@
 
 databasedir = $(pkgdatadir)/db/oses/
-database_DATA =     \
-  centos.xml        \
-  debian.xml        \
-  dos.xml           \
-  fedora.xml        \
-  freebsd.xml	    \
-  gnome.xml	    \
-  mandriva.xml      \
-  mandrake.xml      \
-  netbsd.xml	    \
-  netware.xml	    \
-  openbsd.xml	    \
-  opensuse.xml      \
-  rhl.xml           \
-  rhel.xml          \
-  solaris.xml	    \
-  suse.xml          \
-  ubuntu.xml        \
-  windows.xml 	    \
+database_in_files = \
+  centos.xml.in     \
+  debian.xml.in     \
+  dos.xml.in        \
+  fedora.xml.in     \
+  freebsd.xml.in    \
+  gnome.xml.in	    \
+  mandriva.xml.in   \
+  mandrake.xml.in   \
+  netbsd.xml.in	    \
+  netware.xml.in    \
+  openbsd.xml.in    \
+  opensuse.xml.in   \
+  rhl.xml.in        \
+  rhel.xml.in       \
+  solaris.xml.in    \
+  suse.xml.in       \
+  ubuntu.xml.in     \
+  windows.xml.in    \
   $(NULL)
 
-EXTRA_DIST = $(database_DATA)
+database_DATA = $(database_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/oses/centos.xml b/data/oses/centos.xml
deleted file mode 100644
index 1dfb1c7..0000000
--- a/data/oses/centos.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://centos.org/centos/6.0";>
-    <short-id>centos6.0</short-id>
-    <name>CentOS 6.0</name>
-    <version>6.0</version>
-    <vendor>CentOS</vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <clones id="http://redhat.com/rhel/6.0"/>
-
-    <!-- there is no obvious difference between x86 and x86_64 isos,
-         maybe we can lookup files on the iso to decide which arch it is? -->
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.0_Final</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.0_Final</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://centos.org/centos/6.1";>
-    <short-id>centos6.1</short-id>
-    <name>CentOS 6.1</name>
-    <version>6.1</version>
-    <vendor>CentOS</vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.0"/>
-    <clones id="http://redhat.com/rhel/6.1"/>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
new file mode 100644
index 0000000..1dfb1c7
--- /dev/null
+++ b/data/oses/centos.xml.in
@@ -0,0 +1,39 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://centos.org/centos/6.0";>
+    <short-id>centos6.0</short-id>
+    <name>CentOS 6.0</name>
+    <version>6.0</version>
+    <vendor>CentOS</vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <clones id="http://redhat.com/rhel/6.0"/>
+
+    <!-- there is no obvious difference between x86 and x86_64 isos,
+         maybe we can lookup files on the iso to decide which arch it is? -->
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.0_Final</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.0_Final</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://centos.org/centos/6.1";>
+    <short-id>centos6.1</short-id>
+    <name>CentOS 6.1</name>
+    <version>6.1</version>
+    <vendor>CentOS</vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.0"/>
+    <clones id="http://redhat.com/rhel/6.1"/>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/debian.xml b/data/oses/debian.xml
deleted file mode 100644
index 675acd2..0000000
--- a/data/oses/debian.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://debian.org/debian/1.0";>
-    <short-id>debian1.0</short-id>
-    <short-id>debianbuzz</short-id>
-    <name>Debian Buzz</name>
-    <version>1.1</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-  </os>
-
-  <os id="http://debian.org/debian/1.2";>
-    <short-id>debian1.2</short-id>
-    <short-id>debianrex</short-id>
-    <name>Debian Rex</name>
-    <version>1.2</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/1.0"/>
-    <derives-from id="http://debian.org/debian/1.0"/>
-  </os>
-
-  <os id="http://debian.org/debian/1.3";>
-    <short-id>debian1.3</short-id>
-    <short-id>debianbo</short-id>
-    <name>Debian Bo</name>
-    <version>1.3</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/1.2"/>
-    <derives-from id="http://debian.org/debian/1.2"/>
-  </os>
-
-  <os id="http://debian.org/debian/2.0";>
-    <short-id>debian2.0</short-id>
-    <short-id>debianhamm</short-id>
-    <name>Debian Hamm</name>
-    <version>2.0</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/1.3"/>
-    <derives-from id="http://debian.org/debian/1.3"/>
-  </os>
-
-  <os id="http://debian.org/debian/2.1";>
-    <short-id>debian2.1</short-id>
-    <short-id>debiansilnk</short-id>
-    <name>Debian Silnk</name>
-    <version>2.1</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/2.0"/>
-    <derives-from id="http://debian.org/debian/2.0"/>
-  </os>
-
-  <os id="http://debian.org/debian/2.2";>
-    <short-id>debian2.2</short-id>
-    <short-id>debianpotato</short-id>
-    <name>Debian Potato</name>
-    <version>2.2</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/2.1"/>
-    <derives-from id="http://debian.org/debian/2.1"/>
-  </os>
-
-  <os id="http://debian.org/debian/3";>
-    <short-id>debian3</short-id>
-    <short-id>debianwoody</short-id>
-    <name>Debian Woody</name>
-    <version>3</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/2.2"/>
-    <derives-from id="http://debian.org/debian/2.2"/>
-  </os>
-
-
-  <os id="http://debian.org/debian/3.1";>
-    <short-id>debian3.1</short-id>
-    <short-id>debiansarge</short-id>
-    <name>Debian Sarge</name>
-    <version>3.1</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/3"/>
-    <derives-from id="http://debian.org/debian/3"/>
-  </os>
-
-  <os id="http://debian.org/debian/4";>
-    <short-id>debian4</short-id>
-    <short-id>debianetch</short-id>
-    <name>Debian Etch</name>
-    <version>4</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/3.1"/>
-    <derives-from id="http://debian.org/debian/3.1"/>
-  </os>
-
-  <os id="http://debian.org/debian/5";>
-    <short-id>debian5</short-id>
-    <short-id>debianlenny</short-id>
-    <name>Debian Lenny</name>
-    <version>5</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/4"/>
-    <derives-from id="http://debian.org/debian/4"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://debian.org/debian/6";>
-    <short-id>debian6</short-id>
-    <short-id>debiansqueeze</short-id>
-    <name>Debian Squeeze</name>
-    <version>6</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/5"/>
-    <derives-from id="http://debian.org/debian/5"/>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i386">
-<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3/i386/iso-dvd/</url>-->
-      <iso>
-        <volume-id>Debian 6.0.\d i386 1</volume-id>
-      </iso>
-      <kernel>/vmlinuz</kernel>
-      <initrd>/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3/amd64/iso-dvd/</url>-->
-      <iso>
-        <volume-id>Debian 6.0.\d amd64 1</volume-id>
-      </iso>
-    </media>
-
-    <media arch="i386" live="true">
-<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3-live/i386/iso-hybrid/</url>-->
-      <iso>
-        <volume-id>Debian squeeze 20111014-08:13</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-    </media>
-    <media arch="x86_64" live="true">
-<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3-live/amd64/iso-hybrid/</url>-->
-      <iso>
-        <volume-id>Debian squeeze 20111014-08:11</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-    </media>
-  </os>
-
-<!-- Wheezy isn't released yet
-  <os id="http://debian.org/wheezy";>
-    <short-id>debianwheezy</short-id>
-    <name>Debian Wheezy</name>
-    <version>7</version>
-    <vendor>Debian Project</vendor>
-    <family>linux</family>
-    <upgrades id="http://debian.org/squeeze"/>
-  </os>
--->
-
-</libosinfo>
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
new file mode 100644
index 0000000..675acd2
--- /dev/null
+++ b/data/oses/debian.xml.in
@@ -0,0 +1,212 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://debian.org/debian/1.0";>
+    <short-id>debian1.0</short-id>
+    <short-id>debianbuzz</short-id>
+    <name>Debian Buzz</name>
+    <version>1.1</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+  </os>
+
+  <os id="http://debian.org/debian/1.2";>
+    <short-id>debian1.2</short-id>
+    <short-id>debianrex</short-id>
+    <name>Debian Rex</name>
+    <version>1.2</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/1.0"/>
+    <derives-from id="http://debian.org/debian/1.0"/>
+  </os>
+
+  <os id="http://debian.org/debian/1.3";>
+    <short-id>debian1.3</short-id>
+    <short-id>debianbo</short-id>
+    <name>Debian Bo</name>
+    <version>1.3</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/1.2"/>
+    <derives-from id="http://debian.org/debian/1.2"/>
+  </os>
+
+  <os id="http://debian.org/debian/2.0";>
+    <short-id>debian2.0</short-id>
+    <short-id>debianhamm</short-id>
+    <name>Debian Hamm</name>
+    <version>2.0</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/1.3"/>
+    <derives-from id="http://debian.org/debian/1.3"/>
+  </os>
+
+  <os id="http://debian.org/debian/2.1";>
+    <short-id>debian2.1</short-id>
+    <short-id>debiansilnk</short-id>
+    <name>Debian Silnk</name>
+    <version>2.1</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/2.0"/>
+    <derives-from id="http://debian.org/debian/2.0"/>
+  </os>
+
+  <os id="http://debian.org/debian/2.2";>
+    <short-id>debian2.2</short-id>
+    <short-id>debianpotato</short-id>
+    <name>Debian Potato</name>
+    <version>2.2</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/2.1"/>
+    <derives-from id="http://debian.org/debian/2.1"/>
+  </os>
+
+  <os id="http://debian.org/debian/3";>
+    <short-id>debian3</short-id>
+    <short-id>debianwoody</short-id>
+    <name>Debian Woody</name>
+    <version>3</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/2.2"/>
+    <derives-from id="http://debian.org/debian/2.2"/>
+  </os>
+
+
+  <os id="http://debian.org/debian/3.1";>
+    <short-id>debian3.1</short-id>
+    <short-id>debiansarge</short-id>
+    <name>Debian Sarge</name>
+    <version>3.1</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/3"/>
+    <derives-from id="http://debian.org/debian/3"/>
+  </os>
+
+  <os id="http://debian.org/debian/4";>
+    <short-id>debian4</short-id>
+    <short-id>debianetch</short-id>
+    <name>Debian Etch</name>
+    <version>4</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/3.1"/>
+    <derives-from id="http://debian.org/debian/3.1"/>
+  </os>
+
+  <os id="http://debian.org/debian/5";>
+    <short-id>debian5</short-id>
+    <short-id>debianlenny</short-id>
+    <name>Debian Lenny</name>
+    <version>5</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/4"/>
+    <derives-from id="http://debian.org/debian/4"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+
+  <os id="http://debian.org/debian/6";>
+    <short-id>debian6</short-id>
+    <short-id>debiansqueeze</short-id>
+    <name>Debian Squeeze</name>
+    <version>6</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/5"/>
+    <derives-from id="http://debian.org/debian/5"/>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i386">
+<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3/i386/iso-dvd/</url>-->
+      <iso>
+        <volume-id>Debian 6.0.\d i386 1</volume-id>
+      </iso>
+      <kernel>/vmlinuz</kernel>
+      <initrd>/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3/amd64/iso-dvd/</url>-->
+      <iso>
+        <volume-id>Debian 6.0.\d amd64 1</volume-id>
+      </iso>
+    </media>
+
+    <media arch="i386" live="true">
+<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3-live/i386/iso-hybrid/</url>-->
+      <iso>
+        <volume-id>Debian squeeze 20111014-08:13</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+    </media>
+    <media arch="x86_64" live="true">
+<!--      <url>http://cdimage.debian.org/debian-cd/6.0.3-live/amd64/iso-hybrid/</url>-->
+      <iso>
+        <volume-id>Debian squeeze 20111014-08:11</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+    </media>
+  </os>
+
+<!-- Wheezy isn't released yet
+  <os id="http://debian.org/wheezy";>
+    <short-id>debianwheezy</short-id>
+    <name>Debian Wheezy</name>
+    <version>7</version>
+    <vendor>Debian Project</vendor>
+    <family>linux</family>
+    <upgrades id="http://debian.org/squeeze"/>
+  </os>
+-->
+
+</libosinfo>
diff --git a/data/oses/dos.xml b/data/oses/dos.xml
deleted file mode 100644
index 4f26e3f..0000000
--- a/data/oses/dos.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<libosinfo version="0.0.1">
-  <os id="http://microsoft.com/msdos/6.22";>
-    <short-id>msdos6.22</short-id>
-    <name>Microsoft MS-DOS 6.22</name>
-    <vendor>Microsoft</vendor>
-    <version>6.22</version>
-    <family>msdos</family>
-    <distro>msdos</distro>
-  </os>
-</libosinfo>
diff --git a/data/oses/dos.xml.in b/data/oses/dos.xml.in
new file mode 100644
index 0000000..4f26e3f
--- /dev/null
+++ b/data/oses/dos.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/msdos/6.22";>
+    <short-id>msdos6.22</short-id>
+    <name>Microsoft MS-DOS 6.22</name>
+    <vendor>Microsoft</vendor>
+    <version>6.22</version>
+    <family>msdos</family>
+    <distro>msdos</distro>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora.xml b/data/oses/fedora.xml
deleted file mode 100644
index 40023c4..0000000
--- a/data/oses/fedora.xml
+++ /dev/null
@@ -1,1374 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://fedoraproject.org/fedora/1";>
-    <short-id>fedora1</short-id>
-    <name>Fedora Core 1</name>
-    <version>1</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Yarrow</codename>
-    <upgrades id="http://redhat.com/rhl/9"/>
-    <derives-from id="http://redhat.com/rhl/9"/>
-
-    <release-date>2003-11-05</release-date>
-    <eol-date>2004-09-20</eol-date>
-
-    <!-- XXX upgrades/derives RHL -->
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
-    </devices>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc1.iso</url>
-      <iso>
-        <application-id>FC/1 i386</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/iso/yarrow-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/1 x86_64</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/2";>
-    <short-id>fedora2</short-id>
-    <name>Fedora Core 2</name>
-    <version>2</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Tettnang</codename>
-    <upgrades id="http://fedoraproject.org/fedora/1"/>
-    <derives-from id="http://fedoraproject.org/fedora/1"/>
-
-    <release-date>2004-05-18</release-date>
-    <eol-date>2005-04-11</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc1.iso</url>
-      <iso>
-        <application-id>FC/2 i386</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/2 x86_64</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/3";>
-    <short-id>fedora3</short-id>
-    <name>Fedora Core 3</name>
-    <version>3</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Heidelberg</codename>
-    <upgrades id="http://fedoraproject.org/fedora/2"/>
-    <derives-from id="http://fedoraproject.org/fedora/2"/>
-
-    <release-date>2004-11-08</release-date>
-    <eol-date>2006-01-16</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc1.iso</url>
-      <iso>
-        <application-id>FC/3 i386</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/3 x86_64</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/4";>
-    <short-id>fedora4</short-id>
-    <name>Fedora Core 4</name>
-    <version>4</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Stentz</codename>
-    <upgrades id="http://fedoraproject.org/fedora/3"/>
-    <derives-from id="http://fedoraproject.org/fedora/3"/>
-
-    <release-date>2005-06-13</release-date>
-    <eol-date>2006-08-07</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc1.iso</url>
-      <iso>
-        <application-id>FC/4 i386</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/4 x86_64</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc1.iso</url>
-      <iso>
-        <application-id>FC/4 ppc</application-id>
-        <system-id>PPC|LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/5";>
-    <short-id>fedora5</short-id>
-    <name>Fedora Core 5</name>
-    <version>5</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Bordeaux</codename>
-    <upgrades id="http://fedoraproject.org/fedora/4"/>
-    <derives-from id="http://fedoraproject.org/fedora/4"/>
-
-    <release-date>2006-03-20</release-date>
-    <eol-date>2007-07-02</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc1.iso</url>
-      <iso>
-        <application-id>FC/5 i386</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/5 x86_64</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc1.iso</url>
-      <iso>
-        <application-id>FC/5 ppc</application-id>
-        <system-id>PPC|LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/6";>
-    <short-id>fedora6</short-id>
-    <name>Fedora Core 6</name>
-    <version>6</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Zod</codename>
-    <upgrades id="http://fedoraproject.org/fedora/5"/>
-    <derives-from id="http://fedoraproject.org/fedora/5"/>
-
-    <release-date>2006-10-24</release-date>
-    <eol-date>2007-12-07</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc1.iso</url>
-      <iso>
-        <application-id>FC(-|/)6 i386</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC(-|/)6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc1.iso</url>
-      <iso>
-        <application-id>FC(-|/)6 ppc</application-id>
-        <system-id>PPC|LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/7";>
-    <short-id>fedora7</short-id>
-    <name>Fedora 7</name>
-    <version>7</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Moonshine</codename>
-    <upgrades id="http://fedoraproject.org/fedora/6"/>
-    <derives-from id="http://fedoraproject.org/fedora/6"/>
-
-    <release-date>2007-05-31</release-date>
-    <eol-date>2008-06-13</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/iso/F-7-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 7 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/iso/F-7-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 7 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/ppc/iso/F-7-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 7 ppc (DVD|Disc)</volume-id>
-        <system-id>PPC</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-Live-i686.iso</url>
-      <iso>
-        <volume-id>Fedora-7-(KDE-)?Live-i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-Live-x86_64.iso</url>
-      <iso>
-        <volume-id>Fedora-7-(KDE-)?Live-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>7</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>7</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/8";>
-    <short-id>fedora8</short-id>
-    <name>Fedora 8</name>
-    <version>8</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Werewolf</codename>
-    <upgrades id="http://fedoraproject.org/fedora/7"/>
-    <derives-from id="http://fedoraproject.org/fedora/7"/>
-
-    <release-date>2007-11-08</release-date>
-    <eol-date>2009-01-07</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/iso/Fedora-8-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 8 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/iso/Fedora-8-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 8 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/ppc/iso/Fedora-8-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 8 ppc (DVD|Disc)</volume-id>
-        <system-id>PPC</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-i686.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-(KDE-)?i686</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-x86_64.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-(KDE-)?x86_64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/ppc/Fedora-8-Live-ppc.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-(KDE-)?ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>8</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>8</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/9";>
-    <short-id>fedora9</short-id>
-    <name>Fedora 9</name>
-    <version>9</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Sulphur</codename>
-    <upgrades id="http://fedoraproject.org/fedora/8"/>
-    <derives-from id="http://fedoraproject.org/fedora/8"/>
-
-    <release-date>2008-05-13</release-date>
-    <eol-date>2009-07-10</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
-      <!-- Apparently F9 has selinux errors when installing with virtio:
-           https://bugzilla.redhat.com/show_bug.cgi?id=470386
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      -->
-    </devices>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 9 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc (DVD|Disc)</volume-id>
-        <system-id>PPC|LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-9-Live-(KDE-)?i686</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/x86_64/Fedora-9-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-9-Live-(KDE-)?x86_64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>9</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>9</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/10";>
-    <short-id>fedora10</short-id>
-    <name>Fedora 10</name>
-    <version>10</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Cambridge</codename>
-    <upgrades id="http://fedoraproject.org/fedora/9"/>
-    <derives-from id="http://fedoraproject.org/fedora/9"/>
-
-    <release-date>2008-11-25</release-date>
-    <eol-date>2009-12-18</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
-    </devices>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 10 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc (DVD|Disc)</volume-id>
-        <system-id>PPC|LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/i686/F10-i686-Live.iso</url>
-      <iso>
-        <volume-id>F10-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/x86_64/F10-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>F10-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>10</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>10</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/11";>
-    <short-id>fedora11</short-id>
-    <name>Fedora 11</name>
-    <version>11</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Leonidas</codename>
-    <upgrades id="http://fedoraproject.org/fedora/10"/>
-    <derives-from id="http://fedoraproject.org/fedora/10"/>
-
-    <release-date>2009-06-09</release-date>
-    <eol-date>2010-06-25</eol-date>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
-    </devices>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 11 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc (DVD|Disc)</volume-id>
-        <system-id>PPC|LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/i686/Fedora-11-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-11-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/x86_64/Fedora-11-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-11-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>11</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>11</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/12";>
-    <short-id>fedora12</short-id>
-    <name>Fedora 12</name>
-    <version>12</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Constantine</codename>
-    <upgrades id="http://fedoraproject.org/fedora/11"/>
-    <derives-from id="http://fedoraproject.org/fedora/11"/>
-
-    <release-date>2009-11-17</release-date>
-    <eol-date>2010-12-02</eol-date>
-
-    <media arch="i386">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 12 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 12 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc (DVD|Disc)</volume-id>
-        <system-id>PPC|LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/i686/Fedora-12-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-12-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/x86_64/Fedora-12-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-12-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>12</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>12</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/13";>
-    <short-id>fedora13</short-id>
-    <name>Fedora 13</name>
-    <version>13</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Goddard</codename>
-    <upgrades id="http://fedoraproject.org/fedora/12"/>
-    <derives-from id="http://fedoraproject.org/fedora/12"/>
-
-    <release-date>2010-05-25</release-date>
-    <eol-date>2011-06-04</eol-date>
-
-    <media arch="i386">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 13 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 13 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/i686/Fedora-13-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-13-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/x86_64/Fedora-13-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-13-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>13</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>13</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/14";>
-    <short-id>fedora14</short-id>
-    <name>Fedora 14</name>
-    <version>14</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Laughlin</codename>
-    <upgrades id="http://fedoraproject.org/fedora/13"/>
-    <derives-from id="http://fedoraproject.org/fedora/13"/>
-
-    <release-date>2010-11-02</release-date>
-    <eol-date>2011-12-08</eol-date>
-
-    <media arch="i386">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 14 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 14 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Live/i686/Fedora-14-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-14-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Live/x86_64/Fedora-14-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-14-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>14</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>14</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>402653184</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>536870912</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/15";>
-    <short-id>fedora15</short-id>
-    <name>Fedora 15</name>
-    <version>15</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Lovelock</codename>
-    <upgrades id="http://fedoraproject.org/fedora/14"/>
-    <derives-from id="http://fedoraproject.org/fedora/14"/>
-
-    <release-date>2011-05-24</release-date>
-
-    <media arch="i386">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/iso/Fedora-15-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 15 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/iso/Fedora-15-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 15 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Live/i686/Fedora-15-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-15-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Live/x86_64/Fedora-15-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-15-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>15</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>15</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>671088640</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/16";>
-    <short-id>fedora16</short-id>
-    <name>Fedora 16</name>
-    <version>16</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Verne</codename>
-    <upgrades id="http://fedoraproject.org/fedora/15"/>
-    <derives-from id="http://fedoraproject.org/fedora/15"/>
-
-    <release-date>2011-11-08</release-date>
-
-    <media arch="i386">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/iso/Fedora-16-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 16 i386 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/iso/Fedora-16-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 16 x86_64 (DVD|Disc)</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Live/i686/Fedora-16-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-16-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Live/x86_64/Fedora-16-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-16-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>16</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>16</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/17";>
-    <short-id>fedora17</short-id>
-    <name>Fedora 17</name>
-    <version>17</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Beefy Miracle</codename>
-    <upgrades id="http://fedoraproject.org/fedora/16"/>
-    <derives-from id="http://fedoraproject.org/fedora/16"/>
-
-    <media arch="i386">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/iso/Fedora-17-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 17.* i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/iso/Fedora-17-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 17.* x86_64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Live/i686/Fedora-17-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-17.*-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Live/x86_64/Fedora-17-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-17.*-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>17</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>17</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/18";>
-    <short-id>fedora18</short-id>
-    <name>Fedora 18</name>
-    <version>18</version>
-    <vendor>Fedora Project</vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>The Spherical Cow</codename>
-    <upgrades id="http://fedoraproject.org/fedora/17"/>
-    <derives-from id="http://fedoraproject.org/fedora/17"/>
-
-    <media arch="i386">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 18.* i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 18.* x86_64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-18.*-i686-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Live/x86_64/Fedora-18-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-18.*-x86_64-Live(-KDE)?</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>18</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>18</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
new file mode 100644
index 0000000..40023c4
--- /dev/null
+++ b/data/oses/fedora.xml.in
@@ -0,0 +1,1374 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://fedoraproject.org/fedora/1";>
+    <short-id>fedora1</short-id>
+    <name>Fedora Core 1</name>
+    <version>1</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Yarrow</codename>
+    <upgrades id="http://redhat.com/rhl/9"/>
+    <derives-from id="http://redhat.com/rhl/9"/>
+
+    <release-date>2003-11-05</release-date>
+    <eol-date>2004-09-20</eol-date>
+
+    <!-- XXX upgrades/derives RHL -->
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
+    </devices>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc1.iso</url>
+      <iso>
+        <application-id>FC/1 i386</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/iso/yarrow-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/1 x86_64</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/2";>
+    <short-id>fedora2</short-id>
+    <name>Fedora Core 2</name>
+    <version>2</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Tettnang</codename>
+    <upgrades id="http://fedoraproject.org/fedora/1"/>
+    <derives-from id="http://fedoraproject.org/fedora/1"/>
+
+    <release-date>2004-05-18</release-date>
+    <eol-date>2005-04-11</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc1.iso</url>
+      <iso>
+        <application-id>FC/2 i386</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/2 x86_64</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/3";>
+    <short-id>fedora3</short-id>
+    <name>Fedora Core 3</name>
+    <version>3</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Heidelberg</codename>
+    <upgrades id="http://fedoraproject.org/fedora/2"/>
+    <derives-from id="http://fedoraproject.org/fedora/2"/>
+
+    <release-date>2004-11-08</release-date>
+    <eol-date>2006-01-16</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc1.iso</url>
+      <iso>
+        <application-id>FC/3 i386</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/3 x86_64</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/4";>
+    <short-id>fedora4</short-id>
+    <name>Fedora Core 4</name>
+    <version>4</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Stentz</codename>
+    <upgrades id="http://fedoraproject.org/fedora/3"/>
+    <derives-from id="http://fedoraproject.org/fedora/3"/>
+
+    <release-date>2005-06-13</release-date>
+    <eol-date>2006-08-07</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc1.iso</url>
+      <iso>
+        <application-id>FC/4 i386</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/4 x86_64</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc1.iso</url>
+      <iso>
+        <application-id>FC/4 ppc</application-id>
+        <system-id>PPC|LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/5";>
+    <short-id>fedora5</short-id>
+    <name>Fedora Core 5</name>
+    <version>5</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Bordeaux</codename>
+    <upgrades id="http://fedoraproject.org/fedora/4"/>
+    <derives-from id="http://fedoraproject.org/fedora/4"/>
+
+    <release-date>2006-03-20</release-date>
+    <eol-date>2007-07-02</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc1.iso</url>
+      <iso>
+        <application-id>FC/5 i386</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/5 x86_64</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc1.iso</url>
+      <iso>
+        <application-id>FC/5 ppc</application-id>
+        <system-id>PPC|LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/6";>
+    <short-id>fedora6</short-id>
+    <name>Fedora Core 6</name>
+    <version>6</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Zod</codename>
+    <upgrades id="http://fedoraproject.org/fedora/5"/>
+    <derives-from id="http://fedoraproject.org/fedora/5"/>
+
+    <release-date>2006-10-24</release-date>
+    <eol-date>2007-12-07</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc1.iso</url>
+      <iso>
+        <application-id>FC(-|/)6 i386</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC(-|/)6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc1.iso</url>
+      <iso>
+        <application-id>FC(-|/)6 ppc</application-id>
+        <system-id>PPC|LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/7";>
+    <short-id>fedora7</short-id>
+    <name>Fedora 7</name>
+    <version>7</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Moonshine</codename>
+    <upgrades id="http://fedoraproject.org/fedora/6"/>
+    <derives-from id="http://fedoraproject.org/fedora/6"/>
+
+    <release-date>2007-05-31</release-date>
+    <eol-date>2008-06-13</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/iso/F-7-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 7 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/iso/F-7-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 7 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/ppc/iso/F-7-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 7 ppc (DVD|Disc)</volume-id>
+        <system-id>PPC</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-Live-i686.iso</url>
+      <iso>
+        <volume-id>Fedora-7-(KDE-)?Live-i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-Live-x86_64.iso</url>
+      <iso>
+        <volume-id>Fedora-7-(KDE-)?Live-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>7</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>7</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/8";>
+    <short-id>fedora8</short-id>
+    <name>Fedora 8</name>
+    <version>8</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Werewolf</codename>
+    <upgrades id="http://fedoraproject.org/fedora/7"/>
+    <derives-from id="http://fedoraproject.org/fedora/7"/>
+
+    <release-date>2007-11-08</release-date>
+    <eol-date>2009-01-07</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/iso/Fedora-8-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 8 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/iso/Fedora-8-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 8 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/ppc/iso/Fedora-8-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 8 ppc (DVD|Disc)</volume-id>
+        <system-id>PPC</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-i686.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-(KDE-)?i686</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-x86_64.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-(KDE-)?x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/ppc/Fedora-8-Live-ppc.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-(KDE-)?ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>8</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>8</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/9";>
+    <short-id>fedora9</short-id>
+    <name>Fedora 9</name>
+    <version>9</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Sulphur</codename>
+    <upgrades id="http://fedoraproject.org/fedora/8"/>
+    <derives-from id="http://fedoraproject.org/fedora/8"/>
+
+    <release-date>2008-05-13</release-date>
+    <eol-date>2009-07-10</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+      <!-- Apparently F9 has selinux errors when installing with virtio:
+           https://bugzilla.redhat.com/show_bug.cgi?id=470386
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      -->
+    </devices>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 9 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc (DVD|Disc)</volume-id>
+        <system-id>PPC|LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-9-Live-(KDE-)?i686</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/x86_64/Fedora-9-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-9-Live-(KDE-)?x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>9</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>9</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/10";>
+    <short-id>fedora10</short-id>
+    <name>Fedora 10</name>
+    <version>10</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Cambridge</codename>
+    <upgrades id="http://fedoraproject.org/fedora/9"/>
+    <derives-from id="http://fedoraproject.org/fedora/9"/>
+
+    <release-date>2008-11-25</release-date>
+    <eol-date>2009-12-18</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 10 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc (DVD|Disc)</volume-id>
+        <system-id>PPC|LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/i686/F10-i686-Live.iso</url>
+      <iso>
+        <volume-id>F10-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/x86_64/F10-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>F10-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>10</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>10</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/11";>
+    <short-id>fedora11</short-id>
+    <name>Fedora 11</name>
+    <version>11</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Leonidas</codename>
+    <upgrades id="http://fedoraproject.org/fedora/10"/>
+    <derives-from id="http://fedoraproject.org/fedora/10"/>
+
+    <release-date>2009-06-09</release-date>
+    <eol-date>2010-06-25</eol-date>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+    </devices>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 11 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc (DVD|Disc)</volume-id>
+        <system-id>PPC|LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/i686/Fedora-11-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-11-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/x86_64/Fedora-11-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-11-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>11</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>11</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/12";>
+    <short-id>fedora12</short-id>
+    <name>Fedora 12</name>
+    <version>12</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Constantine</codename>
+    <upgrades id="http://fedoraproject.org/fedora/11"/>
+    <derives-from id="http://fedoraproject.org/fedora/11"/>
+
+    <release-date>2009-11-17</release-date>
+    <eol-date>2010-12-02</eol-date>
+
+    <media arch="i386">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 12 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 12 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc (DVD|Disc)</volume-id>
+        <system-id>PPC|LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/i686/Fedora-12-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-12-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/x86_64/Fedora-12-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-12-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>12</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>12</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/13";>
+    <short-id>fedora13</short-id>
+    <name>Fedora 13</name>
+    <version>13</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Goddard</codename>
+    <upgrades id="http://fedoraproject.org/fedora/12"/>
+    <derives-from id="http://fedoraproject.org/fedora/12"/>
+
+    <release-date>2010-05-25</release-date>
+    <eol-date>2011-06-04</eol-date>
+
+    <media arch="i386">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 13 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 13 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/i686/Fedora-13-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-13-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/x86_64/Fedora-13-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-13-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>13</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>13</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/14";>
+    <short-id>fedora14</short-id>
+    <name>Fedora 14</name>
+    <version>14</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Laughlin</codename>
+    <upgrades id="http://fedoraproject.org/fedora/13"/>
+    <derives-from id="http://fedoraproject.org/fedora/13"/>
+
+    <release-date>2010-11-02</release-date>
+    <eol-date>2011-12-08</eol-date>
+
+    <media arch="i386">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 14 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 14 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Live/i686/Fedora-14-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-14-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Live/x86_64/Fedora-14-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-14-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>14</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>14</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>402653184</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>536870912</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/15";>
+    <short-id>fedora15</short-id>
+    <name>Fedora 15</name>
+    <version>15</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Lovelock</codename>
+    <upgrades id="http://fedoraproject.org/fedora/14"/>
+    <derives-from id="http://fedoraproject.org/fedora/14"/>
+
+    <release-date>2011-05-24</release-date>
+
+    <media arch="i386">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/iso/Fedora-15-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 15 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/iso/Fedora-15-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 15 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Live/i686/Fedora-15-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-15-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Live/x86_64/Fedora-15-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-15-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>15</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>15</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>671088640</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/16";>
+    <short-id>fedora16</short-id>
+    <name>Fedora 16</name>
+    <version>16</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Verne</codename>
+    <upgrades id="http://fedoraproject.org/fedora/15"/>
+    <derives-from id="http://fedoraproject.org/fedora/15"/>
+
+    <release-date>2011-11-08</release-date>
+
+    <media arch="i386">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/iso/Fedora-16-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 16 i386 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/iso/Fedora-16-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 16 x86_64 (DVD|Disc)</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Live/i686/Fedora-16-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-16-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Live/x86_64/Fedora-16-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-16-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>16</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>16</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/17";>
+    <short-id>fedora17</short-id>
+    <name>Fedora 17</name>
+    <version>17</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Beefy Miracle</codename>
+    <upgrades id="http://fedoraproject.org/fedora/16"/>
+    <derives-from id="http://fedoraproject.org/fedora/16"/>
+
+    <media arch="i386">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/iso/Fedora-17-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 17.* i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/iso/Fedora-17-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 17.* x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Live/i686/Fedora-17-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-17.*-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Live/x86_64/Fedora-17-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-17.*-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>17</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>17</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://fedoraproject.org/fedora/18";>
+    <short-id>fedora18</short-id>
+    <name>Fedora 18</name>
+    <version>18</version>
+    <vendor>Fedora Project</vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>The Spherical Cow</codename>
+    <upgrades id="http://fedoraproject.org/fedora/17"/>
+    <derives-from id="http://fedoraproject.org/fedora/17"/>
+
+    <media arch="i386">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 18.* i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 18.* x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-18.*-i686-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Live/x86_64/Fedora-18-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-18.*-x86_64-Live(-KDE)?</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>18</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>18</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/freebsd.xml b/data/oses/freebsd.xml
deleted file mode 100644
index 3711127..0000000
--- a/data/oses/freebsd.xml
+++ /dev/null
@@ -1,521 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://freebsd.org/freebsd/1.0";>
-    <short-id>freebsd1.0</short-id>
-    <name>FreeBSD 1.0</name>
-    <version>1.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>1993-11-00</release-date>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.0";>
-    <short-id>freebsd2.0</short-id>
-    <name>FreeBSD 2.0</name>
-    <version>2.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>1994-11-22</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/1.0"/>
-    <derives-from id="http://freebsd.org/freebsd/1.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.0.5";>
-    <short-id>freebsd2.0.5</short-id>
-    <name>FreeBSD 2.0.5</name>
-    <version>2.0.5</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/2.0"/>
-    <derives-from id="http://freebsd.org/freebsd/2.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.2.8";>
-    <short-id>freebsd2.2.8</short-id>
-    <name>FreeBSD 2.2.8</name>
-    <version>2.2.8</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/2.0.5"/>
-    <derives-from id="http://freebsd.org/freebsd/2.0.5"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.2.9";>
-    <short-id>freebsd2.2.9</short-id>
-    <name>FreeBSD 2.2.9</name>
-    <version>2.2.9</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
-    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/3.0";>
-    <short-id>freebsd3.0</short-id>
-    <name>FreeBSD 3.0</name>
-    <version>3.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>1998-10-16</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
-    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/3.2";>
-    <short-id>freebsd3.2</short-id>
-    <name>FreeBSD 3.2</name>
-    <version>3.2</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/3.0"/>
-    <derives-from id="http://freebsd.org/freebsd/3.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.0";>
-    <short-id>freebsd4.0</short-id>
-    <name>FreeBSD 4.0</name>
-    <version>4.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2000-03-00</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/3.2"/>
-    <derives-from id="http://freebsd.org/freebsd/3.2"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.1";>
-    <short-id>freebsd4.1</short-id>
-    <name>FreeBSD 4.1</name>
-    <version>4.1</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.0"/>
-    <derives-from id="http://freebsd.org/freebsd/4.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.2";>
-    <short-id>freebsd4.2</short-id>
-    <name>FreeBSD 4.2</name>
-    <version>4.2</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.1"/>
-    <derives-from id="http://freebsd.org/freebsd/4.1"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.3";>
-    <short-id>freebsd4.3</short-id>
-    <name>FreeBSD 4.3</name>
-    <version>4.3</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.2"/>
-    <derives-from id="http://freebsd.org/freebsd/4.2"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.4";>
-    <short-id>freebsd4.4</short-id>
-    <name>FreeBSD 4.4</name>
-    <version>4.4</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.3"/>
-    <derives-from id="http://freebsd.org/freebsd/4.3"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.5";>
-    <short-id>freebsd4.5</short-id>
-    <name>FreeBSD 4.5</name>
-    <version>4.5</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.4"/>
-    <derives-from id="http://freebsd.org/freebsd/4.4"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.6";>
-    <short-id>freebsd4.6</short-id>
-    <name>FreeBSD 4.6</name>
-    <version>4.6</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.5"/>
-    <derives-from id="http://freebsd.org/freebsd/4.5"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.7";>
-    <short-id>freebsd4.7</short-id>
-    <name>FreeBSD 4.7</name>
-    <version>4.7</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.6"/>
-    <derives-from id="http://freebsd.org/freebsd/4.6"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.8";>
-    <short-id>freebsd4.8</short-id>
-    <name>FreeBSD 4.8</name>
-    <version>4.8</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.7"/>
-    <derives-from id="http://freebsd.org/freebsd/4.7"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.9";>
-    <short-id>freebsd4.9</short-id>
-    <name>FreeBSD 4.9</name>
-    <version>4.9</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.8"/>
-    <derives-from id="http://freebsd.org/freebsd/4.8"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.10";>
-    <short-id>freebsd4.10</short-id>
-    <name>FreeBSD 4.10</name>
-    <version>4.10</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.9"/>
-    <derives-from id="http://freebsd.org/freebsd/4.9"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.11";>
-    <short-id>freebsd4.11</short-id>
-    <name>FreeBSD 4.11</name>
-    <version>4.11</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2000-06-24</release-date>
-    <eol-date>2007-01-31</eol-date>
-
-    <upgrades id="http://freebsd.org/freebsd/4.10"/>
-    <derives-from id="http://freebsd.org/freebsd/4.10"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.0";>
-    <short-id>freebsd5.0</short-id>
-    <name>FreeBSD 5.0</name>
-    <version>5.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2003-01-00</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/4.11"/>
-    <derives-from id="http://freebsd.org/freebsd/4.11"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.1";>
-    <short-id>freebsd5.1</short-id>
-    <name>FreeBSD 5.1</name>
-    <version>5.1</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.0"/>
-    <derives-from id="http://freebsd.org/freebsd/5.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.2";>
-    <short-id>freebsd5.2</short-id>
-    <name>FreeBSD 5.2</name>
-    <version>5.2</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.1"/>
-    <derives-from id="http://freebsd.org/freebsd/5.1"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.2.1";>
-    <short-id>freebsd5.2.1</short-id>
-    <name>FreeBSD 5.2.1</name>
-    <version>5.2.1</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.2"/>
-    <derives-from id="http://freebsd.org/freebsd/5.2"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.3";>
-    <short-id>freebsd5.3</short-id>
-    <name>FreeBSD 5.3</name>
-    <version>5.3</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.2.1"/>
-    <derives-from id="http://freebsd.org/freebsd/5.2.1"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.4";>
-    <short-id>freebsd5.4</short-id>
-    <name>FreeBSD 5.4</name>
-    <version>5.4</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.3"/>
-    <derives-from id="http://freebsd.org/freebsd/5.3"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.5";>
-    <short-id>freebsd5.5</short-id>
-    <name>FreeBSD 5.5</name>
-    <version>5.5</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2006-05-00</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/5.4"/>
-    <derives-from id="http://freebsd.org/freebsd/5.4"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.0";>
-    <short-id>freebsd6.0</short-id>
-    <name>FreeBSD 6.0</name>
-    <version>6.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/5.5"/>
-    <derives-from id="http://freebsd.org/freebsd/5.5"/>
-
-    <release-date>2005-11-04</release-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/>
-    </devices>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.1";>
-    <short-id>freebsd6.1</short-id>
-    <name>FreeBSD 6.1</name>
-    <version>6.1</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.0"/>
-    <derives-from id="http://freebsd.org/freebsd/6.0"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.2";>
-    <short-id>freebsd6.2</short-id>
-    <name>FreeBSD 6.2</name>
-    <version>6.2</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.1"/>
-    <derives-from id="http://freebsd.org/freebsd/6.1"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.3";>
-    <short-id>freebsd6.3</short-id>
-    <name>FreeBSD 6.3</name>
-    <version>6.3</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.2"/>
-    <derives-from id="http://freebsd.org/freebsd/6.2"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.4";>
-    <short-id>freebsd6.4</short-id>
-    <name>FreeBSD 6.4</name>
-    <version>6.4</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.3"/>
-    <derives-from id="http://freebsd.org/freebsd/6.3"/>
-
-    <release-date>2008-11-11</release-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.0";>
-    <short-id>freebsd7.0</short-id>
-    <name>FreeBSD 7.0</name>
-    <version>7.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.4"/>
-    <derives-from id="http://freebsd.org/freebsd/6.4"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.1";>
-    <short-id>freebsd7.1</short-id>
-    <name>FreeBSD 7.1</name>
-    <version>7.1</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.0"/>
-    <derives-from id="http://freebsd.org/freebsd/7.0"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.2";>
-    <short-id>freebsd7.2</short-id>
-    <name>FreeBSD 7.2</name>
-    <version>7.2</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.1"/>
-    <derives-from id="http://freebsd.org/freebsd/7.1"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.3";>
-    <short-id>freebsd7.3</short-id>
-    <name>FreeBSD 7.3</name>
-    <version>7.3</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.2"/>
-    <derives-from id="http://freebsd.org/freebsd/7.2"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.4";>
-    <short-id>freebsd7.4</short-id>
-    <name>FreeBSD 7.4</name>
-    <version>7.4</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.3"/>
-    <derives-from id="http://freebsd.org/freebsd/7.3"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.0";>
-    <short-id>freebsd8.0</short-id>
-    <name>FreeBSD 8.0</name>
-    <version>8.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.4"/>
-    <derives-from id="http://freebsd.org/freebsd/7.4"/>
-
-    <release-date>2009-11-25</release-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/>
-    </devices>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.1";>
-    <short-id>freebsd8.1</short-id>
-    <name>FreeBSD 8.1</name>
-    <version>8.1</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.0"/>
-    <derives-from id="http://freebsd.org/freebsd/8.0"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.2";>
-    <short-id>freebsd8.2</short-id>
-    <name>FreeBSD 8.2</name>
-    <version>8.2</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.1"/>
-    <derives-from id="http://freebsd.org/freebsd/8.1"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/9.0";>
-    <short-id>freebsd9.0</short-id>
-    <name>FreeBSD 9.0</name>
-    <version>9.0</version>
-    <vendor>FreeBSD Project</vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.2"/>
-    <derives-from id="http://freebsd.org/freebsd/8.2"/>
-
-    <release-date>2012-01-12</release-date>
-  </os>
-
-
-</libosinfo>
diff --git a/data/oses/freebsd.xml.in b/data/oses/freebsd.xml.in
new file mode 100644
index 0000000..3711127
--- /dev/null
+++ b/data/oses/freebsd.xml.in
@@ -0,0 +1,521 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://freebsd.org/freebsd/1.0";>
+    <short-id>freebsd1.0</short-id>
+    <name>FreeBSD 1.0</name>
+    <version>1.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>1993-11-00</release-date>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/2.0";>
+    <short-id>freebsd2.0</short-id>
+    <name>FreeBSD 2.0</name>
+    <version>2.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>1994-11-22</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/1.0"/>
+    <derives-from id="http://freebsd.org/freebsd/1.0"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/2.0.5";>
+    <short-id>freebsd2.0.5</short-id>
+    <name>FreeBSD 2.0.5</name>
+    <version>2.0.5</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/2.0"/>
+    <derives-from id="http://freebsd.org/freebsd/2.0"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/2.2.8";>
+    <short-id>freebsd2.2.8</short-id>
+    <name>FreeBSD 2.2.8</name>
+    <version>2.2.8</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/2.0.5"/>
+    <derives-from id="http://freebsd.org/freebsd/2.0.5"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/2.2.9";>
+    <short-id>freebsd2.2.9</short-id>
+    <name>FreeBSD 2.2.9</name>
+    <version>2.2.9</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
+    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/3.0";>
+    <short-id>freebsd3.0</short-id>
+    <name>FreeBSD 3.0</name>
+    <version>3.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>1998-10-16</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
+    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/3.2";>
+    <short-id>freebsd3.2</short-id>
+    <name>FreeBSD 3.2</name>
+    <version>3.2</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/3.0"/>
+    <derives-from id="http://freebsd.org/freebsd/3.0"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.0";>
+    <short-id>freebsd4.0</short-id>
+    <name>FreeBSD 4.0</name>
+    <version>4.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2000-03-00</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/3.2"/>
+    <derives-from id="http://freebsd.org/freebsd/3.2"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.1";>
+    <short-id>freebsd4.1</short-id>
+    <name>FreeBSD 4.1</name>
+    <version>4.1</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.0"/>
+    <derives-from id="http://freebsd.org/freebsd/4.0"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.2";>
+    <short-id>freebsd4.2</short-id>
+    <name>FreeBSD 4.2</name>
+    <version>4.2</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.1"/>
+    <derives-from id="http://freebsd.org/freebsd/4.1"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.3";>
+    <short-id>freebsd4.3</short-id>
+    <name>FreeBSD 4.3</name>
+    <version>4.3</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.2"/>
+    <derives-from id="http://freebsd.org/freebsd/4.2"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.4";>
+    <short-id>freebsd4.4</short-id>
+    <name>FreeBSD 4.4</name>
+    <version>4.4</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.3"/>
+    <derives-from id="http://freebsd.org/freebsd/4.3"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.5";>
+    <short-id>freebsd4.5</short-id>
+    <name>FreeBSD 4.5</name>
+    <version>4.5</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.4"/>
+    <derives-from id="http://freebsd.org/freebsd/4.4"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.6";>
+    <short-id>freebsd4.6</short-id>
+    <name>FreeBSD 4.6</name>
+    <version>4.6</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.5"/>
+    <derives-from id="http://freebsd.org/freebsd/4.5"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.7";>
+    <short-id>freebsd4.7</short-id>
+    <name>FreeBSD 4.7</name>
+    <version>4.7</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.6"/>
+    <derives-from id="http://freebsd.org/freebsd/4.6"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.8";>
+    <short-id>freebsd4.8</short-id>
+    <name>FreeBSD 4.8</name>
+    <version>4.8</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.7"/>
+    <derives-from id="http://freebsd.org/freebsd/4.7"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.9";>
+    <short-id>freebsd4.9</short-id>
+    <name>FreeBSD 4.9</name>
+    <version>4.9</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.8"/>
+    <derives-from id="http://freebsd.org/freebsd/4.8"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.10";>
+    <short-id>freebsd4.10</short-id>
+    <name>FreeBSD 4.10</name>
+    <version>4.10</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.9"/>
+    <derives-from id="http://freebsd.org/freebsd/4.9"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/4.11";>
+    <short-id>freebsd4.11</short-id>
+    <name>FreeBSD 4.11</name>
+    <version>4.11</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2000-06-24</release-date>
+    <eol-date>2007-01-31</eol-date>
+
+    <upgrades id="http://freebsd.org/freebsd/4.10"/>
+    <derives-from id="http://freebsd.org/freebsd/4.10"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/5.0";>
+    <short-id>freebsd5.0</short-id>
+    <name>FreeBSD 5.0</name>
+    <version>5.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2003-01-00</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/4.11"/>
+    <derives-from id="http://freebsd.org/freebsd/4.11"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/5.1";>
+    <short-id>freebsd5.1</short-id>
+    <name>FreeBSD 5.1</name>
+    <version>5.1</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.0"/>
+    <derives-from id="http://freebsd.org/freebsd/5.0"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/5.2";>
+    <short-id>freebsd5.2</short-id>
+    <name>FreeBSD 5.2</name>
+    <version>5.2</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.1"/>
+    <derives-from id="http://freebsd.org/freebsd/5.1"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/5.2.1";>
+    <short-id>freebsd5.2.1</short-id>
+    <name>FreeBSD 5.2.1</name>
+    <version>5.2.1</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.2"/>
+    <derives-from id="http://freebsd.org/freebsd/5.2"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/5.3";>
+    <short-id>freebsd5.3</short-id>
+    <name>FreeBSD 5.3</name>
+    <version>5.3</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.2.1"/>
+    <derives-from id="http://freebsd.org/freebsd/5.2.1"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/5.4";>
+    <short-id>freebsd5.4</short-id>
+    <name>FreeBSD 5.4</name>
+    <version>5.4</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.3"/>
+    <derives-from id="http://freebsd.org/freebsd/5.3"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/5.5";>
+    <short-id>freebsd5.5</short-id>
+    <name>FreeBSD 5.5</name>
+    <version>5.5</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2006-05-00</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/5.4"/>
+    <derives-from id="http://freebsd.org/freebsd/5.4"/>
+
+  </os>
+
+  <os id="http://freebsd.org/freebsd/6.0";>
+    <short-id>freebsd6.0</short-id>
+    <name>FreeBSD 6.0</name>
+    <version>6.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/5.5"/>
+    <derives-from id="http://freebsd.org/freebsd/5.5"/>
+
+    <release-date>2005-11-04</release-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/>
+    </devices>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/6.1";>
+    <short-id>freebsd6.1</short-id>
+    <name>FreeBSD 6.1</name>
+    <version>6.1</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.0"/>
+    <derives-from id="http://freebsd.org/freebsd/6.0"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/6.2";>
+    <short-id>freebsd6.2</short-id>
+    <name>FreeBSD 6.2</name>
+    <version>6.2</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.1"/>
+    <derives-from id="http://freebsd.org/freebsd/6.1"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/6.3";>
+    <short-id>freebsd6.3</short-id>
+    <name>FreeBSD 6.3</name>
+    <version>6.3</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.2"/>
+    <derives-from id="http://freebsd.org/freebsd/6.2"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/6.4";>
+    <short-id>freebsd6.4</short-id>
+    <name>FreeBSD 6.4</name>
+    <version>6.4</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.3"/>
+    <derives-from id="http://freebsd.org/freebsd/6.3"/>
+
+    <release-date>2008-11-11</release-date>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/7.0";>
+    <short-id>freebsd7.0</short-id>
+    <name>FreeBSD 7.0</name>
+    <version>7.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.4"/>
+    <derives-from id="http://freebsd.org/freebsd/6.4"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/7.1";>
+    <short-id>freebsd7.1</short-id>
+    <name>FreeBSD 7.1</name>
+    <version>7.1</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.0"/>
+    <derives-from id="http://freebsd.org/freebsd/7.0"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/7.2";>
+    <short-id>freebsd7.2</short-id>
+    <name>FreeBSD 7.2</name>
+    <version>7.2</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.1"/>
+    <derives-from id="http://freebsd.org/freebsd/7.1"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/7.3";>
+    <short-id>freebsd7.3</short-id>
+    <name>FreeBSD 7.3</name>
+    <version>7.3</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.2"/>
+    <derives-from id="http://freebsd.org/freebsd/7.2"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/7.4";>
+    <short-id>freebsd7.4</short-id>
+    <name>FreeBSD 7.4</name>
+    <version>7.4</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.3"/>
+    <derives-from id="http://freebsd.org/freebsd/7.3"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/8.0";>
+    <short-id>freebsd8.0</short-id>
+    <name>FreeBSD 8.0</name>
+    <version>8.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.4"/>
+    <derives-from id="http://freebsd.org/freebsd/7.4"/>
+
+    <release-date>2009-11-25</release-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/>
+    </devices>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/8.1";>
+    <short-id>freebsd8.1</short-id>
+    <name>FreeBSD 8.1</name>
+    <version>8.1</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.0"/>
+    <derives-from id="http://freebsd.org/freebsd/8.0"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/8.2";>
+    <short-id>freebsd8.2</short-id>
+    <name>FreeBSD 8.2</name>
+    <version>8.2</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.1"/>
+    <derives-from id="http://freebsd.org/freebsd/8.1"/>
+  </os>
+
+  <os id="http://freebsd.org/freebsd/9.0";>
+    <short-id>freebsd9.0</short-id>
+    <name>FreeBSD 9.0</name>
+    <version>9.0</version>
+    <vendor>FreeBSD Project</vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.2"/>
+    <derives-from id="http://freebsd.org/freebsd/8.2"/>
+
+    <release-date>2012-01-12</release-date>
+  </os>
+
+
+</libosinfo>
diff --git a/data/oses/gnome.xml b/data/oses/gnome.xml
deleted file mode 100644
index ac161f9..0000000
--- a/data/oses/gnome.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://gnome.org/3.6";>
-    <short-id>gnome3.6</short-id>
-    <name>GNOME 3.6</name>
-    <version>3.6</version>
-    <vendor>GNOME Project</vendor>
-    <family>linux</family>
-    <distro>gnome</distro>
-    <derives-from id="http://fedoraproject.org/fedora/18"/>
-
-    <media arch="i686" live="true">
-      <url>http://ftp.gnome.org/pub/gnome/misc/promo-usb/GNOME-3.6.0.iso</url>
-      <iso>
-        <volume-id>GNOME36-LiveCD</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <!-- These values are copied from that of Fedora 17/18 as AFAIK currently
-           GNOME is just Fedora with a few differences, mainly the name. -->
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-    </resources>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/gnome.xml.in b/data/oses/gnome.xml.in
new file mode 100644
index 0000000..ac161f9
--- /dev/null
+++ b/data/oses/gnome.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://gnome.org/3.6";>
+    <short-id>gnome3.6</short-id>
+    <name>GNOME 3.6</name>
+    <version>3.6</version>
+    <vendor>GNOME Project</vendor>
+    <family>linux</family>
+    <distro>gnome</distro>
+    <derives-from id="http://fedoraproject.org/fedora/18"/>
+
+    <media arch="i686" live="true">
+      <url>http://ftp.gnome.org/pub/gnome/misc/promo-usb/GNOME-3.6.0.iso</url>
+      <iso>
+        <volume-id>GNOME36-LiveCD</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <!-- These values are copied from that of Fedora 17/18 as AFAIK currently
+           GNOME is just Fedora with a few differences, mainly the name. -->
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+    </resources>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/macos.xml b/data/oses/macos.xml
deleted file mode 100644
index 012348d..0000000
--- a/data/oses/macos.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://apple.com/macosx/10.0";>
-    <short-id>macosx10.0</short-id>
-    <name>MacOS X Cheetah</name>
-    <version>10.0</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-  </os>
-
-  <os id="http://apple.com/macosx/10.1";>
-    <short-id>macosx10.1</short-id>
-    <name>MacOS X Puma</name>
-    <version>10.1</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.0"; />
-  </os>
-
-  <os id="http://apple.com/macosx/10.2";>
-    <short-id>macosx10.2</short-id>
-    <name>MacOS X Jaghuar</name>
-    <version>10.2</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.1"; />
-  </os>
-
-  <os id="http://apple.com/macosx/10.3";>
-    <short-id>macosx10.3</short-id>
-    <name>MacOS X Panther</name>
-    <version>10.3</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.2"; />
-  </os>
-
-  <os id="http://apple.com/macosx/10.4";>
-    <short-id>macosx10.4</short-id>
-    <name>MacOS X Tiger</name>
-    <version>10.4</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.3"; />
-  </os>
-
-  <os id="http://apple.com/macosx/10.5";>
-    <short-id>macosx10.5</short-id>
-    <name>MacOS X Leopard</name>
-    <version>10.5</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.4"; />
-  </os>
-
-  <os id="http://apple.com/macosx/10.6";>
-    <short-id>macosx10.6</short-id>
-    <name>MacOS X Snow Leopard</name>
-    <version>10.6</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.5"; />
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>2</n-cpus>
-        <cpu>1600000000</cpu>
-        <ram>2147483648</ram>
-        <storage>7516192768</storage>
-      </minimum>
-    </resources>
-
-  </os>
-
-  <os id="http://apple.com/macosx/10.7";>
-    <short-id>macosx10.7</short-id>
-    <name>MacOS X Lion</name>
-    <version>10.7</version>
-    <vendor>Apple Inc.</vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.6"; />
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>2</n-cpus>
-        <cpu>1600000000</cpu>
-        <ram>2147483648</ram>
-        <storage>7516192768</storage>
-      </minimum>
-    </resources>
-
-  </os>
-
-</libosinfo>
diff --git a/data/oses/macos.xml.in b/data/oses/macos.xml.in
new file mode 100644
index 0000000..012348d
--- /dev/null
+++ b/data/oses/macos.xml.in
@@ -0,0 +1,102 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://apple.com/macosx/10.0";>
+    <short-id>macosx10.0</short-id>
+    <name>MacOS X Cheetah</name>
+    <version>10.0</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+  </os>
+
+  <os id="http://apple.com/macosx/10.1";>
+    <short-id>macosx10.1</short-id>
+    <name>MacOS X Puma</name>
+    <version>10.1</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.0"; />
+  </os>
+
+  <os id="http://apple.com/macosx/10.2";>
+    <short-id>macosx10.2</short-id>
+    <name>MacOS X Jaghuar</name>
+    <version>10.2</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.1"; />
+  </os>
+
+  <os id="http://apple.com/macosx/10.3";>
+    <short-id>macosx10.3</short-id>
+    <name>MacOS X Panther</name>
+    <version>10.3</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.2"; />
+  </os>
+
+  <os id="http://apple.com/macosx/10.4";>
+    <short-id>macosx10.4</short-id>
+    <name>MacOS X Tiger</name>
+    <version>10.4</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.3"; />
+  </os>
+
+  <os id="http://apple.com/macosx/10.5";>
+    <short-id>macosx10.5</short-id>
+    <name>MacOS X Leopard</name>
+    <version>10.5</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.4"; />
+  </os>
+
+  <os id="http://apple.com/macosx/10.6";>
+    <short-id>macosx10.6</short-id>
+    <name>MacOS X Snow Leopard</name>
+    <version>10.6</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.5"; />
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>2</n-cpus>
+        <cpu>1600000000</cpu>
+        <ram>2147483648</ram>
+        <storage>7516192768</storage>
+      </minimum>
+    </resources>
+
+  </os>
+
+  <os id="http://apple.com/macosx/10.7";>
+    <short-id>macosx10.7</short-id>
+    <name>MacOS X Lion</name>
+    <version>10.7</version>
+    <vendor>Apple Inc.</vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.6"; />
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>2</n-cpus>
+        <cpu>1600000000</cpu>
+        <ram>2147483648</ram>
+        <storage>7516192768</storage>
+      </minimum>
+    </resources>
+
+  </os>
+
+</libosinfo>
diff --git a/data/oses/mandrake.xml b/data/oses/mandrake.xml
deleted file mode 100644
index 294e265..0000000
--- a/data/oses/mandrake.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://mandriva.com/mandrake/5.1";>
-    <short-id>mandrake5.1</short-id>
-    <name>Mandrake Linux 5.1</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Venice</codename>
-    <version>5.1</version>
-  </os>
-
-  <os id="http://mandriva.com/mandrake/5.2";>
-    <short-id>mandrake5.2</short-id>
-    <name>Mandrake Linux 5.2</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Leeloo</codename>
-    <version>5.2</version>
-    <upgrades id="http://mandriva.com/mandrake/5.1"/>
-    <derives-from id="http://mandriva.com/mandrake/5.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/5.3";>
-    <short-id>mandrake5.3</short-id>
-    <name>Mandrake Linux 5.3</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Festen</codename>
-    <version>5.3</version>
-    <upgrades id="http://mandriva.com/mandrake/5.2"/>
-    <derives-from id="http://mandriva.com/mandrake/5.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/6.0";>
-    <short-id>mandrake6.0</short-id>
-    <name>Mandrake Linux 6.0</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Venus</codename>
-    <version>6.0</version>
-    <upgrades id="http://mandriva.com/mandrake/5.2"/>
-    <derives-from id="http://mandriva.com/mandrake/5.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/6.1";>
-    <short-id>mandrake6.1</short-id>
-    <name>Mandrake Linux 6.1</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Helios</codename>
-    <version>6.1</version>
-    <upgrades id="http://mandriva.com/mandrake/6.0"/>
-    <derives-from id="http://mandriva.com/mandrake/6.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/7.0";>
-    <short-id>mandrake7.0</short-id>
-    <name>Mandrake Linux 7.0</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Air</codename>
-    <version>7.0</version>
-    <upgrades id="http://mandriva.com/mandrake/6.1"/>
-    <derives-from id="http://mandriva.com/mandrake/6.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/7.1";>
-    <short-id>mandrake7.1</short-id>
-    <name>Mandrake Linux 7.1</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Helium</codename>
-    <version>7.1</version>
-    <upgrades id="http://mandriva.com/mandrake/7.0"/>
-    <derives-from id="http://mandriva.com/mandrake/7.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/7.2";>
-    <short-id>mandrake7.2</short-id>
-    <name>Mandrake Linux 7.2</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Odyssey</codename>
-    <version>7.2</version>
-    <upgrades id="http://mandriva.com/mandrake/7.1"/>
-    <derives-from id="http://mandriva.com/mandrake/7.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/8.0";>
-    <short-id>mandrake8.0</short-id>
-    <name>Mandrake Linux 8.0</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Traktopel</codename>
-    <version>8.0</version>
-    <upgrades id="http://mandriva.com/mandrake/7.2"/>
-    <derives-from id="http://mandriva.com/mandrake/7.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/8.1";>
-    <short-id>mandrake8.1</short-id>
-    <name>Mandrake Linux 8.1</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Vitamin</codename>
-    <version>8.1</version>
-    <upgrades id="http://mandriva.com/mandrake/8.0"/>
-    <derives-from id="http://mandriva.com/mandrake/8.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/8.2";>
-    <short-id>mandrake8.2</short-id>
-    <name>Mandrake Linux 8.2</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Bluebird</codename>
-    <version>8.2</version>
-    <upgrades id="http://mandriva.com/mandrake/8.1"/>
-    <derives-from id="http://mandriva.com/mandrake/8.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/9.0";>
-    <short-id>mandrake9.0</short-id>
-    <name>Mandrake Linux 9.0</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Dolphin</codename>
-    <version>9.0</version>
-    <upgrades id="http://mandriva.com/mandrake/8.2"/>
-    <derives-from id="http://mandriva.com/mandrake/8.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/9.1";>
-    <short-id>mandrake9.1</short-id>
-    <name>Mandrake Linux 9.1</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Bamboo</codename>
-    <version>9.1</version>
-    <upgrades id="http://mandriva.com/mandrake/9.0"/>
-    <derives-from id="http://mandriva.com/mandrake/9.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/9.2";>
-    <short-id>mandrake9.2</short-id>
-    <name>Mandrake Linux 9.2</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>FiveStar</codename>
-    <version>9.2</version>
-    <upgrades id="http://mandriva.com/mandrake/9.1"/>
-    <derives-from id="http://mandriva.com/mandrake/9.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/10.0";>
-    <short-id>mandrake10.0</short-id>
-    <name>Mandrake Linux 10.0</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <version>10.0</version>
-    <upgrades id="http://mandriva.com/mandrake/9.2"/>
-    <derives-from id="http://mandriva.com/mandrake/9.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/10.1";>
-    <short-id>mandrake10.1</short-id>
-    <name>Mandrake Linux 10.1</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <version>10.1</version>
-    <upgrades id="http://mandriva.com/mandrake/10.0"/>
-    <derives-from id="http://mandriva.com/mandrake/10.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/10.2";>
-    <short-id>mandrake10.2</short-id>
-    <name>Mandrake Linux 10.2</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Leeloo</codename>
-    <version>10.2</version>
-    <upgrades id="http://mandriva.com/mandrake/10.1"/>
-    <derives-from id="http://mandriva.com/mandrake/10.1"/>
-
-  </os>
-
-</libosinfo>
diff --git a/data/oses/mandrake.xml.in b/data/oses/mandrake.xml.in
new file mode 100644
index 0000000..294e265
--- /dev/null
+++ b/data/oses/mandrake.xml.in
@@ -0,0 +1,219 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://mandriva.com/mandrake/5.1";>
+    <short-id>mandrake5.1</short-id>
+    <name>Mandrake Linux 5.1</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Venice</codename>
+    <version>5.1</version>
+  </os>
+
+  <os id="http://mandriva.com/mandrake/5.2";>
+    <short-id>mandrake5.2</short-id>
+    <name>Mandrake Linux 5.2</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Leeloo</codename>
+    <version>5.2</version>
+    <upgrades id="http://mandriva.com/mandrake/5.1"/>
+    <derives-from id="http://mandriva.com/mandrake/5.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/5.3";>
+    <short-id>mandrake5.3</short-id>
+    <name>Mandrake Linux 5.3</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Festen</codename>
+    <version>5.3</version>
+    <upgrades id="http://mandriva.com/mandrake/5.2"/>
+    <derives-from id="http://mandriva.com/mandrake/5.2"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/6.0";>
+    <short-id>mandrake6.0</short-id>
+    <name>Mandrake Linux 6.0</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Venus</codename>
+    <version>6.0</version>
+    <upgrades id="http://mandriva.com/mandrake/5.2"/>
+    <derives-from id="http://mandriva.com/mandrake/5.2"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/6.1";>
+    <short-id>mandrake6.1</short-id>
+    <name>Mandrake Linux 6.1</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Helios</codename>
+    <version>6.1</version>
+    <upgrades id="http://mandriva.com/mandrake/6.0"/>
+    <derives-from id="http://mandriva.com/mandrake/6.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/7.0";>
+    <short-id>mandrake7.0</short-id>
+    <name>Mandrake Linux 7.0</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Air</codename>
+    <version>7.0</version>
+    <upgrades id="http://mandriva.com/mandrake/6.1"/>
+    <derives-from id="http://mandriva.com/mandrake/6.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/7.1";>
+    <short-id>mandrake7.1</short-id>
+    <name>Mandrake Linux 7.1</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Helium</codename>
+    <version>7.1</version>
+    <upgrades id="http://mandriva.com/mandrake/7.0"/>
+    <derives-from id="http://mandriva.com/mandrake/7.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/7.2";>
+    <short-id>mandrake7.2</short-id>
+    <name>Mandrake Linux 7.2</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Odyssey</codename>
+    <version>7.2</version>
+    <upgrades id="http://mandriva.com/mandrake/7.1"/>
+    <derives-from id="http://mandriva.com/mandrake/7.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/8.0";>
+    <short-id>mandrake8.0</short-id>
+    <name>Mandrake Linux 8.0</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Traktopel</codename>
+    <version>8.0</version>
+    <upgrades id="http://mandriva.com/mandrake/7.2"/>
+    <derives-from id="http://mandriva.com/mandrake/7.2"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/8.1";>
+    <short-id>mandrake8.1</short-id>
+    <name>Mandrake Linux 8.1</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Vitamin</codename>
+    <version>8.1</version>
+    <upgrades id="http://mandriva.com/mandrake/8.0"/>
+    <derives-from id="http://mandriva.com/mandrake/8.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/8.2";>
+    <short-id>mandrake8.2</short-id>
+    <name>Mandrake Linux 8.2</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Bluebird</codename>
+    <version>8.2</version>
+    <upgrades id="http://mandriva.com/mandrake/8.1"/>
+    <derives-from id="http://mandriva.com/mandrake/8.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/9.0";>
+    <short-id>mandrake9.0</short-id>
+    <name>Mandrake Linux 9.0</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Dolphin</codename>
+    <version>9.0</version>
+    <upgrades id="http://mandriva.com/mandrake/8.2"/>
+    <derives-from id="http://mandriva.com/mandrake/8.2"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/9.1";>
+    <short-id>mandrake9.1</short-id>
+    <name>Mandrake Linux 9.1</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Bamboo</codename>
+    <version>9.1</version>
+    <upgrades id="http://mandriva.com/mandrake/9.0"/>
+    <derives-from id="http://mandriva.com/mandrake/9.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/9.2";>
+    <short-id>mandrake9.2</short-id>
+    <name>Mandrake Linux 9.2</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>FiveStar</codename>
+    <version>9.2</version>
+    <upgrades id="http://mandriva.com/mandrake/9.1"/>
+    <derives-from id="http://mandriva.com/mandrake/9.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/10.0";>
+    <short-id>mandrake10.0</short-id>
+    <name>Mandrake Linux 10.0</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <version>10.0</version>
+    <upgrades id="http://mandriva.com/mandrake/9.2"/>
+    <derives-from id="http://mandriva.com/mandrake/9.2"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/10.1";>
+    <short-id>mandrake10.1</short-id>
+    <name>Mandrake Linux 10.1</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <version>10.1</version>
+    <upgrades id="http://mandriva.com/mandrake/10.0"/>
+    <derives-from id="http://mandriva.com/mandrake/10.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandrake/10.2";>
+    <short-id>mandrake10.2</short-id>
+    <name>Mandrake Linux 10.2</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Leeloo</codename>
+    <version>10.2</version>
+    <upgrades id="http://mandriva.com/mandrake/10.1"/>
+    <derives-from id="http://mandriva.com/mandrake/10.1"/>
+
+  </os>
+
+</libosinfo>
diff --git a/data/oses/mandriva.xml b/data/oses/mandriva.xml
deleted file mode 100644
index 53fef7d..0000000
--- a/data/oses/mandriva.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://mandriva.com/mandriva/2006.0";>
-    <short-id>mandriva2006.0</short-id>
-    <name>Mandriva Linux 2006.0</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2006.0</version>
-    <upgrades id="http://mandriva.com/mandrake/10.2"/>
-    <derives-from id="http://mandriva.com/mandrake/10.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2007";>
-    <short-id>mandriva2007</short-id>
-    <name>Mandriva Linux 2007</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2007</version>
-    <upgrades id="http://mandriva.com/mandriva/2006.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2006.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2007.1";>
-    <short-id>mandriva2007.1</short-id>
-    <name>Mandriva Linux 2007 Spring</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2007.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2007"/>
-    <derives-from id="http://mandriva.com/mandriva/2007"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2008.0";>
-    <short-id>mandriva2008.0</short-id>
-    <name>Mandriva Linux 2008</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2008.0</version>
-    <upgrades id="http://mandriva.com/mandriva/2007.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2007.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2008.1";>
-    <short-id>mandriva2008.1</short-id>
-    <name>Mandriva Linux 2008 Spring</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2008.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2008.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2008.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2009.0";>
-    <short-id>mandriva2009.0</short-id>
-    <name>Mandriva Linux 2009</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2009.0</version>
-    <upgrades id="http://mandriva.com/mandriva/2008.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2008.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2009.1";>
-    <short-id>mandriva2009.1</short-id>
-    <name>Mandriva Linux 2009 Spring</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2009.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2009.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2009.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2010.0";>
-    <short-id>mandriva2010.0</short-id>
-    <name>Mandriva Linux 2010</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2010.0</version>
-    <upgrades id="http://mandriva.com/mandriva/2009.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2009.1"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2010.1";>
-    <short-id>mandriva2010.1</short-id>
-    <name>Mandriva Linux 2010 Spring</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2010.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2010.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2010.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2010.2";>
-    <short-id>mandriva2010.2</short-id>
-    <name>Mandriva Linux 2010.2</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2010.2</version>
-    <upgrades id="http://mandriva.com/mandriva/2010.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2010.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2011";>
-    <short-id>mandriva2011</short-id>
-    <name>Mandriva Linux 2011</name>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <codename>Hydrogen</codename>
-    <version>2011</version>
-    <upgrades id="http://mandriva.com/mandriva/2010.2"/>
-    <derives-from id="http://mandriva.com/mandriva/2010.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mes/5.0";>
-    <short-id>mes5</short-id>
-    <name>Mandriva Enterprise Server 5.0</name>
-    <version>5.0</version>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mes</distro>
-
-  </os>
-
-  <os id="http://mandriva.com/mes/5.1";>
-    <short-id>mes5.1</short-id>
-    <name>Mandriva Enterprise Server 5.1</name>
-    <version>5.1</version>
-    <vendor>Mandriva</vendor>
-    <family>linux</family>
-    <distro>mes</distro>
-    <upgrades id="http://mandriva.com/mes/5.0"/>
-    <derives-from id="http://mandriva.com/mes/5.0"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/mandriva.xml.in b/data/oses/mandriva.xml.in
new file mode 100644
index 0000000..53fef7d
--- /dev/null
+++ b/data/oses/mandriva.xml.in
@@ -0,0 +1,166 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://mandriva.com/mandriva/2006.0";>
+    <short-id>mandriva2006.0</short-id>
+    <name>Mandriva Linux 2006.0</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2006.0</version>
+    <upgrades id="http://mandriva.com/mandrake/10.2"/>
+    <derives-from id="http://mandriva.com/mandrake/10.2"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2007";>
+    <short-id>mandriva2007</short-id>
+    <name>Mandriva Linux 2007</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2007</version>
+    <upgrades id="http://mandriva.com/mandriva/2006.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2006.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2007.1";>
+    <short-id>mandriva2007.1</short-id>
+    <name>Mandriva Linux 2007 Spring</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2007.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2007"/>
+    <derives-from id="http://mandriva.com/mandriva/2007"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2008.0";>
+    <short-id>mandriva2008.0</short-id>
+    <name>Mandriva Linux 2008</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2008.0</version>
+    <upgrades id="http://mandriva.com/mandriva/2007.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2007.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2008.1";>
+    <short-id>mandriva2008.1</short-id>
+    <name>Mandriva Linux 2008 Spring</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2008.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2008.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2008.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2009.0";>
+    <short-id>mandriva2009.0</short-id>
+    <name>Mandriva Linux 2009</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2009.0</version>
+    <upgrades id="http://mandriva.com/mandriva/2008.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2008.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2009.1";>
+    <short-id>mandriva2009.1</short-id>
+    <name>Mandriva Linux 2009 Spring</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2009.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2009.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2009.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2010.0";>
+    <short-id>mandriva2010.0</short-id>
+    <name>Mandriva Linux 2010</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2010.0</version>
+    <upgrades id="http://mandriva.com/mandriva/2009.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2009.1"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2010.1";>
+    <short-id>mandriva2010.1</short-id>
+    <name>Mandriva Linux 2010 Spring</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2010.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2010.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2010.0"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2010.2";>
+    <short-id>mandriva2010.2</short-id>
+    <name>Mandriva Linux 2010.2</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2010.2</version>
+    <upgrades id="http://mandriva.com/mandriva/2010.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2010.1"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mandriva/2011";>
+    <short-id>mandriva2011</short-id>
+    <name>Mandriva Linux 2011</name>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <codename>Hydrogen</codename>
+    <version>2011</version>
+    <upgrades id="http://mandriva.com/mandriva/2010.2"/>
+    <derives-from id="http://mandriva.com/mandriva/2010.2"/>
+
+  </os>
+
+  <os id="http://mandriva.com/mes/5.0";>
+    <short-id>mes5</short-id>
+    <name>Mandriva Enterprise Server 5.0</name>
+    <version>5.0</version>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mes</distro>
+
+  </os>
+
+  <os id="http://mandriva.com/mes/5.1";>
+    <short-id>mes5.1</short-id>
+    <name>Mandriva Enterprise Server 5.1</name>
+    <version>5.1</version>
+    <vendor>Mandriva</vendor>
+    <family>linux</family>
+    <distro>mes</distro>
+    <upgrades id="http://mandriva.com/mes/5.0"/>
+    <derives-from id="http://mandriva.com/mes/5.0"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/netbsd.xml b/data/oses/netbsd.xml
deleted file mode 100644
index b755b72..0000000
--- a/data/oses/netbsd.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://netbsd.org/netbsd/0.8";>
-    <short-id>netbsd0.8</short-id>
-    <name>NetBSD 0.8</name>
-    <version>0.8</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-
-    <release-date>1993-04-20</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/0.9";>
-    <short-id>netbsd0.9</short-id>
-    <name>NetBSD 0.9</name>
-    <version>0.9</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/0.8"/>
-    <derives-from id="http://netbsd.org/netbsd/0.8"/>
-
-    <release-date>1993-08-20</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.0";>
-    <short-id>netbsd1.0</short-id>
-    <name>NetBSD 1.0</name>
-    <version>1.0</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/0.9"/>
-    <derives-from id="http://netbsd.org/netbsd/0.9"/>
-
-    <release-date>1994-10-26</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.1";>
-    <short-id>netbsd1.1</short-id>
-    <name>NetBSD 1.1</name>
-    <version>1.1</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.0"/>
-    <derives-from id="http://netbsd.org/netbsd/1.0"/>
-
-    <release-date>1995-11-26</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.2";>
-    <short-id>netbsd1.2</short-id>
-    <name>NetBSD 1.2</name>
-    <version>1.2</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.1"/>
-    <derives-from id="http://netbsd.org/netbsd/1.1"/>
-
-    <release-date>1996-10-04</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.3";>
-    <short-id>netbsd1.3</short-id>
-    <name>NetBSD 1.3</name>
-    <version>1.3</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.2"/>
-    <derives-from id="http://netbsd.org/netbsd/1.2"/>
-
-    <release-date>1998-03-09</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.4";>
-    <short-id>netbsd1.4</short-id>
-    <name>NetBSD 1.4</name>
-    <version>1.4</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.3"/>
-    <derives-from id="http://netbsd.org/netbsd/1.3"/>
-
-    <release-date>1999-05-12</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.5";>
-    <short-id>netbsd1.5</short-id>
-    <name>NetBSD 1.5</name>
-    <version>1.5</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.4"/>
-    <derives-from id="http://netbsd.org/netbsd/1.4"/>
-
-    <release-date>2000-12-06</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.6";>
-    <short-id>netbsd1.6</short-id>
-    <name>NetBSD 1.6</name>
-    <version>1.6</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.5"/>
-    <derives-from id="http://netbsd.org/netbsd/1.5"/>
-
-    <release-date>2002-09-14</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/2.0";>
-    <short-id>netbsd2.0</short-id>
-    <name>NetBSD 2.0</name>
-    <version>2.0</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.6"/>
-    <derives-from id="http://netbsd.org/netbsd/1.6"/>
-
-    <release-date>2004-12-09</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/3.0";>
-    <short-id>netbsd3.0</short-id>
-    <name>NetBSD 3.0</name>
-    <version>3.0</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/2.0"/>
-    <derives-from id="http://netbsd.org/netbsd/2.0"/>
-
-    <release-date>2005-12-23</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/4.0";>
-    <short-id>netbsd4.0</short-id>
-    <name>NetBSD 4.0</name>
-    <version>4.0</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/3.0"/>
-    <derives-from id="http://netbsd.org/netbsd/3.0"/>
-
-    <release-date>2007-12-19</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/5.0";>
-    <short-id>netbsd5.0</short-id>
-    <name>NetBSD 5.0</name>
-    <version>5.0</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/4.0"/>
-    <derives-from id="http://netbsd.org/netbsd/4.0"/>
-
-    <release-date>2009-04-29</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/5.1";>
-    <short-id>netbsd5.1</short-id>
-    <name>NetBSD 5.1</name>
-    <version>5.1</version>
-    <vendor>NetBSD Project</vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/5.0"/>
-    <derives-from id="http://netbsd.org/netbsd/5.0"/>
-
-    <release-date>2010-11-19</release-date>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/netbsd.xml.in b/data/oses/netbsd.xml.in
new file mode 100644
index 0000000..b755b72
--- /dev/null
+++ b/data/oses/netbsd.xml.in
@@ -0,0 +1,183 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://netbsd.org/netbsd/0.8";>
+    <short-id>netbsd0.8</short-id>
+    <name>NetBSD 0.8</name>
+    <version>0.8</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+
+    <release-date>1993-04-20</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/0.9";>
+    <short-id>netbsd0.9</short-id>
+    <name>NetBSD 0.9</name>
+    <version>0.9</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/0.8"/>
+    <derives-from id="http://netbsd.org/netbsd/0.8"/>
+
+    <release-date>1993-08-20</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/1.0";>
+    <short-id>netbsd1.0</short-id>
+    <name>NetBSD 1.0</name>
+    <version>1.0</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/0.9"/>
+    <derives-from id="http://netbsd.org/netbsd/0.9"/>
+
+    <release-date>1994-10-26</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/1.1";>
+    <short-id>netbsd1.1</short-id>
+    <name>NetBSD 1.1</name>
+    <version>1.1</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.0"/>
+    <derives-from id="http://netbsd.org/netbsd/1.0"/>
+
+    <release-date>1995-11-26</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/1.2";>
+    <short-id>netbsd1.2</short-id>
+    <name>NetBSD 1.2</name>
+    <version>1.2</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.1"/>
+    <derives-from id="http://netbsd.org/netbsd/1.1"/>
+
+    <release-date>1996-10-04</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/1.3";>
+    <short-id>netbsd1.3</short-id>
+    <name>NetBSD 1.3</name>
+    <version>1.3</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.2"/>
+    <derives-from id="http://netbsd.org/netbsd/1.2"/>
+
+    <release-date>1998-03-09</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/1.4";>
+    <short-id>netbsd1.4</short-id>
+    <name>NetBSD 1.4</name>
+    <version>1.4</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.3"/>
+    <derives-from id="http://netbsd.org/netbsd/1.3"/>
+
+    <release-date>1999-05-12</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/1.5";>
+    <short-id>netbsd1.5</short-id>
+    <name>NetBSD 1.5</name>
+    <version>1.5</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.4"/>
+    <derives-from id="http://netbsd.org/netbsd/1.4"/>
+
+    <release-date>2000-12-06</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/1.6";>
+    <short-id>netbsd1.6</short-id>
+    <name>NetBSD 1.6</name>
+    <version>1.6</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.5"/>
+    <derives-from id="http://netbsd.org/netbsd/1.5"/>
+
+    <release-date>2002-09-14</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/2.0";>
+    <short-id>netbsd2.0</short-id>
+    <name>NetBSD 2.0</name>
+    <version>2.0</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.6"/>
+    <derives-from id="http://netbsd.org/netbsd/1.6"/>
+
+    <release-date>2004-12-09</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/3.0";>
+    <short-id>netbsd3.0</short-id>
+    <name>NetBSD 3.0</name>
+    <version>3.0</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/2.0"/>
+    <derives-from id="http://netbsd.org/netbsd/2.0"/>
+
+    <release-date>2005-12-23</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/4.0";>
+    <short-id>netbsd4.0</short-id>
+    <name>NetBSD 4.0</name>
+    <version>4.0</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/3.0"/>
+    <derives-from id="http://netbsd.org/netbsd/3.0"/>
+
+    <release-date>2007-12-19</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/5.0";>
+    <short-id>netbsd5.0</short-id>
+    <name>NetBSD 5.0</name>
+    <version>5.0</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/4.0"/>
+    <derives-from id="http://netbsd.org/netbsd/4.0"/>
+
+    <release-date>2009-04-29</release-date>
+  </os>
+
+  <os id="http://netbsd.org/netbsd/5.1";>
+    <short-id>netbsd5.1</short-id>
+    <name>NetBSD 5.1</name>
+    <version>5.1</version>
+    <vendor>NetBSD Project</vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/5.0"/>
+    <derives-from id="http://netbsd.org/netbsd/5.0"/>
+
+    <release-date>2010-11-19</release-date>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/netware.xml b/data/oses/netware.xml
deleted file mode 100644
index a90409e..0000000
--- a/data/oses/netware.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<libosinfo version="0.0.1">
-  <os id="http://novell.com/netware4";>
-    <short-id>netware4</short-id>
-    <name>Novell Netware 4</name>
-    <vendor>Novell</vendor>
-    <family>netware</family>
-    <distro>netware</distro>
-    <version>4</version>
-  </os>
-
-  <os id="http://novell.com/netware5";>
-    <short-id>netware5</short-id>
-    <name>Novell Netware 5</name>
-    <vendor>Novell</vendor>
-    <family>netware</family>
-    <distro>netware</distro>
-    <version>5</version>
-  </os>
-
-  <os id="http://novell.com/netware6";>
-    <short-id>netware6</short-id>
-    <name>Novell Netware 6</name>
-    <vendor>Novell</vendor>
-    <family>netware</family>
-    <distro>netware</distro>
-    <version>6</version>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/netware.xml.in b/data/oses/netware.xml.in
new file mode 100644
index 0000000..a90409e
--- /dev/null
+++ b/data/oses/netware.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://novell.com/netware4";>
+    <short-id>netware4</short-id>
+    <name>Novell Netware 4</name>
+    <vendor>Novell</vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+    <version>4</version>
+  </os>
+
+  <os id="http://novell.com/netware5";>
+    <short-id>netware5</short-id>
+    <name>Novell Netware 5</name>
+    <vendor>Novell</vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+    <version>5</version>
+  </os>
+
+  <os id="http://novell.com/netware6";>
+    <short-id>netware6</short-id>
+    <name>Novell Netware 6</name>
+    <vendor>Novell</vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+    <version>6</version>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/openbsd.xml b/data/oses/openbsd.xml
deleted file mode 100644
index 5c585be..0000000
--- a/data/oses/openbsd.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://openbsd.org/openbsd/4.2";>
-    <short-id>openbsd4.2</short-id>
-    <name>OpenBSD 4.2</name>
-    <version>4.2</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
-
-    <media arch='i386'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.2 Install CD</volume-id>
-	<application-id>OpenBSD 4.2 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.2 Install CD</volume-id>
-	<application-id>OpenBSD 4.2 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.3";>
-    <short-id>openbsd4.3</short-id>
-    <name>OpenBSD 4.3</name>
-    <version>4.3</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.2'/>
-    <derives-from id='http://openbsd.org/openbsd/4.2'/>
-
-    <media arch='i386'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.3 Install CD</volume-id>
-	<application-id>OpenBSD 4.3 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.3 Install CD</volume-id>
-	<application-id>OpenBSD 4.3 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.4";>
-    <short-id>openbsd4.4</short-id>
-    <name>OpenBSD 4.4</name>
-    <version>4.4</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.3'/>
-    <derives-from id='http://openbsd.org/openbsd/4.3'/>
-
-    <media arch='i386'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.4 Install CD</volume-id>
-	<application-id>OpenBSD 4.4 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.4 Install CD</volume-id>
-	<application-id>OpenBSD 4.4 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.5";>
-    <short-id>openbsd4.5</short-id>
-    <name>OpenBSD 4.5</name>
-    <version>4.5</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.4'/>
-    <derives-from id='http://openbsd.org/openbsd/4.4'/>
-
-    <media arch='i386'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.5 Install CD</volume-id>
-	<application-id>OpenBSD 4.5 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.5 Install CD</volume-id>
-	<application-id>OpenBSD 4.5 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.8";>
-    <short-id>openbsd4.8</short-id>
-    <name>OpenBSD 4.8</name>
-    <version>4.8</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.5'/>
-    <derives-from id='http://openbsd.org/openbsd/4.5'/>
-
-    <media arch='i386'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.8 Install CD</volume-id>
-	<application-id>OpenBSD 4.8 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.8 Install CD</volume-id>
-	<application-id>OpenBSD 4.8 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.9";>
-    <short-id>openbsd4.9</short-id>
-    <name>OpenBSD 4.9</name>
-    <version>4.9</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.8'/>
-    <derives-from id='http://openbsd.org/openbsd/4.8'/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
-    </devices>
-
-    <media arch='i386'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.9 Install CD</volume-id>
-	<application-id>OpenBSD 4.9 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.9 Install CD</volume-id>
-	<application-id>OpenBSD 4.9 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-
-  <os id="http://openbsd.org/openbsd/5.0";>
-    <short-id>openbsd5.0</short-id>
-    <name>OpenBSD 5.0</name>
-    <version>5.0</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.9'/>
-    <derives-from id='http://openbsd.org/openbsd/4.9'/>
-
-
-    <media arch='i386'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.0 Install CD</volume-id>
-	<application-id>OpenBSD 5.0 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.0 Install CD</volume-id>
-	<application-id>OpenBSD 5.0 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/openbsd.xml.in b/data/oses/openbsd.xml.in
new file mode 100644
index 0000000..5c585be
--- /dev/null
+++ b/data/oses/openbsd.xml.in
@@ -0,0 +1,210 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://openbsd.org/openbsd/4.2";>
+    <short-id>openbsd4.2</short-id>
+    <name>OpenBSD 4.2</name>
+    <version>4.2</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <vendor>OpenBSD Project</vendor>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.3";>
+    <short-id>openbsd4.3</short-id>
+    <name>OpenBSD 4.3</name>
+    <version>4.3</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.2'/>
+    <derives-from id='http://openbsd.org/openbsd/4.2'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.4";>
+    <short-id>openbsd4.4</short-id>
+    <name>OpenBSD 4.4</name>
+    <version>4.4</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.3'/>
+    <derives-from id='http://openbsd.org/openbsd/4.3'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.5";>
+    <short-id>openbsd4.5</short-id>
+    <name>OpenBSD 4.5</name>
+    <version>4.5</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.4'/>
+    <derives-from id='http://openbsd.org/openbsd/4.4'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.8";>
+    <short-id>openbsd4.8</short-id>
+    <name>OpenBSD 4.8</name>
+    <version>4.8</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.5'/>
+    <derives-from id='http://openbsd.org/openbsd/4.5'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.9";>
+    <short-id>openbsd4.9</short-id>
+    <name>OpenBSD 4.9</name>
+    <version>4.9</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.8'/>
+    <derives-from id='http://openbsd.org/openbsd/4.8'/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
+    </devices>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+
+  <os id="http://openbsd.org/openbsd/5.0";>
+    <short-id>openbsd5.0</short-id>
+    <name>OpenBSD 5.0</name>
+    <version>5.0</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.9'/>
+    <derives-from id='http://openbsd.org/openbsd/4.9'/>
+
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/opensuse.xml b/data/oses/opensuse.xml
deleted file mode 100644
index 85c656f..0000000
--- a/data/oses/opensuse.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://opensuse.org/opensuse/10.2";>
-    <short-id>opensuse10.2</short-id>
-    <name>openSUSE 10.2</name>
-    <version>10.2</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/10.3";>
-    <short-id>opensuse10.3</short-id>
-    <name>openSUSE 10.3</name>
-    <version>10.3</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/10.2"; />
-    <derives-from id="http://opensuse.org/opensuse/10.2"; />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.0";>
-    <short-id>opensuse11.0</short-id>
-    <name>openSUSE 11.0</name>
-    <version>11.0</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/10.3"; />
-    <derives-from id="http://opensuse.org/opensuse/10.3"; />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.1";>
-    <short-id>opensuse11.1</short-id>
-    <name>openSUSE 11.1</name>
-    <version>11.1</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.0"; />
-    <derives-from id="http://opensuse.org/opensuse/11.0"; />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.2";>
-    <short-id>opensuse11.2</short-id>
-    <name>openSUSE 11.2</name>
-    <version>11.2</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.1"; />
-    <derives-from id="http://opensuse.org/opensuse/11.1"; />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.3";>
-    <short-id>opensuse11.3</short-id>
-    <name>openSUSE 11.3</name>
-    <version>11.3</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.2"; />
-    <derives-from id="http://opensuse.org/opensuse/11.2"; />
-
-    <media arch="i586">
-      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-i586.iso?mirrorlist</url>
-      <iso>
-        <volume-id>openSUSE-DVD-i586-Build0702..001</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>vmlinuz</kernel>
-      <initrd>initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-x86_64.iso?mirrorlist</url>
-      <iso>
-        <volume-id>openSUSE-DVD-x86_64.0702..001</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>vmlinuz</kernel>
-      <initrd>initrd.img</initrd>
-    </media>
-
-    <media arch="i586" live="true">
-<!--      <url>http://software.opensuse.org/113/en</url>-->
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>vmlinuz</kernel>
-      <initrd>initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-<!--      <url>http://software.opensuse.org/113/en</url>-->
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>vmlinuz</kernel>
-      <initrd>initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.4";>
-    <short-id>opensuse11.4</short-id>
-    <name>openSUSE 11.4</name>
-    <version>11.4</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.3"; />
-    <derives-from id="http://opensuse.org/opensuse/11.3"; />
-
-    <media arch="i586">
-    <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-i586.iso?mirrorlist</url>
-    <iso>
-      <volume-id>openSUSE-DVD-i586-Build0024</volume-id>
-      <system-id>LINUX</system-id>
-      <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-    </iso>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-x86_64.iso?mirrorlist</url>
-      <iso>
-        <volume-id>openSUSE-DVD-x86_640024</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-    </media>
-
-    <media arch="i586" live="true">
-<!--      <url>http://software.opensuse.org/114/pl</url>-->
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64" live="true">
-<!--      <url>http://software.opensuse.org/114/pl</url>-->
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/12.1";>
-    <short-id>opensuse12.1</short-id>
-    <name>openSUSE 12.1</name>
-    <version>12.1</version>
-    <vendor>openSUSE</vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.4"; />
-    <derives-from id="http://opensuse.org/opensuse/11.4"; />
-
-    <media arch="i586">
-      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-i586.iso?mirrorlist</url>
-      <iso>
-        <volume-id>openSUSE-DVD-i586-Build0039</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-x86_64.iso?mirrorlist</url>
-      <iso>
-        <volume-id>openSUSE-DVD-x86_640039</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-    </media>
-
-    <media arch="i586" live="true">
-<!--      <url>http://software.opensuse.org/121/pl</url>-->
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64" live="true">
-<!--      <url>http://software.opensuse.org/121/pl</url>-->
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/opensuse.xml.in b/data/oses/opensuse.xml.in
new file mode 100644
index 0000000..85c656f
--- /dev/null
+++ b/data/oses/opensuse.xml.in
@@ -0,0 +1,238 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://opensuse.org/opensuse/10.2";>
+    <short-id>opensuse10.2</short-id>
+    <name>openSUSE 10.2</name>
+    <version>10.2</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+  </os>
+
+  <os id="http://opensuse.org/opensuse/10.3";>
+    <short-id>opensuse10.3</short-id>
+    <name>openSUSE 10.3</name>
+    <version>10.3</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/10.2"; />
+    <derives-from id="http://opensuse.org/opensuse/10.2"; />
+  </os>
+
+  <os id="http://opensuse.org/opensuse/11.0";>
+    <short-id>opensuse11.0</short-id>
+    <name>openSUSE 11.0</name>
+    <version>11.0</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/10.3"; />
+    <derives-from id="http://opensuse.org/opensuse/10.3"; />
+  </os>
+
+  <os id="http://opensuse.org/opensuse/11.1";>
+    <short-id>opensuse11.1</short-id>
+    <name>openSUSE 11.1</name>
+    <version>11.1</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.0"; />
+    <derives-from id="http://opensuse.org/opensuse/11.0"; />
+  </os>
+
+  <os id="http://opensuse.org/opensuse/11.2";>
+    <short-id>opensuse11.2</short-id>
+    <name>openSUSE 11.2</name>
+    <version>11.2</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.1"; />
+    <derives-from id="http://opensuse.org/opensuse/11.1"; />
+  </os>
+
+  <os id="http://opensuse.org/opensuse/11.3";>
+    <short-id>opensuse11.3</short-id>
+    <name>openSUSE 11.3</name>
+    <version>11.3</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.2"; />
+    <derives-from id="http://opensuse.org/opensuse/11.2"; />
+
+    <media arch="i586">
+      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-i586.iso?mirrorlist</url>
+      <iso>
+        <volume-id>openSUSE-DVD-i586-Build0702..001</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>vmlinuz</kernel>
+      <initrd>initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-x86_64.iso?mirrorlist</url>
+      <iso>
+        <volume-id>openSUSE-DVD-x86_64.0702..001</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>vmlinuz</kernel>
+      <initrd>initrd.img</initrd>
+    </media>
+
+    <media arch="i586" live="true">
+<!--      <url>http://software.opensuse.org/113/en</url>-->
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>vmlinuz</kernel>
+      <initrd>initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+<!--      <url>http://software.opensuse.org/113/en</url>-->
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>vmlinuz</kernel>
+      <initrd>initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+
+  <os id="http://opensuse.org/opensuse/11.4";>
+    <short-id>opensuse11.4</short-id>
+    <name>openSUSE 11.4</name>
+    <version>11.4</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.3"; />
+    <derives-from id="http://opensuse.org/opensuse/11.3"; />
+
+    <media arch="i586">
+    <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-i586.iso?mirrorlist</url>
+    <iso>
+      <volume-id>openSUSE-DVD-i586-Build0024</volume-id>
+      <system-id>LINUX</system-id>
+      <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+    </iso>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-x86_64.iso?mirrorlist</url>
+      <iso>
+        <volume-id>openSUSE-DVD-x86_640024</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+    </media>
+
+    <media arch="i586" live="true">
+<!--      <url>http://software.opensuse.org/114/pl</url>-->
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64" live="true">
+<!--      <url>http://software.opensuse.org/114/pl</url>-->
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+
+  <os id="http://opensuse.org/opensuse/12.1";>
+    <short-id>opensuse12.1</short-id>
+    <name>openSUSE 12.1</name>
+    <version>12.1</version>
+    <vendor>openSUSE</vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.4"; />
+    <derives-from id="http://opensuse.org/opensuse/11.4"; />
+
+    <media arch="i586">
+      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-i586.iso?mirrorlist</url>
+      <iso>
+        <volume-id>openSUSE-DVD-i586-Build0039</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-x86_64.iso?mirrorlist</url>
+      <iso>
+        <volume-id>openSUSE-DVD-x86_640039</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+    </media>
+
+    <media arch="i586" live="true">
+<!--      <url>http://software.opensuse.org/121/pl</url>-->
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64" live="true">
+<!--      <url>http://software.opensuse.org/121/pl</url>-->
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/rhel.xml b/data/oses/rhel.xml
deleted file mode 100644
index 14414a8..0000000
--- a/data/oses/rhel.xml
+++ /dev/null
@@ -1,727 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <!-- RHEL-2.1 Pensacola -->
-
-  <os id="http://redhat.com/rhel/2.1";>
-    <short-id>rhel2.1</short-id>
-    <name>Red Hat Enterprise Linux 2.1</name>
-    <version>2.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-
-    <release-date>2002-03-26</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.1";>
-    <short-id>rhel2.1.1</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 1</name>
-    <version>2.1.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1"/>
-    <derives-from id="http://redhat.com/rhel/2.1"/>
-
-    <release-date>2003-02-14</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.2";>
-    <short-id>rhel2.1.2</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 2</name>
-    <version>2.1.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.1"/>
-    <derives-from id="http://redhat.com/rhel/2.1.1"/>
-
-    <release-date>2003-05-02</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.3";>
-    <short-id>rhel2.1.3</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 3</name>
-    <version>2.1.3</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.2"/>
-    <derives-from id="http://redhat.com/rhel/2.1.2"/>
-
-    <release-date>2003-12-19</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.4";>
-    <short-id>rhel2.1.4</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 4</name>
-    <version>2.1.4</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.3"/>
-    <derives-from id="http://redhat.com/rhel/2.1.3"/>
-
-    <release-date>2004-04-30</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.5";>
-    <short-id>rhel2.1.5</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 5</name>
-    <version>2.1.5</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.4"/>
-    <derives-from id="http://redhat.com/rhel/2.1.4"/>
-
-    <release-date>2004-08-18</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.6";>
-    <short-id>rhel2.1.6</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 6</name>
-    <version>2.1.6</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.5"/>
-    <derives-from id="http://redhat.com/rhel/2.1.5"/>
-
-    <release-date>2004-12-13</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.7";>
-    <short-id>rhel2.1.7</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 7</name>
-    <version>2.1.7</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.6"/>
-    <derives-from id="http://redhat.com/rhel/2.1.6"/>
-
-    <release-date>2005-04-28</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-
-
-  <!-- RHEL-3 Taroon -->
-
-  <os id="http://redhat.com/rhel/3";>
-    <short-id>rhel3</short-id>
-    <name>Red Hat Enterprise Linux 3</name>
-    <version>3</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2003-10-22</release-date>
-    <eol-date>2014-01-30</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.1";>
-    <short-id>rhel3.1</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 1</name>
-    <version>3.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-01-16</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3"/>
-    <derives-from id="http://redhat.com/rhel/3"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.2";>
-    <short-id>rhel3.2</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 2</name>
-    <version>3.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-05-18</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.1"/>
-    <derives-from id="http://redhat.com/rhel/3.1"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.3";>
-    <short-id>rhel3.3</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 3</name>
-    <version>3.3</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-09-03</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.2"/>
-    <derives-from id="http://redhat.com/rhel/3.2"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.4";>
-    <short-id>rhel3.4</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 4</name>
-    <version>3.4</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-12-21</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.3"/>
-    <derives-from id="http://redhat.com/rhel/3.3"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.5";>
-    <short-id>rhel3.5</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 5</name>
-    <version>3.5</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2005-05-20</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.4"/>
-    <derives-from id="http://redhat.com/rhel/3.4"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.6";>
-    <short-id>rhel3.6</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 6</name>
-    <version>3.6</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2005-09-28</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.5"/>
-    <derives-from id="http://redhat.com/rhel/3.5"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.7";>
-    <short-id>rhel3.7</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 7</name>
-    <version>3.7</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2006-03-15</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.6"/>
-    <derives-from id="http://redhat.com/rhel/3.6"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.8";>
-    <short-id>rhel3.8</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 8</name>
-    <version>3.8</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2006-07-20</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.7"/>
-    <derives-from id="http://redhat.com/rhel/3.7"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.9";>
-    <short-id>rhel3.9</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 9</name>
-    <version>3.9</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2007-06-15</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.8"/>
-    <derives-from id="http://redhat.com/rhel/3.8"/>
-  </os>
-
-
-
-  <!-- RHEL-4 Nahant -->
-
-  <os id="http://redhat.com/rhel/4.0";>
-    <short-id>rhel4.0</short-id>
-    <name>Red Hat Enterprise Linux 4.0</name>
-    <version>4.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-
-    <release-date>2005-02-15</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.1";>
-    <short-id>rhel4.1</short-id>
-    <name>Red Hat Enterprise Linux 4.1</name>
-    <version>4.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.0"/>
-    <derives-from id="http://redhat.com/rhel/4.0"/>
-
-    <release-date>2005-06-09</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.2";>
-    <short-id>rhel4.2</short-id>
-    <name>Red Hat Enterprise Linux 4.2</name>
-    <version>4.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.1"/>
-    <derives-from id="http://redhat.com/rhel/4.1"/>
-
-    <release-date>2005-10-05</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.3";>
-    <short-id>rhel4.3</short-id>
-    <name>Red Hat Enterprise Linux 4.3</name>
-    <version>4.3</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.2"/>
-    <derives-from id="http://redhat.com/rhel/4.2"/>
-
-    <release-date>2006-03-07</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.4";>
-    <short-id>rhel4.4</short-id>
-    <name>Red Hat Enterprise Linux 4.4</name>
-    <version>4.4</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.3"/>
-    <derives-from id="http://redhat.com/rhel/4.3"/>
-
-    <release-date>2006-08-11</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.5";>
-    <short-id>rhel4.5</short-id>
-    <name>Red Hat Enterprise Linux 4.5</name>
-    <version>4.5</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.4"/>
-    <derives-from id="http://redhat.com/rhel/4.4"/>
-
-    <release-date>2007-05-01</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.6";>
-    <short-id>rhel4.6</short-id>
-    <name>Red Hat Enterprise Linux 4.6</name>
-    <version>4.6</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.5"/>
-    <derives-from id="http://redhat.com/rhel/4.5"/>
-
-    <release-date>2007-11-15</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.7";>
-    <short-id>rhel4.7</short-id>
-    <name>Red Hat Enterprise Linux 4.7</name>
-    <version>4.7</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.6"/>
-    <derives-from id="http://redhat.com/rhel/4.6"/>
-
-    <release-date>2008-07-24</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.8";>
-    <short-id>rhel4.8</short-id>
-    <name>Red Hat Enterprise Linux 4.8</name>
-    <version>4.8</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.7"/>
-    <derives-from id="http://redhat.com/rhel/4.7"/>
-
-    <release-date>2009-05-18</release-date>
-    <eol-date>2015-02-28</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/4-U8 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/4-U8 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.9";>
-    <short-id>rhel4.9</short-id>
-    <name>Red Hat Enterprise Linux 4.9</name>
-    <version>4.9</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.8"/>
-    <derives-from id="http://redhat.com/rhel/4.8"/>
-
-    <release-date>2011-02-16</release-date>
-    <eol-date>2015-02-28</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_4.9 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_4.9 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-
-
-  <!-- RHEL-5 Tikanga -->
-
-  <os id="http://redhat.com/rhel/5.0";>
-    <short-id>rhel5.0</short-id>
-    <name>Red Hat Enterprise Linux 5.0</name>
-    <version>5.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-
-    <release-date>2007-03-14</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-
-  <os id="http://redhat.com/rhel/5.1";>
-    <short-id>rhel5.1</short-id>
-    <name>Red Hat Enterprise Linux 5.1</name>
-    <version>5.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.0"/>
-    <derives-from id="http://redhat.com/rhel/5.0"/>
-
-    <release-date>2007-11-07</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.2";>
-    <short-id>rhel5.2</short-id>
-    <name>Red Hat Enterprise Linux 5.2</name>
-    <version>5.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.1"/>
-    <derives-from id="http://redhat.com/rhel/5.1"/>
-
-    <release-date>2008-05-21</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.3";>
-    <short-id>rhel5.3</short-id>
-    <name>Red Hat Enterprise Linux 5.3</name>
-    <version>5.3</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.2"/>
-    <derives-from id="http://redhat.com/rhel/5.2"/>
-
-    <release-date>2009-01-20</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.4";>
-    <short-id>rhel5.4</short-id>
-    <name>Red Hat Enterprise Linux 5.4</name>
-    <version>5.4</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.3"/>
-    <derives-from id="http://redhat.com/rhel/5.3"/>
-
-    <release-date>2009-09-02</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.4 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.4 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.5";>
-    <short-id>rhel5.5</short-id>
-    <name>Red Hat Enterprise Linux 5.5</name>
-    <version>5.5</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.4"/>
-    <derives-from id="http://redhat.com/rhel/5.4"/>
-
-    <release-date>2010-03-30</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.6";>
-    <short-id>rhel5.6</short-id>
-    <name>Red Hat Enterprise Linux 5.6</name>
-    <version>5.6</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.5"/>
-    <derives-from id="http://redhat.com/rhel/5.5"/>
-
-    <release-date>2011-01-12</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.6 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.6 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.7";>
-    <short-id>rhel5.7</short-id>
-    <name>Red Hat Enterprise Linux 5.7</name>
-    <version>5.7</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.6"/>
-    <derives-from id="http://redhat.com/rhel/5.6"/>
-
-    <release-date>2011-07-21</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.7 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.7 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.8";>
-    <short-id>rhel5.8</short-id>
-    <name>Red Hat Enterprise Linux 5.8</name>
-    <version>5.8</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.8"/>
-    <derives-from id="http://redhat.com/rhel/5.8"/>
-
-    <release-date>2012-02-21</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-
-
-  <!-- RHEL-6 Santiago -->
-
-  <os id="http://redhat.com/rhel/6.0";>
-    <short-id>rhel6.0</short-id>
-    <name>Red Hat Enterprise Linux 6.0</name>
-    <version>6.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-
-    <release-date>2010-11-10</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.0 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.0 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/6.1";>
-    <short-id>rhel6.1</short-id>
-    <name>Red Hat Enterprise Linux 6.1</name>
-    <version>6.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-    <upgrades id="http://redhat.com/rhel/6.0"/>
-    <derives-from id="http://redhat.com/rhel/6.0"/>
-
-    <release-date>2011-05-19</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.1 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.1 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/6.2";>
-    <short-id>rhel6.2</short-id>
-    <name>Red Hat Enterprise Linux 6.2</name>
-    <version>6.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-    <upgrades id="http://redhat.com/rhel/6.1"/>
-    <derives-from id="http://redhat.com/rhel/6.1"/>
-
-    <release-date>2011-12-06</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.2 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.2 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
new file mode 100644
index 0000000..14414a8
--- /dev/null
+++ b/data/oses/rhel.xml.in
@@ -0,0 +1,727 @@
+<libosinfo version="0.0.1">
+
+  <!-- RHEL-2.1 Pensacola -->
+
+  <os id="http://redhat.com/rhel/2.1";>
+    <short-id>rhel2.1</short-id>
+    <name>Red Hat Enterprise Linux 2.1</name>
+    <version>2.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+
+    <release-date>2002-03-26</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/2.1.1";>
+    <short-id>rhel2.1.1</short-id>
+    <name>Red Hat Enterprise Linux 2.1 Update 1</name>
+    <version>2.1.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1"/>
+    <derives-from id="http://redhat.com/rhel/2.1"/>
+
+    <release-date>2003-02-14</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/2.1.2";>
+    <short-id>rhel2.1.2</short-id>
+    <name>Red Hat Enterprise Linux 2.1 Update 2</name>
+    <version>2.1.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.1"/>
+    <derives-from id="http://redhat.com/rhel/2.1.1"/>
+
+    <release-date>2003-05-02</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/2.1.3";>
+    <short-id>rhel2.1.3</short-id>
+    <name>Red Hat Enterprise Linux 2.1 Update 3</name>
+    <version>2.1.3</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.2"/>
+    <derives-from id="http://redhat.com/rhel/2.1.2"/>
+
+    <release-date>2003-12-19</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/2.1.4";>
+    <short-id>rhel2.1.4</short-id>
+    <name>Red Hat Enterprise Linux 2.1 Update 4</name>
+    <version>2.1.4</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.3"/>
+    <derives-from id="http://redhat.com/rhel/2.1.3"/>
+
+    <release-date>2004-04-30</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/2.1.5";>
+    <short-id>rhel2.1.5</short-id>
+    <name>Red Hat Enterprise Linux 2.1 Update 5</name>
+    <version>2.1.5</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.4"/>
+    <derives-from id="http://redhat.com/rhel/2.1.4"/>
+
+    <release-date>2004-08-18</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/2.1.6";>
+    <short-id>rhel2.1.6</short-id>
+    <name>Red Hat Enterprise Linux 2.1 Update 6</name>
+    <version>2.1.6</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.5"/>
+    <derives-from id="http://redhat.com/rhel/2.1.5"/>
+
+    <release-date>2004-12-13</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/2.1.7";>
+    <short-id>rhel2.1.7</short-id>
+    <name>Red Hat Enterprise Linux 2.1 Update 7</name>
+    <version>2.1.7</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.6"/>
+    <derives-from id="http://redhat.com/rhel/2.1.6"/>
+
+    <release-date>2005-04-28</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+
+
+
+  <!-- RHEL-3 Taroon -->
+
+  <os id="http://redhat.com/rhel/3";>
+    <short-id>rhel3</short-id>
+    <name>Red Hat Enterprise Linux 3</name>
+    <version>3</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2003-10-22</release-date>
+    <eol-date>2014-01-30</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.1";>
+    <short-id>rhel3.1</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 1</name>
+    <version>3.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-01-16</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3"/>
+    <derives-from id="http://redhat.com/rhel/3"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.2";>
+    <short-id>rhel3.2</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 2</name>
+    <version>3.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-05-18</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.1"/>
+    <derives-from id="http://redhat.com/rhel/3.1"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.3";>
+    <short-id>rhel3.3</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 3</name>
+    <version>3.3</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-09-03</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.2"/>
+    <derives-from id="http://redhat.com/rhel/3.2"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.4";>
+    <short-id>rhel3.4</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 4</name>
+    <version>3.4</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-12-21</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.3"/>
+    <derives-from id="http://redhat.com/rhel/3.3"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.5";>
+    <short-id>rhel3.5</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 5</name>
+    <version>3.5</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2005-05-20</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.4"/>
+    <derives-from id="http://redhat.com/rhel/3.4"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.6";>
+    <short-id>rhel3.6</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 6</name>
+    <version>3.6</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2005-09-28</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.5"/>
+    <derives-from id="http://redhat.com/rhel/3.5"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.7";>
+    <short-id>rhel3.7</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 7</name>
+    <version>3.7</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2006-03-15</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.6"/>
+    <derives-from id="http://redhat.com/rhel/3.6"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.8";>
+    <short-id>rhel3.8</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 8</name>
+    <version>3.8</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2006-07-20</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.7"/>
+    <derives-from id="http://redhat.com/rhel/3.7"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/3.9";>
+    <short-id>rhel3.9</short-id>
+    <name>Red Hat Enterprise Linux 3 Update 9</name>
+    <version>3.9</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2007-06-15</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.8"/>
+    <derives-from id="http://redhat.com/rhel/3.8"/>
+  </os>
+
+
+
+  <!-- RHEL-4 Nahant -->
+
+  <os id="http://redhat.com/rhel/4.0";>
+    <short-id>rhel4.0</short-id>
+    <name>Red Hat Enterprise Linux 4.0</name>
+    <version>4.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+
+    <release-date>2005-02-15</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.1";>
+    <short-id>rhel4.1</short-id>
+    <name>Red Hat Enterprise Linux 4.1</name>
+    <version>4.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.0"/>
+    <derives-from id="http://redhat.com/rhel/4.0"/>
+
+    <release-date>2005-06-09</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.2";>
+    <short-id>rhel4.2</short-id>
+    <name>Red Hat Enterprise Linux 4.2</name>
+    <version>4.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.1"/>
+    <derives-from id="http://redhat.com/rhel/4.1"/>
+
+    <release-date>2005-10-05</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.3";>
+    <short-id>rhel4.3</short-id>
+    <name>Red Hat Enterprise Linux 4.3</name>
+    <version>4.3</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.2"/>
+    <derives-from id="http://redhat.com/rhel/4.2"/>
+
+    <release-date>2006-03-07</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.4";>
+    <short-id>rhel4.4</short-id>
+    <name>Red Hat Enterprise Linux 4.4</name>
+    <version>4.4</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.3"/>
+    <derives-from id="http://redhat.com/rhel/4.3"/>
+
+    <release-date>2006-08-11</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.5";>
+    <short-id>rhel4.5</short-id>
+    <name>Red Hat Enterprise Linux 4.5</name>
+    <version>4.5</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.4"/>
+    <derives-from id="http://redhat.com/rhel/4.4"/>
+
+    <release-date>2007-05-01</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.6";>
+    <short-id>rhel4.6</short-id>
+    <name>Red Hat Enterprise Linux 4.6</name>
+    <version>4.6</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.5"/>
+    <derives-from id="http://redhat.com/rhel/4.5"/>
+
+    <release-date>2007-11-15</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.7";>
+    <short-id>rhel4.7</short-id>
+    <name>Red Hat Enterprise Linux 4.7</name>
+    <version>4.7</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.6"/>
+    <derives-from id="http://redhat.com/rhel/4.6"/>
+
+    <release-date>2008-07-24</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.8";>
+    <short-id>rhel4.8</short-id>
+    <name>Red Hat Enterprise Linux 4.8</name>
+    <version>4.8</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.7"/>
+    <derives-from id="http://redhat.com/rhel/4.7"/>
+
+    <release-date>2009-05-18</release-date>
+    <eol-date>2015-02-28</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/4-U8 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/4-U8 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.9";>
+    <short-id>rhel4.9</short-id>
+    <name>Red Hat Enterprise Linux 4.9</name>
+    <version>4.9</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.8"/>
+    <derives-from id="http://redhat.com/rhel/4.8"/>
+
+    <release-date>2011-02-16</release-date>
+    <eol-date>2015-02-28</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_4.9 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_4.9 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+
+
+  <!-- RHEL-5 Tikanga -->
+
+  <os id="http://redhat.com/rhel/5.0";>
+    <short-id>rhel5.0</short-id>
+    <name>Red Hat Enterprise Linux 5.0</name>
+    <version>5.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+
+    <release-date>2007-03-14</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+
+
+  <os id="http://redhat.com/rhel/5.1";>
+    <short-id>rhel5.1</short-id>
+    <name>Red Hat Enterprise Linux 5.1</name>
+    <version>5.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.0"/>
+    <derives-from id="http://redhat.com/rhel/5.0"/>
+
+    <release-date>2007-11-07</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.2";>
+    <short-id>rhel5.2</short-id>
+    <name>Red Hat Enterprise Linux 5.2</name>
+    <version>5.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.1"/>
+    <derives-from id="http://redhat.com/rhel/5.1"/>
+
+    <release-date>2008-05-21</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.3";>
+    <short-id>rhel5.3</short-id>
+    <name>Red Hat Enterprise Linux 5.3</name>
+    <version>5.3</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.2"/>
+    <derives-from id="http://redhat.com/rhel/5.2"/>
+
+    <release-date>2009-01-20</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.4";>
+    <short-id>rhel5.4</short-id>
+    <name>Red Hat Enterprise Linux 5.4</name>
+    <version>5.4</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.3"/>
+    <derives-from id="http://redhat.com/rhel/5.3"/>
+
+    <release-date>2009-09-02</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.4 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.4 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.5";>
+    <short-id>rhel5.5</short-id>
+    <name>Red Hat Enterprise Linux 5.5</name>
+    <version>5.5</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.4"/>
+    <derives-from id="http://redhat.com/rhel/5.4"/>
+
+    <release-date>2010-03-30</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.6";>
+    <short-id>rhel5.6</short-id>
+    <name>Red Hat Enterprise Linux 5.6</name>
+    <version>5.6</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.5"/>
+    <derives-from id="http://redhat.com/rhel/5.5"/>
+
+    <release-date>2011-01-12</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.6 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.6 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.7";>
+    <short-id>rhel5.7</short-id>
+    <name>Red Hat Enterprise Linux 5.7</name>
+    <version>5.7</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.6"/>
+    <derives-from id="http://redhat.com/rhel/5.6"/>
+
+    <release-date>2011-07-21</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.7 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.7 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.8";>
+    <short-id>rhel5.8</short-id>
+    <name>Red Hat Enterprise Linux 5.8</name>
+    <version>5.8</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.8"/>
+    <derives-from id="http://redhat.com/rhel/5.8"/>
+
+    <release-date>2012-02-21</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+
+
+
+  <!-- RHEL-6 Santiago -->
+
+  <os id="http://redhat.com/rhel/6.0";>
+    <short-id>rhel6.0</short-id>
+    <name>Red Hat Enterprise Linux 6.0</name>
+    <version>6.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+
+    <release-date>2010-11-10</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.0 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.0 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/6.1";>
+    <short-id>rhel6.1</short-id>
+    <name>Red Hat Enterprise Linux 6.1</name>
+    <version>6.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.0"/>
+    <derives-from id="http://redhat.com/rhel/6.0"/>
+
+    <release-date>2011-05-19</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.1 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.1 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/6.2";>
+    <short-id>rhel6.2</short-id>
+    <name>Red Hat Enterprise Linux 6.2</name>
+    <version>6.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.1"/>
+    <derives-from id="http://redhat.com/rhel/6.1"/>
+
+    <release-date>2011-12-06</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.2 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.2 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/rhl.xml b/data/oses/rhl.xml
deleted file mode 100644
index c98e0a3..0000000
--- a/data/oses/rhl.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://redhat.com/rhl/1.0";>
-    <short-id>rhl1.0</short-id>
-    <name>Red Hat Linux 1.0</name>
-    <version>1.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Mother's Day</codename>
-
-    <release-date>1994-11-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/1.1";>
-    <short-id>rhl1.1</short-id>
-    <name>Red Hat Linux 1.1</name>
-    <version>1.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Mother's Day + 0.1</codename>
-    <upgrades id="http://redhat.com/rhl/1.0"/>
-    <derives-from id="http://redhat.com/rhl/1.0"/>
-
-    <release-date>1995-08-01</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/2.0";>
-    <short-id>rhl2.0</short-id>
-    <name>Red Hat Linux 2.0</name>
-    <version>2.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <upgrades id="http://redhat.com/rhl/1.1"/>
-    <derives-from id="http://redhat.com/rhl/1.1"/>
-
-    <release-date>1995-09-20</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/2.1";>
-    <short-id>rhl2.1</short-id>
-    <name>Red Hat Linux 2.1</name>
-    <version>2.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <upgrades id="http://redhat.com/rhl/2.0"/>
-    <derives-from id="http://redhat.com/rhl/2.0"/>
-
-    <release-date>1995-11-23</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/3.0.3";>
-    <short-id>rhl3.0.3</short-id>
-    <name>Red Hat Linux 3.0.3</name>
-    <version>3.0.3</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Picasso</codename>
-    <upgrades id="http://redhat.com/rhl/2.1"/>
-    <derives-from id="http://redhat.com/rhl/2.1"/>
-
-    <release-date>1996-05-01</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/4.0";>
-    <short-id>rhl4.0</short-id>
-    <name>Red Hat Linux 4.0</name>
-    <version>4.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Colgate</codename>
-    <upgrades id="http://redhat.com/rhl/3.0.3"/>
-    <derives-from id="http://redhat.com/rhl/3.0.3"/>
-
-    <release-date>1996-10-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/4.1";>
-    <short-id>rhl4.1</short-id>
-    <name>Red Hat Linux 4.1</name>
-    <version>4.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Vanderbilt</codename>
-    <upgrades id="http://redhat.com/rhl/4.0"/>
-    <derives-from id="http://redhat.com/rhl/4.0"/>
-
-    <release-date>1997-02-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/4.2";>
-    <short-id>rhl4.2</short-id>
-    <name>Red Hat Linux 4.2</name>
-    <version>4.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Biltmore</codename>
-    <upgrades id="http://redhat.com/rhl/4.1"/>
-    <derives-from id="http://redhat.com/rhl/4.1"/>
-
-    <release-date>1997-05-19</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/5.0";>
-    <short-id>rhl5.0</short-id>
-    <name>Red Hat Linux 5.0</name>
-    <version>5.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Hurricane</codename>
-    <upgrades id="http://redhat.com/rhl/4.2"/>
-    <derives-from id="http://redhat.com/rhl/4.2"/>
-
-    <release-date>1997-12-01</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/5.1";>
-    <short-id>rhl5.1</short-id>
-    <name>Red Hat Linux 5.1</name>
-    <version>5.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Manhattan</codename>
-    <upgrades id="http://redhat.com/rhl/5.0"/>
-    <derives-from id="http://redhat.com/rhl/5.0"/>
-
-    <release-date>1998-05-22</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/5.2";>
-    <short-id>rhl5.2</short-id>
-    <name>Red Hat Linux 5.2</name>
-    <version>5.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Apollo</codename>
-    <upgrades id="http://redhat.com/rhl/5.1"/>
-    <derives-from id="http://redhat.com/rhl/5.1"/>
-
-    <release-date>1998-11-02</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/6.0";>
-    <short-id>rhl6.0</short-id>
-    <name>Red Hat Linux 6.0</name>
-    <version>6.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Hedwig</codename>
-    <upgrades id="http://redhat.com/rhl/5.1"/>
-    <derives-from id="http://redhat.com/rhl/5.1"/>
-
-    <release-date>1999-04-26</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/6.1";>
-    <short-id>rhl6.1</short-id>
-    <name>Red Hat Linux 6.1</name>
-    <version>6.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Cartman</codename>
-    <upgrades id="http://redhat.com/rhl/6.0"/>
-    <derives-from id="http://redhat.com/rhl/6.0"/>
-
-    <release-date>1999-10-04</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/6.2";>
-    <short-id>rhl6.2</short-id>
-    <name>Red Hat Linux 6.2</name>
-    <version>6.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Zoot</codename>
-    <upgrades id="http://redhat.com/rhl/6.1"/>
-    <derives-from id="http://redhat.com/rhl/6.1"/>
-
-    <release-date>2000-04-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7";>
-    <short-id>rhl7</short-id>
-    <name>Red Hat Linux 7</name>
-    <version>7</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Guinness</codename>
-    <upgrades id="http://redhat.com/rhl/6.1"/>
-    <derives-from id="http://redhat.com/rhl/6.1"/>
-
-    <release-date>2000-09-25</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7.1";>
-    <short-id>rhl7.1</short-id>
-    <name>Red Hat Linux 7.1</name>
-    <version>7.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Seawolf</codename>
-    <upgrades id="http://redhat.com/rhl/7"/>
-    <derives-from id="http://redhat.com/rhl/7"/>
-
-    <release-date>2001-04-16</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7.2";>
-    <short-id>rhl7.2</short-id>
-    <name>Red Hat Linux 7.2</name>
-    <version>7.2</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Enigma</codename>
-    <upgrades id="http://redhat.com/rhl/7.1"/>
-    <derives-from id="http://redhat.com/rhl/7.1"/>
-
-    <release-date>2001-10-22</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7.3";>
-    <short-id>rhl7.3</short-id>
-    <name>Red Hat Linux 7.3</name>
-    <version>7.3</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Valhalla</codename>
-    <upgrades id="http://redhat.com/rhl/7.2"/>
-    <derives-from id="http://redhat.com/rhl/7.2"/>
-
-    <release-date>2002-05-06</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/8.0";>
-    <short-id>rhl8.0</short-id>
-    <name>Red Hat Linux 8.0</name>
-    <version>8.0</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Psyche</codename>
-    <upgrades id="http://redhat.com/rhl/7.3"/>
-    <derives-from id="http://redhat.com/rhl/7.3"/>
-
-    <release-date>2002-09-30</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/9";>
-    <short-id>rhl9</short-id>
-    <name>Red Hat Linux 9</name>
-    <version>9</version>
-    <vendor>Red Hat, Inc</vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Shrike</codename>
-    <upgrades id="http://redhat.com/rhl/8.0"/>
-    <derives-from id="http://redhat.com/rhl/8.0"/>
-
-    <release-date>2003-03-31</release-date>
-    <eol-date>2004-05-01</eol-date>
-  </os>
-
-
-</libosinfo>
diff --git a/data/oses/rhl.xml.in b/data/oses/rhl.xml.in
new file mode 100644
index 0000000..c98e0a3
--- /dev/null
+++ b/data/oses/rhl.xml.in
@@ -0,0 +1,285 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://redhat.com/rhl/1.0";>
+    <short-id>rhl1.0</short-id>
+    <name>Red Hat Linux 1.0</name>
+    <version>1.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Mother's Day</codename>
+
+    <release-date>1994-11-03</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/1.1";>
+    <short-id>rhl1.1</short-id>
+    <name>Red Hat Linux 1.1</name>
+    <version>1.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Mother's Day + 0.1</codename>
+    <upgrades id="http://redhat.com/rhl/1.0"/>
+    <derives-from id="http://redhat.com/rhl/1.0"/>
+
+    <release-date>1995-08-01</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/2.0";>
+    <short-id>rhl2.0</short-id>
+    <name>Red Hat Linux 2.0</name>
+    <version>2.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <upgrades id="http://redhat.com/rhl/1.1"/>
+    <derives-from id="http://redhat.com/rhl/1.1"/>
+
+    <release-date>1995-09-20</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/2.1";>
+    <short-id>rhl2.1</short-id>
+    <name>Red Hat Linux 2.1</name>
+    <version>2.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <upgrades id="http://redhat.com/rhl/2.0"/>
+    <derives-from id="http://redhat.com/rhl/2.0"/>
+
+    <release-date>1995-11-23</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/3.0.3";>
+    <short-id>rhl3.0.3</short-id>
+    <name>Red Hat Linux 3.0.3</name>
+    <version>3.0.3</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Picasso</codename>
+    <upgrades id="http://redhat.com/rhl/2.1"/>
+    <derives-from id="http://redhat.com/rhl/2.1"/>
+
+    <release-date>1996-05-01</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/4.0";>
+    <short-id>rhl4.0</short-id>
+    <name>Red Hat Linux 4.0</name>
+    <version>4.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Colgate</codename>
+    <upgrades id="http://redhat.com/rhl/3.0.3"/>
+    <derives-from id="http://redhat.com/rhl/3.0.3"/>
+
+    <release-date>1996-10-03</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/4.1";>
+    <short-id>rhl4.1</short-id>
+    <name>Red Hat Linux 4.1</name>
+    <version>4.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Vanderbilt</codename>
+    <upgrades id="http://redhat.com/rhl/4.0"/>
+    <derives-from id="http://redhat.com/rhl/4.0"/>
+
+    <release-date>1997-02-03</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/4.2";>
+    <short-id>rhl4.2</short-id>
+    <name>Red Hat Linux 4.2</name>
+    <version>4.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Biltmore</codename>
+    <upgrades id="http://redhat.com/rhl/4.1"/>
+    <derives-from id="http://redhat.com/rhl/4.1"/>
+
+    <release-date>1997-05-19</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/5.0";>
+    <short-id>rhl5.0</short-id>
+    <name>Red Hat Linux 5.0</name>
+    <version>5.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Hurricane</codename>
+    <upgrades id="http://redhat.com/rhl/4.2"/>
+    <derives-from id="http://redhat.com/rhl/4.2"/>
+
+    <release-date>1997-12-01</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/5.1";>
+    <short-id>rhl5.1</short-id>
+    <name>Red Hat Linux 5.1</name>
+    <version>5.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Manhattan</codename>
+    <upgrades id="http://redhat.com/rhl/5.0"/>
+    <derives-from id="http://redhat.com/rhl/5.0"/>
+
+    <release-date>1998-05-22</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/5.2";>
+    <short-id>rhl5.2</short-id>
+    <name>Red Hat Linux 5.2</name>
+    <version>5.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Apollo</codename>
+    <upgrades id="http://redhat.com/rhl/5.1"/>
+    <derives-from id="http://redhat.com/rhl/5.1"/>
+
+    <release-date>1998-11-02</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/6.0";>
+    <short-id>rhl6.0</short-id>
+    <name>Red Hat Linux 6.0</name>
+    <version>6.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Hedwig</codename>
+    <upgrades id="http://redhat.com/rhl/5.1"/>
+    <derives-from id="http://redhat.com/rhl/5.1"/>
+
+    <release-date>1999-04-26</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/6.1";>
+    <short-id>rhl6.1</short-id>
+    <name>Red Hat Linux 6.1</name>
+    <version>6.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Cartman</codename>
+    <upgrades id="http://redhat.com/rhl/6.0"/>
+    <derives-from id="http://redhat.com/rhl/6.0"/>
+
+    <release-date>1999-10-04</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/6.2";>
+    <short-id>rhl6.2</short-id>
+    <name>Red Hat Linux 6.2</name>
+    <version>6.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Zoot</codename>
+    <upgrades id="http://redhat.com/rhl/6.1"/>
+    <derives-from id="http://redhat.com/rhl/6.1"/>
+
+    <release-date>2000-04-03</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/7";>
+    <short-id>rhl7</short-id>
+    <name>Red Hat Linux 7</name>
+    <version>7</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Guinness</codename>
+    <upgrades id="http://redhat.com/rhl/6.1"/>
+    <derives-from id="http://redhat.com/rhl/6.1"/>
+
+    <release-date>2000-09-25</release-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/7.1";>
+    <short-id>rhl7.1</short-id>
+    <name>Red Hat Linux 7.1</name>
+    <version>7.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Seawolf</codename>
+    <upgrades id="http://redhat.com/rhl/7"/>
+    <derives-from id="http://redhat.com/rhl/7"/>
+
+    <release-date>2001-04-16</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/7.2";>
+    <short-id>rhl7.2</short-id>
+    <name>Red Hat Linux 7.2</name>
+    <version>7.2</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Enigma</codename>
+    <upgrades id="http://redhat.com/rhl/7.1"/>
+    <derives-from id="http://redhat.com/rhl/7.1"/>
+
+    <release-date>2001-10-22</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/7.3";>
+    <short-id>rhl7.3</short-id>
+    <name>Red Hat Linux 7.3</name>
+    <version>7.3</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Valhalla</codename>
+    <upgrades id="http://redhat.com/rhl/7.2"/>
+    <derives-from id="http://redhat.com/rhl/7.2"/>
+
+    <release-date>2002-05-06</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/8.0";>
+    <short-id>rhl8.0</short-id>
+    <name>Red Hat Linux 8.0</name>
+    <version>8.0</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Psyche</codename>
+    <upgrades id="http://redhat.com/rhl/7.3"/>
+    <derives-from id="http://redhat.com/rhl/7.3"/>
+
+    <release-date>2002-09-30</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+
+  <os id="http://redhat.com/rhl/9";>
+    <short-id>rhl9</short-id>
+    <name>Red Hat Linux 9</name>
+    <version>9</version>
+    <vendor>Red Hat, Inc</vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Shrike</codename>
+    <upgrades id="http://redhat.com/rhl/8.0"/>
+    <derives-from id="http://redhat.com/rhl/8.0"/>
+
+    <release-date>2003-03-31</release-date>
+    <eol-date>2004-05-01</eol-date>
+  </os>
+
+
+</libosinfo>
diff --git a/data/oses/solaris.xml b/data/oses/solaris.xml
deleted file mode 100644
index fcbe952..0000000
--- a/data/oses/solaris.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://sun.com/solaris/9";>
-    <short-id>solaris9</short-id>
-    <name>Sun Solaris 9</name>
-    <version>9</version>
-    <vendor>Sun</vendor>
-    <family>solaris</family>
-    <distro>solaris</distro>
-  </os>
-
-  <os id="http://sun.com/solaris/10";>
-    <short-id>solaris10</short-id>
-    <name>Sun Solaris 10</name>
-    <version>10</version>
-    <vendor>Sun</vendor>
-    <family>solaris</family>
-    <distro>solaris</distro>
-    <upgrades id="http://sun.com/solaris/9"/>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-  </os>
-
-  <os id="http://oracle.com/opensolaris/2009.06";>
-    <short-id>opensolaris2009.06</short-id>
-    <name>Sun OpenSolaris 2009.06</name>
-    <version>2009.06</version>
-    <vendor>Sun</vendor>
-    <family>solaris</family>
-    <distro>opensolaris</distro>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/solaris.xml.in b/data/oses/solaris.xml.in
new file mode 100644
index 0000000..fcbe952
--- /dev/null
+++ b/data/oses/solaris.xml.in
@@ -0,0 +1,39 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://sun.com/solaris/9";>
+    <short-id>solaris9</short-id>
+    <name>Sun Solaris 9</name>
+    <version>9</version>
+    <vendor>Sun</vendor>
+    <family>solaris</family>
+    <distro>solaris</distro>
+  </os>
+
+  <os id="http://sun.com/solaris/10";>
+    <short-id>solaris10</short-id>
+    <name>Sun Solaris 10</name>
+    <version>10</version>
+    <vendor>Sun</vendor>
+    <family>solaris</family>
+    <distro>solaris</distro>
+    <upgrades id="http://sun.com/solaris/9"/>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+  </os>
+
+  <os id="http://oracle.com/opensolaris/2009.06";>
+    <short-id>opensolaris2009.06</short-id>
+    <name>Sun OpenSolaris 2009.06</name>
+    <version>2009.06</version>
+    <vendor>Sun</vendor>
+    <family>solaris</family>
+    <distro>opensolaris</distro>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/suse.xml b/data/oses/suse.xml
deleted file mode 100644
index 135206f..0000000
--- a/data/oses/suse.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://suse.com/sles/9";>
-    <short-id>sles9</short-id>
-    <name>Suse Linux Enterprise Server 9</name>
-    <version>9</version>
-    <vendor>Novell</vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-  </os>
-
-  <os id="http://suse.com/sles/10";>
-    <short-id>sles10</short-id>
-    <name>Suse Linux Enterprise Server 10</name>
-    <version>10</version>
-    <vendor>Novell</vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/9"/>
-  </os>
-
-  <os id="http://suse.com/sles/11";>
-    <short-id>sles11</short-id>
-    <name>Suse Linux Enterprise Server 11</name>
-    <version>11</version>
-    <vendor>Novell</vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/10"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-  </os>
-
-  <os id="http://suse.com/sled/9";>
-    <short-id>sled9</short-id>
-    <name>Suse Linux Enterprise Desktop 9</name>
-    <version>9</version>
-    <vendor>Novell</vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-  </os>
-
-  <os id="http://suse.com/sled/10";>
-    <short-id>sled10</short-id>
-    <name>Suse Linux Enterprise Desktop 10</name>
-    <version>10</version>
-    <vendor>Novell</vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/9"/>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://suse.com/sled/11";>
-    <short-id>sled11</short-id>
-    <name>Suse Linux Enterprise Desktop 11</name>
-    <version>11</version>
-    <vendor>Novell</vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/10"/>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in
new file mode 100644
index 0000000..135206f
--- /dev/null
+++ b/data/oses/suse.xml.in
@@ -0,0 +1,88 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://suse.com/sles/9";>
+    <short-id>sles9</short-id>
+    <name>Suse Linux Enterprise Server 9</name>
+    <version>9</version>
+    <vendor>Novell</vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+  </os>
+
+  <os id="http://suse.com/sles/10";>
+    <short-id>sles10</short-id>
+    <name>Suse Linux Enterprise Server 10</name>
+    <version>10</version>
+    <vendor>Novell</vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/9"/>
+  </os>
+
+  <os id="http://suse.com/sles/11";>
+    <short-id>sles11</short-id>
+    <name>Suse Linux Enterprise Server 11</name>
+    <version>11</version>
+    <vendor>Novell</vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/10"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+  </os>
+
+  <os id="http://suse.com/sled/9";>
+    <short-id>sled9</short-id>
+    <name>Suse Linux Enterprise Desktop 9</name>
+    <version>9</version>
+    <vendor>Novell</vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+  </os>
+
+  <os id="http://suse.com/sled/10";>
+    <short-id>sled10</short-id>
+    <name>Suse Linux Enterprise Desktop 10</name>
+    <version>10</version>
+    <vendor>Novell</vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/9"/>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+
+  <os id="http://suse.com/sled/11";>
+    <short-id>sled11</short-id>
+    <name>Suse Linux Enterprise Desktop 11</name>
+    <version>11</version>
+    <vendor>Novell</vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/10"/>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml
deleted file mode 100644
index bc65a0e..0000000
--- a/data/oses/ubuntu.xml
+++ /dev/null
@@ -1,1186 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://ubuntu.com/ubuntu/4.10";>
-    <short-id>ubuntu4.10</short-id>
-    <short-id>ubuntuwarty</short-id>
-    <name>Ubuntu Warty Warthog</name>
-    <version>4.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Warty Warthog</codename>
-
-    <release-date>2004-10-20</release-date>
-    <eol-date>2006-04-30</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 4.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 4.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-live-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 4.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/5.04";>
-    <short-id>ubuntu5.04</short-id>
-    <short-id>ubuntuhoary</short-id>
-    <name>Ubuntu Hoary Hedgehog</name>
-    <version>5.04</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Hoary Hedgehog</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/4.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/4.10"/>
-
-    <release-date>2005-04-08</release-date>
-    <eol-date>2006-10-31</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/5.10";>
-    <short-id>ubuntu5.10</short-id>
-    <short-id>ubuntubreezy</short-id>
-    <name>Ubuntu Breezy Badger</name>
-    <version>5.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Breezy Badger</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/5.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/5.04"/>
-
-    <release-date>2005-10-13</release-date>
-    <eol-date>2007-04-13</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/6.06";>
-    <short-id>ubuntu6.06</short-id>
-    <short-id>ubuntudapper</short-id>
-    <name>Ubuntu Dapper Drake LTS</name>
-    <version>6.06</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Dapper Drake</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/5.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/5.10"/>
-
-    <release-date>2006-06-01</release-date>
-    <eol-date>2011-06-01</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="hppa">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? hppa</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ia64">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? ia64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="hppa" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-hppa.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? hppa</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ia64">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ia64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/6.10";>
-    <short-id>ubuntu6.10</short-id>
-    <short-id>ubuntuedgy</short-id>
-    <name>Ubuntu Edgy Eft</name>
-    <version>6.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Edgy Eft</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/6.06"/>
-    <derives-from id="http://ubuntu.com/ubuntu/6.06"/>
-
-    <release-date>2006-10-26</release-date>
-    <eol-date>2008-04-25</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.10 sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/7.04";>
-    <short-id>ubuntu7.04</short-id>
-    <short-id>ubuntufeisty</short-id>
-    <name>Ubuntu Feisty Fawn</name>
-    <version>7.04</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Feisty Fawn</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/6.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/6.10"/>
-
-    <release-date>2007-04-19</release-date>
-    <eol-date>2008-10-19</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.04 sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 7.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 7.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/7.10";>
-    <short-id>ubuntu7.10</short-id>
-    <short-id>ubuntugutsy</short-id>
-    <name>Ubuntu Gutsy Gibbon</name>
-    <version>7.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Gutsy Gibbon</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/7.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/7.04"/>
-
-    <release-date>2007-10-18</release-date>
-    <eol-date>2009-04-18</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.10 sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 7.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 7.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/8.04";>
-    <short-id>ubuntu8.04</short-id>
-    <short-id>ubuntuhardy</short-id>
-    <name>Ubuntu Hardy Heron LTS</name>
-    <version>8.04</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Hardy Heron</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/7.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/7.10"/>
-
-    <release-date>2008-04-24</release-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-    </devices>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 8.04(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 8.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/8.10";>
-    <short-id>ubuntu8.10</short-id>
-    <short-id>ubuntuintrepid</short-id>
-    <name>Ubuntu Intrepid Ibex</name>
-    <version>8.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Intrepid Ibex</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/8.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/8.04"/>
-
-    <release-date>2008-10-30</release-date>
-    <eol-date>2010-04-30</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 8.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 8.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/9.04";>
-    <short-id>ubuntu9.04</short-id>
-    <short-id>ubuntujaunty</short-id>
-    <name>Ubuntu Jaunty Jackalope</name>
-    <version>9.04</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Jaunty Jackalope</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/8.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/8.10"/>
-
-    <release-date>2009-04-23</release-date>
-    <eol-date>2010-10-23</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 9.04(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 9.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 9.04(.\d)? i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 9.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/9.10";>
-    <short-id>ubuntu9.10</short-id>
-    <short-id>ubuntukarmic</short-id>
-    <name>Ubuntu Karmic Koala</name>
-    <version>9.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Karmic Koala</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/9.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/9.04"/>
-
-    <release-date>2009-10-29</release-date>
-    <eol-date>2011-04-30</eol-date>
-
-    <media arch="i386">
-      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 9.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 9.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 9.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 9.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/10.04";>
-    <short-id>ubuntu10.04</short-id>
-    <short-id>ubuntulucid</short-id>
-    <name>Ubuntu Lucid Lynx LTS</name>
-    <version>10.04</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Lucid Lynx</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/9.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/9.10"/>
-
-    <release-date>2010-04-29</release-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-    <media arch="i386" live="true">
-      <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 10.04(.\d)? LTS i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/10.10";>
-    <short-id>ubuntu10.10</short-id>
-    <short-id>ubuntumaverick</short-id>
-    <name>Ubuntu Maverick Meerkat</name>
-    <version>10.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Maverick Meerkat</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/10.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/10.04"/>
-
-    <release-date>2010-10-10</release-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i386">
-      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 10.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 10.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 10.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 10.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/11.04";>
-    <short-id>ubuntu11.04</short-id>
-    <short-id>ubuntunatty</short-id>
-    <name>Ubuntu Natty Narwhal</name>
-    <version>11.04</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Natty Narwhal</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/10.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/10.10"/>
-
-    <release-date>2011-04-28</release-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i386">
-      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/11.10";>
-    <short-id>ubuntu11.10</short-id>
-    <short-id>ubuntuoneiric</short-id>
-    <name>Ubuntu Oneiric Ocelot</name>
-    <version>11.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Oneiric Ocelot</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/11.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/11.04"/>
-
-    <release-date>2011-10-13</release-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i386">
-      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i386" live="true">
-      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/12.04";>
-    <short-id>ubuntu12.04</short-id>
-    <short-id>ubuntuprecise</short-id>
-    <name>Ubuntu Precise Pangolin LTS</name>
-    <version>12.04</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Precise Pangolin</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/11.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/11.10"/>
-
-    <release-date>2012-04-26</release-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-    <media arch="i386">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i386" live="true">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/12.10";>
-    <short-id>ubuntu12.10</short-id>
-    <short-id>ubuntuquantal</short-id>
-    <name>Ubuntu Quantal Quetzal</name>
-    <version>12.10</version>
-    <vendor>Canonical Ltd</vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Quantal Quetzal</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/12.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/12.04"/>
-
-    <release-date>2012-10-18</release-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-    <media arch="i386">
-      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 12.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 12.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i386" live="true">
-      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 12.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 12.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
new file mode 100644
index 0000000..bc65a0e
--- /dev/null
+++ b/data/oses/ubuntu.xml.in
@@ -0,0 +1,1186 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://ubuntu.com/ubuntu/4.10";>
+    <short-id>ubuntu4.10</short-id>
+    <short-id>ubuntuwarty</short-id>
+    <name>Ubuntu Warty Warthog</name>
+    <version>4.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Warty Warthog</codename>
+
+    <release-date>2004-10-20</release-date>
+    <eol-date>2006-04-30</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 4.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 4.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-live-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 4.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/5.04";>
+    <short-id>ubuntu5.04</short-id>
+    <short-id>ubuntuhoary</short-id>
+    <name>Ubuntu Hoary Hedgehog</name>
+    <version>5.04</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Hoary Hedgehog</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/4.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/4.10"/>
+
+    <release-date>2005-04-08</release-date>
+    <eol-date>2006-10-31</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/5.10";>
+    <short-id>ubuntu5.10</short-id>
+    <short-id>ubuntubreezy</short-id>
+    <name>Ubuntu Breezy Badger</name>
+    <version>5.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Breezy Badger</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/5.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/5.04"/>
+
+    <release-date>2005-10-13</release-date>
+    <eol-date>2007-04-13</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/6.06";>
+    <short-id>ubuntu6.06</short-id>
+    <short-id>ubuntudapper</short-id>
+    <name>Ubuntu Dapper Drake LTS</name>
+    <version>6.06</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Dapper Drake</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/5.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/5.10"/>
+
+    <release-date>2006-06-01</release-date>
+    <eol-date>2011-06-01</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="hppa">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? hppa</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ia64">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? ia64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="hppa" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-hppa.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? hppa</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ia64">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? ia64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/6.10";>
+    <short-id>ubuntu6.10</short-id>
+    <short-id>ubuntuedgy</short-id>
+    <name>Ubuntu Edgy Eft</name>
+    <version>6.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Edgy Eft</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/6.06"/>
+    <derives-from id="http://ubuntu.com/ubuntu/6.06"/>
+
+    <release-date>2006-10-26</release-date>
+    <eol-date>2008-04-25</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.10 sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/7.04";>
+    <short-id>ubuntu7.04</short-id>
+    <short-id>ubuntufeisty</short-id>
+    <name>Ubuntu Feisty Fawn</name>
+    <version>7.04</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Feisty Fawn</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/6.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/6.10"/>
+
+    <release-date>2007-04-19</release-date>
+    <eol-date>2008-10-19</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.04 sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 7.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 7.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/7.10";>
+    <short-id>ubuntu7.10</short-id>
+    <short-id>ubuntugutsy</short-id>
+    <name>Ubuntu Gutsy Gibbon</name>
+    <version>7.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Gutsy Gibbon</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/7.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/7.04"/>
+
+    <release-date>2007-10-18</release-date>
+    <eol-date>2009-04-18</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.10 sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 7.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 7.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/8.04";>
+    <short-id>ubuntu8.04</short-id>
+    <short-id>ubuntuhardy</short-id>
+    <name>Ubuntu Hardy Heron LTS</name>
+    <version>8.04</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Hardy Heron</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/7.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/7.10"/>
+
+    <release-date>2008-04-24</release-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+    </devices>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 8.04(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 8.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/8.10";>
+    <short-id>ubuntu8.10</short-id>
+    <short-id>ubuntuintrepid</short-id>
+    <name>Ubuntu Intrepid Ibex</name>
+    <version>8.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Intrepid Ibex</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/8.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/8.04"/>
+
+    <release-date>2008-10-30</release-date>
+    <eol-date>2010-04-30</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 8.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 8.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/9.04";>
+    <short-id>ubuntu9.04</short-id>
+    <short-id>ubuntujaunty</short-id>
+    <name>Ubuntu Jaunty Jackalope</name>
+    <version>9.04</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Jaunty Jackalope</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/8.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/8.10"/>
+
+    <release-date>2009-04-23</release-date>
+    <eol-date>2010-10-23</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 9.04(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 9.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 9.04(.\d)? i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 9.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/9.10";>
+    <short-id>ubuntu9.10</short-id>
+    <short-id>ubuntukarmic</short-id>
+    <name>Ubuntu Karmic Koala</name>
+    <version>9.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Karmic Koala</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/9.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/9.04"/>
+
+    <release-date>2009-10-29</release-date>
+    <eol-date>2011-04-30</eol-date>
+
+    <media arch="i386">
+      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 9.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 9.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 9.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 9.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/10.04";>
+    <short-id>ubuntu10.04</short-id>
+    <short-id>ubuntulucid</short-id>
+    <name>Ubuntu Lucid Lynx LTS</name>
+    <version>10.04</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Lucid Lynx</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/9.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/9.10"/>
+
+    <release-date>2010-04-29</release-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+    <media arch="i386" live="true">
+      <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 10.04(.\d)? LTS i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/10.10";>
+    <short-id>ubuntu10.10</short-id>
+    <short-id>ubuntumaverick</short-id>
+    <name>Ubuntu Maverick Meerkat</name>
+    <version>10.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Maverick Meerkat</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/10.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/10.04"/>
+
+    <release-date>2010-10-10</release-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i386">
+      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 10.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 10.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 10.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 10.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/11.04";>
+    <short-id>ubuntu11.04</short-id>
+    <short-id>ubuntunatty</short-id>
+    <name>Ubuntu Natty Narwhal</name>
+    <version>11.04</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Natty Narwhal</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/10.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/10.10"/>
+
+    <release-date>2011-04-28</release-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i386">
+      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/11.10";>
+    <short-id>ubuntu11.10</short-id>
+    <short-id>ubuntuoneiric</short-id>
+    <name>Ubuntu Oneiric Ocelot</name>
+    <version>11.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Oneiric Ocelot</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/11.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/11.04"/>
+
+    <release-date>2011-10-13</release-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i386">
+      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i386" live="true">
+      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/12.04";>
+    <short-id>ubuntu12.04</short-id>
+    <short-id>ubuntuprecise</short-id>
+    <name>Ubuntu Precise Pangolin LTS</name>
+    <version>12.04</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Precise Pangolin</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/11.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/11.10"/>
+
+    <release-date>2012-04-26</release-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+    <media arch="i386">
+      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i386" live="true">
+      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+  <os id="http://ubuntu.com/ubuntu/12.10";>
+    <short-id>ubuntu12.10</short-id>
+    <short-id>ubuntuquantal</short-id>
+    <name>Ubuntu Quantal Quetzal</name>
+    <version>12.10</version>
+    <vendor>Canonical Ltd</vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Quantal Quetzal</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/12.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/12.04"/>
+
+    <release-date>2012-10-18</release-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+    <media arch="i386">
+      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 12.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 12.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i386" live="true">
+      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 12.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 12.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
deleted file mode 100644
index 90ee4d9..0000000
--- a/data/oses/windows.xml
+++ /dev/null
@@ -1,771 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <!--
-
-      The upgrade/derives relationship for Windows is more complex than
-      you might think, because of the merge/fork between WinME/XP/2k/2k3:
-
-
-   Win1.0 (Nov 1985)
-     |
-     | U, D
-     |
-     V
-   Win2.0 (Dec 1987)
-     |
-     | U, D
-     |
-     V
-   Win2.1 (May 1988)
-     |
-     | U, D
-     |
-     V
-   Win3.0 (May 1990)
-     |
-     | U, D
-     |
-     V
-   Win3.1 (Apr 1992)            WinNT3.1  (July 1993)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     |                            V
-     |                          WinNT3.4  (Sept 1994)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            V
-   Win95 (Aug 1995)             WinNT3.51 (May 1995)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            V
-   Win98 (Jun 1998)             WinNT4.0 (Aug 1996)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            |
-   WinME (Sep 2000)             Win2k  (Feb 2000)
-     |                           ||
-     \======+====================/| U, D
-       U    |  D                  |
-            V                     V
-          WinXP (Aug 2001)      Win2k3  (April 2003)
-            |                     |
-            | UD                  | U, D
-            |                     |
-            V                     V
-          WinVista (Jan 2007)   Win2k3r2 (Dec 2005)
-            |                     |
-            | U, D                | U, D
-            |                     |
-            |                     V
-            |                   Win2k8  (Feb 2008)
-            |                     |
-            |                     | U, D
-            |                     |
-            |                     V
-          Win7 (Oct 2009)       Win2k8r2 (Oct 2009)
-            |                     |
-            | U,D                 | U, D
-            |                     |
-            V                     V
-          Win8 (??? 2012)       ??????
-
-  -->
-
-  <os id="http://microsoft.com/win/1.0";>
-    <short-id>win1.0</short-id>
-    <name>Microsoft Windows 1.0</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>1.0</version>
-
-    <release-date>1985-11-20</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/2.0";>
-    <short-id>win2.0</short-id>
-    <name>Microsoft Windows 2.0</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>2.0</version>
-    <upgrades id="http://microsoft.com/win/1.0"/>
-    <derives-from id="http://microsoft.com/win/1.0"/>
-
-    <release-date>1987-12-09</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/2.1";>
-    <short-id>win2.1</short-id>
-    <name>Microsoft Windows 2.1</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>2.1</version>
-    <upgrades id="http://microsoft.com/win/2.0"/>
-    <derives-from id="http://microsoft.com/win/2.0"/>
-
-    <release-date>1988-05-27</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/3.1";>
-    <short-id>win3.1</short-id>
-    <name>Microsoft Windows 3.1</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>3.1</version>
-    <upgrades id="http://microsoft.com/win/2.1"/>
-    <derives-from id="http://microsoft.com/win/2.1"/>
-
-    <release-date>1992-04-06</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.1";>
-    <short-id>winnt3.1</short-id>
-    <name>Microsoft Windows NT Server 3.1</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.1</version>
-    <release-date>1993-07-27</release-date>
-    <eol-date>2000-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.5";>
-    <short-id>winnt3.5</short-id>
-    <name>Microsoft Windows NT Server 3.5</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.5</version>
-    <upgrades id="http://microsoft.com/winnt/3.1"/>
-    <derives-from id="http://microsoft.com/winnt/3.1"/>
-
-    <release-date>1994-09-21</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.51";>
-    <short-id>winnt3.51</short-id>
-    <name>Microsoft Windows NT Server 3.51</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.51</version>
-    <upgrades id="http://microsoft.com/winnt/3.5"/>
-    <derives-from id="http://microsoft.com/winnt/3.5"/>
-
-    <release-date>1995-05-30</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/4.0";>
-    <short-id>winnt4.0</short-id>
-    <name>Microsoft Windows NT Server 4.0</name>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>4.0</version>
-    <upgrades id="http://microsoft.com/winnt/3.51"/>
-    <derives-from id="http://microsoft.com/winnt/3.51"/>
-
-    <release-date>1996-08-24</release-date>
-    <eol-date>2004-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/95";>
-    <short-id>win95</short-id>
-    <name>Microsoft Windows 95</name>
-    <version>4.0</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <upgrades id="http://microsoft.com/win/3.1"/>
-    <derives-from id="http://microsoft.com/win/3.1"/>
-
-    <release-date>1995-08-24</release-date>
-    <eol-date>2001-12-13</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
-    </devices>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>12000000</cpu>
-        <ram>4194304</ram>
-        <storage>41943040</storage>
-      </minimum>
-    </resources>
-  </os>
-
-  <os id="http://microsoft.com/win/98";>
-    <short-id>win98</short-id>
-    <name>Microsoft Windows 98</name>
-    <version>4.1</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/95"/>
-    <upgrades id="http://microsoft.com/win/95"/>
-
-    <release-date>1998-06-25</release-date>
-    <eol-date>2006-07-11</eol-date>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>66000000</cpu>
-        <ram>16777216</ram>
-        <storage>125829120</storage>
-      </minimum>
-      <recommended>
-        <cpu>233000000</cpu>
-        <ram>25165824</ram>
-        <storage>419430400</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://microsoft.com/win/me";>
-    <short-id>winme</short-id>
-    <name>Microsoft Windows Millennium Edition</name>
-    <version>4.9</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/98"/>
-    <upgrades id="http://microsoft.com/win/98"/>
-
-    <release-date>2000-09-14</release-date>
-    <eol-date>2006-07-11</eol-date>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>150000000</cpu>
-        <ram>33554432</ram>
-        <storage>335544320</storage>
-      </minimum>
-      <recommended>
-        <cpu>300000000</cpu>
-        <ram>67108864</ram>
-        <storage>2147483648</storage>
-      </recommended>
-    </resources>
-  </os>
-
-
-  <os id="http://microsoft.com/win/2k";>
-    <short-id>win2k</short-id>
-    <name>Microsoft Windows 2000</name>
-    <version>5.0</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/me"/>
-
-    <release-date>2000-02-17</release-date>
-    <eol-date>2010-07-13</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
-    </devices>
-
-    <media arch="i386">
-      <iso>
-          <volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
-      </iso>
-    </media>
-
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>33554432</ram>
-        <storage>335544320</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>350000000</cpu>
-        <ram>100663296</ram>
-        <storage>1073741824</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-    </installer>
-  </os>
-
-
-  <os id="http://microsoft.com/win/xp";>
-    <short-id>winxp</short-id>
-    <name>Microsoft Windows XP</name>
-    <version>5.1</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k"/>
-    <derives-from id="http://microsoft.com/win/me"/>
-    <upgrades id="http://microsoft.com/win/me"/>
-
-    <release-date>2001-10-25</release-date>
-    <eol-date>2009-04-19</eol-date>
-
-    <media arch="i386" installer-reboots="2">
-      <iso>
-          <volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <media arch="x86_64" installer-reboots="2">
-      <iso>
-        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>233000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>1610612736</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>300000000</cpu>
-        <ram>134217728</ram>
-        <storage>2147483648</storage>
-      </recommended>
-    </resources>
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>733000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>268435456</ram>
-        <storage>1610612736</storage>
-      </minimum>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k3";>
-    <short-id>win2k3</short-id>
-    <name>Microsoft Windows Server 2003</name>
-    <version>5.2</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k"/>
-    <upgrades id="http://microsoft.com/win/2k"/>
-
-    <release-date>2003-04-24</release-date>
-    <eol-date>2015-07-14</eol-date>
-
-    <media arch="i386">
-      <iso>
-          <volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-          <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-    <media arch="ia64">
-      <iso>
-        <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>2147483648</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>550000000</cpu>
-        <ram>268435456</ram>
-        <storage>4294967296</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>4294967296</storage>
-      </minimum>
-
-      <recommended>
-        <storage>8589934592</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k3r2";>
-    <short-id>win2k3r2</short-id>
-    <name>Microsoft Windows Server 2003 R2</name>
-    <version>5.2</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k3"/>
-    <upgrades id="http://microsoft.com/win/2k3"/>
-
-    <release-date>2005-12-06</release-date>
-    <eol-date>2015-07-14</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>2147483648</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>550000000</cpu>
-        <ram>268435456</ram>
-        <storage>4294967296</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>4294967296</storage>
-      </minimum>
-
-      <recommended>
-        <storage>8589934592</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k8";>
-    <short-id>win2k8</short-id>
-    <name>Microsoft Windows Server 2008</name>
-    <version>6.0</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k3r2"/>
-    <upgrades id="http://microsoft.com/win/2k3r2"/>
-
-    <release-date>2008-02-27</release-date>
-    <eol-date>2013-07-09</eol-date>
-
-    <media arch="i386">
-      <iso>
-        <volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1400000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k8r2";>
-    <short-id>win2k8r2</short-id>
-    <name>Microsoft Windows Server 2008 R2</name>
-    <version>6.1</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k8"/>
-    <upgrades id="http://microsoft.com/win/2k8"/>
-
-    <release-date>2009-10-22</release-date>
-    <eol-date>2013-07-09</eol-date>
-
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-    <media arch="ia64">
-      <iso>
-        <volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1400000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/vista";>
-    <short-id>winvista</short-id>
-    <name>Microsoft Windows Vista</name>
-    <version>6.0</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/xp"/>
-    <upgrades id="http://microsoft.com/win/xp"/>
-
-    <release-date>2006-11-30</release-date>
-    <eol-date>2012-04-10</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-
-    <resources arch="all">
-      <minimum>
-        <cpu>800000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>16106127360</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/7";>
-    <short-id>win7</short-id>
-    <name>Microsoft Windows 7</name>
-    <version>6.1</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/vista"/>
-    <upgrades id="http://microsoft.com/win/vista"/>
-
-    <release-date>2009-10-22</release-date>
-    <eol-date>2015-01-13</eol-date>
-
-    <media arch="i386" installer-reboots="2">
-      <iso>
-        <volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <iso>
-        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
-    </devices>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/8";>
-    <short-id>win8</short-id>
-    <name>Microsoft Windows 8</name>
-    <version>6.2</version>
-    <vendor>Microsoft Corporation</vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/7"/>
-    <upgrades id="http://microsoft.com/win/7"/>
-
-<!--
-    <release-date></release-date>
-    <eol-date></eol-date>
--->
-
-    <media arch="i386">
-      <iso>
-        <volume-id>HB1_CCPA_X86FRE_EN</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>HB1_CCPA_X64FRE_EN</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-      </iso>
-    </media>
-
-    <resources arch="i386">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
-    </devices>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend'/>
-    </installer>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
new file mode 100644
index 0000000..90ee4d9
--- /dev/null
+++ b/data/oses/windows.xml.in
@@ -0,0 +1,771 @@
+<libosinfo version="0.0.1">
+
+  <!--
+
+      The upgrade/derives relationship for Windows is more complex than
+      you might think, because of the merge/fork between WinME/XP/2k/2k3:
+
+
+   Win1.0 (Nov 1985)
+     |
+     | U, D
+     |
+     V
+   Win2.0 (Dec 1987)
+     |
+     | U, D
+     |
+     V
+   Win2.1 (May 1988)
+     |
+     | U, D
+     |
+     V
+   Win3.0 (May 1990)
+     |
+     | U, D
+     |
+     V
+   Win3.1 (Apr 1992)            WinNT3.1  (July 1993)
+     |                            |
+     | U, D                       | U, D
+     |                            |
+     |                            V
+     |                          WinNT3.4  (Sept 1994)
+     |                            |
+     | U, D                       | U, D
+     |                            |
+     V                            V
+   Win95 (Aug 1995)             WinNT3.51 (May 1995)
+     |                            |
+     | U, D                       | U, D
+     |                            |
+     V                            V
+   Win98 (Jun 1998)             WinNT4.0 (Aug 1996)
+     |                            |
+     | U, D                       | U, D
+     |                            |
+     V                            |
+   WinME (Sep 2000)             Win2k  (Feb 2000)
+     |                           ||
+     \======+====================/| U, D
+       U    |  D                  |
+            V                     V
+          WinXP (Aug 2001)      Win2k3  (April 2003)
+            |                     |
+            | UD                  | U, D
+            |                     |
+            V                     V
+          WinVista (Jan 2007)   Win2k3r2 (Dec 2005)
+            |                     |
+            | U, D                | U, D
+            |                     |
+            |                     V
+            |                   Win2k8  (Feb 2008)
+            |                     |
+            |                     | U, D
+            |                     |
+            |                     V
+          Win7 (Oct 2009)       Win2k8r2 (Oct 2009)
+            |                     |
+            | U,D                 | U, D
+            |                     |
+            V                     V
+          Win8 (??? 2012)       ??????
+
+  -->
+
+  <os id="http://microsoft.com/win/1.0";>
+    <short-id>win1.0</short-id>
+    <name>Microsoft Windows 1.0</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>1.0</version>
+
+    <release-date>1985-11-20</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/win/2.0";>
+    <short-id>win2.0</short-id>
+    <name>Microsoft Windows 2.0</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>2.0</version>
+    <upgrades id="http://microsoft.com/win/1.0"/>
+    <derives-from id="http://microsoft.com/win/1.0"/>
+
+    <release-date>1987-12-09</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/win/2.1";>
+    <short-id>win2.1</short-id>
+    <name>Microsoft Windows 2.1</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>2.1</version>
+    <upgrades id="http://microsoft.com/win/2.0"/>
+    <derives-from id="http://microsoft.com/win/2.0"/>
+
+    <release-date>1988-05-27</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/win/3.1";>
+    <short-id>win3.1</short-id>
+    <name>Microsoft Windows 3.1</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>3.1</version>
+    <upgrades id="http://microsoft.com/win/2.1"/>
+    <derives-from id="http://microsoft.com/win/2.1"/>
+
+    <release-date>1992-04-06</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/winnt/3.1";>
+    <short-id>winnt3.1</short-id>
+    <name>Microsoft Windows NT Server 3.1</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.1</version>
+    <release-date>1993-07-27</release-date>
+    <eol-date>2000-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/winnt/3.5";>
+    <short-id>winnt3.5</short-id>
+    <name>Microsoft Windows NT Server 3.5</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.5</version>
+    <upgrades id="http://microsoft.com/winnt/3.1"/>
+    <derives-from id="http://microsoft.com/winnt/3.1"/>
+
+    <release-date>1994-09-21</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/winnt/3.51";>
+    <short-id>winnt3.51</short-id>
+    <name>Microsoft Windows NT Server 3.51</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.51</version>
+    <upgrades id="http://microsoft.com/winnt/3.5"/>
+    <derives-from id="http://microsoft.com/winnt/3.5"/>
+
+    <release-date>1995-05-30</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/winnt/4.0";>
+    <short-id>winnt4.0</short-id>
+    <name>Microsoft Windows NT Server 4.0</name>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>4.0</version>
+    <upgrades id="http://microsoft.com/winnt/3.51"/>
+    <derives-from id="http://microsoft.com/winnt/3.51"/>
+
+    <release-date>1996-08-24</release-date>
+    <eol-date>2004-12-31</eol-date>
+  </os>
+
+  <os id="http://microsoft.com/win/95";>
+    <short-id>win95</short-id>
+    <name>Microsoft Windows 95</name>
+    <version>4.0</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <upgrades id="http://microsoft.com/win/3.1"/>
+    <derives-from id="http://microsoft.com/win/3.1"/>
+
+    <release-date>1995-08-24</release-date>
+    <eol-date>2001-12-13</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
+    </devices>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>12000000</cpu>
+        <ram>4194304</ram>
+        <storage>41943040</storage>
+      </minimum>
+    </resources>
+  </os>
+
+  <os id="http://microsoft.com/win/98";>
+    <short-id>win98</short-id>
+    <name>Microsoft Windows 98</name>
+    <version>4.1</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/95"/>
+    <upgrades id="http://microsoft.com/win/95"/>
+
+    <release-date>1998-06-25</release-date>
+    <eol-date>2006-07-11</eol-date>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>66000000</cpu>
+        <ram>16777216</ram>
+        <storage>125829120</storage>
+      </minimum>
+      <recommended>
+        <cpu>233000000</cpu>
+        <ram>25165824</ram>
+        <storage>419430400</storage>
+      </recommended>
+    </resources>
+  </os>
+
+  <os id="http://microsoft.com/win/me";>
+    <short-id>winme</short-id>
+    <name>Microsoft Windows Millennium Edition</name>
+    <version>4.9</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/98"/>
+    <upgrades id="http://microsoft.com/win/98"/>
+
+    <release-date>2000-09-14</release-date>
+    <eol-date>2006-07-11</eol-date>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>150000000</cpu>
+        <ram>33554432</ram>
+        <storage>335544320</storage>
+      </minimum>
+      <recommended>
+        <cpu>300000000</cpu>
+        <ram>67108864</ram>
+        <storage>2147483648</storage>
+      </recommended>
+    </resources>
+  </os>
+
+
+  <os id="http://microsoft.com/win/2k";>
+    <short-id>win2k</short-id>
+    <name>Microsoft Windows 2000</name>
+    <version>5.0</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/me"/>
+
+    <release-date>2000-02-17</release-date>
+    <eol-date>2010-07-13</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
+    </devices>
+
+    <media arch="i386">
+      <iso>
+          <volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
+      </iso>
+    </media>
+
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>33554432</ram>
+        <storage>335544320</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>350000000</cpu>
+        <ram>100663296</ram>
+        <storage>1073741824</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+    </installer>
+  </os>
+
+
+  <os id="http://microsoft.com/win/xp";>
+    <short-id>winxp</short-id>
+    <name>Microsoft Windows XP</name>
+    <version>5.1</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k"/>
+    <derives-from id="http://microsoft.com/win/me"/>
+    <upgrades id="http://microsoft.com/win/me"/>
+
+    <release-date>2001-10-25</release-date>
+    <eol-date>2009-04-19</eol-date>
+
+    <media arch="i386" installer-reboots="2">
+      <iso>
+          <volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <media arch="x86_64" installer-reboots="2">
+      <iso>
+        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>233000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>1610612736</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>300000000</cpu>
+        <ram>134217728</ram>
+        <storage>2147483648</storage>
+      </recommended>
+    </resources>
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>733000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>268435456</ram>
+        <storage>1610612736</storage>
+      </minimum>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://microsoft.com/win/2k3";>
+    <short-id>win2k3</short-id>
+    <name>Microsoft Windows Server 2003</name>
+    <version>5.2</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k"/>
+    <upgrades id="http://microsoft.com/win/2k"/>
+
+    <release-date>2003-04-24</release-date>
+    <eol-date>2015-07-14</eol-date>
+
+    <media arch="i386">
+      <iso>
+          <volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+          <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+    <media arch="ia64">
+      <iso>
+        <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>2147483648</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>550000000</cpu>
+        <ram>268435456</ram>
+        <storage>4294967296</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>4294967296</storage>
+      </minimum>
+
+      <recommended>
+        <storage>8589934592</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://microsoft.com/win/2k3r2";>
+    <short-id>win2k3r2</short-id>
+    <name>Microsoft Windows Server 2003 R2</name>
+    <version>5.2</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k3"/>
+    <upgrades id="http://microsoft.com/win/2k3"/>
+
+    <release-date>2005-12-06</release-date>
+    <eol-date>2015-07-14</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>2147483648</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>550000000</cpu>
+        <ram>268435456</ram>
+        <storage>4294967296</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>4294967296</storage>
+      </minimum>
+
+      <recommended>
+        <storage>8589934592</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://microsoft.com/win/2k8";>
+    <short-id>win2k8</short-id>
+    <name>Microsoft Windows Server 2008</name>
+    <version>6.0</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k3r2"/>
+    <upgrades id="http://microsoft.com/win/2k3r2"/>
+
+    <release-date>2008-02-27</release-date>
+    <eol-date>2013-07-09</eol-date>
+
+    <media arch="i386">
+      <iso>
+        <volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1400000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://microsoft.com/win/2k8r2";>
+    <short-id>win2k8r2</short-id>
+    <name>Microsoft Windows Server 2008 R2</name>
+    <version>6.1</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k8"/>
+    <upgrades id="http://microsoft.com/win/2k8"/>
+
+    <release-date>2009-10-22</release-date>
+    <eol-date>2013-07-09</eol-date>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+    <media arch="ia64">
+      <iso>
+        <volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1400000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://microsoft.com/win/vista";>
+    <short-id>winvista</short-id>
+    <name>Microsoft Windows Vista</name>
+    <version>6.0</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/xp"/>
+    <upgrades id="http://microsoft.com/win/xp"/>
+
+    <release-date>2006-11-30</release-date>
+    <eol-date>2012-04-10</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+
+    <resources arch="all">
+      <minimum>
+        <cpu>800000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>16106127360</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend'/>
+    </installer>
+  </os>
+
+  <os id="http://microsoft.com/win/7";>
+    <short-id>win7</short-id>
+    <name>Microsoft Windows 7</name>
+    <version>6.1</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/vista"/>
+    <upgrades id="http://microsoft.com/win/vista"/>
+
+    <release-date>2009-10-22</release-date>
+    <eol-date>2015-01-13</eol-date>
+
+    <media arch="i386" installer-reboots="2">
+      <iso>
+        <volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <iso>
+        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+
+  <os id="http://microsoft.com/win/8";>
+    <short-id>win8</short-id>
+    <name>Microsoft Windows 8</name>
+    <version>6.2</version>
+    <vendor>Microsoft Corporation</vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/7"/>
+    <upgrades id="http://microsoft.com/win/7"/>
+
+<!--
+    <release-date></release-date>
+    <eol-date></eol-date>
+-->
+
+    <media arch="i386">
+      <iso>
+        <volume-id>HB1_CCPA_X86FRE_EN</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>HB1_CCPA_X64FRE_EN</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+      </iso>
+    </media>
+
+    <resources arch="i386">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend'/>
+    </installer>
+  </os>
+
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88dfb7e..e297640 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,3 +27,29 @@ osinfo/osinfo_resources.c
 osinfo/osinfo_resourceslist.c
 osinfo/osinfo_tree.c
 osinfo/osinfo_treelist.c
+data/oses/netware.xml.in
+data/oses/solaris.xml.in
+data/oses/dos.xml.in
+data/oses/mandrake.xml.in
+data/oses/mandriva.xml.in
+data/oses/suse.xml.in
+data/oses/gnome.xml.in
+data/oses/rhel.xml.in
+data/oses/fedora.xml.in
+data/oses/windows.xml.in
+data/oses/opensuse.xml.in
+data/oses/macos.xml.in
+data/oses/debian.xml.in
+data/oses/ubuntu.xml.in
+data/oses/centos.xml.in
+data/oses/openbsd.xml.in
+data/oses/freebsd.xml.in
+data/oses/rhl.xml.in
+data/oses/netbsd.xml.in
+data/devices/qemu-ps2.xml.in
+data/devices/qemu-pci.xml.in
+data/devices/virtio-pci.xml.in
+data/devices/qemu-usb.xml.in
+data/devices/xen.xml.in
+data/hypervisors/rhel-xen.xml.in
+data/hypervisors/xen.xml.in
-- 
1.7.12.1


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