diff --git a/SOURCES/add-windows-8.1-support.patch b/SOURCES/add-windows-8.1-support.patch
new file mode 100644
index 0000000..046c977
--- /dev/null
+++ b/SOURCES/add-windows-8.1-support.patch
@@ -0,0 +1,526 @@
+From 723e77d540e5d410a35884c7c60a865ea3b926fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano@fidencio.org>
+Date: Sat, 5 Oct 2013 02:54:42 +0200
+Subject: [PATCH] win8.1: Add Windows 8.1 support
+
+This commit adds the volume IDs and test cases data for the
+Windows 8.1 ISOs I have access in MSDN
+---
+ data/oses/windows.xml.in                           | 58 ++++++++++++++++++++++
+ ...indows_8_1_enterprise_n_x64_dvd_2791038.iso.txt | 29 +++++++++++
+ ...indows_8_1_enterprise_n_x86_dvd_2791297.iso.txt | 29 +++++++++++
+ ..._windows_8_1_enterprise_x64_dvd_2791088.iso.txt | 29 +++++++++++
+ ..._windows_8_1_enterprise_x86_dvd_2791510.iso.txt | 29 +++++++++++
+ .../en_windows_8_1_n_x64_dvd_2707896.iso.txt       | 29 +++++++++++
+ .../en_windows_8_1_n_x86_dvd_2707895.iso.txt       | 29 +++++++++++
+ ...en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt | 29 +++++++++++
+ ...en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt | 29 +++++++++++
+ .../en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt  | 29 +++++++++++
+ .../en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt  | 29 +++++++++++
+ .../win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt  | 29 +++++++++++
+ .../win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt  | 30 +++++++++++
+ 13 files changed, 407 insertions(+)
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
+ create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
+
+diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
+index 67c491d..11b78f1 100644
+--- a/data/oses/windows.xml.in
++++ b/data/oses/windows.xml.in
+@@ -794,4 +794,62 @@
+     </installer>
+   </os>
+ 
++  <os id="http://microsoft.com/win/8.1">
++    <short-id>win8.1</short-id>
++    <_name>Microsoft Windows 8.1</_name>
++    <version>6.3</version>
++    <_vendor>Microsoft Corporation</_vendor>
++    <family>winnt</family>
++    <distro>win</distro>
++    <derives-from id="http://microsoft.com/win/8"/>
++    <upgrades id="http://microsoft.com/win/8"/>
++
++<!--
++    <release-date></release-date>
++    <eol-date></eol-date>
++-->
++
++    <media arch="i686">
++      <iso>
++        <volume-id>(IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE)_</volume-id>
++        <publisher-id>MICROSOFT CORPORATION</publisher-id>
++        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
++      </iso>
++    </media>
++    <media arch="x86_64">
++      <iso>
++        <volume-id>(IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE)_</volume-id>
++        <publisher-id>MICROSOFT CORPORATION</publisher-id>
++        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
++      </iso>
++    </media>
++
++    <resources arch="i686">
++      <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>
++
+ </libosinfo>
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
+new file mode 100644
+index 0000000..8ce042b
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2791038.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CENNA_X64FREV_EN-US_DV5
++Volume set id: IRM_CENNA_X64FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1786974
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 86A 2154
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
+new file mode 100644
+index 0000000..c66365c
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2791297.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CENNA_X86FREV_EN-US_DV5
++Volume set id: IRM_CENNA_X86FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1335349
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 5B4 1460
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
+new file mode 100644
+index 0000000..98f78ca
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x64_dvd_2791088.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CENA_X64FREV_EN-US_DV5
++Volume set id: IRM_CENA_X64FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1854597
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 86A 2154
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
+new file mode 100644
+index 0000000..718b2d3
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2791510.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CENA_X86FREV_EN-US_DV5
++Volume set id: IRM_CENA_X86FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1381065
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 5B4 1460
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
+new file mode 100644
+index 0000000..e794483
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_n_x64_dvd_2707896.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CCSNA_X64FRE_EN-US_DV5
++Volume set id: IRM_CCSNA_X64FRE_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1810774
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 86A 2154
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
+new file mode 100644
+index 0000000..b71129e
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_n_x86_dvd_2707895.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CCSNA_X86FRE_EN-US_DV5
++Volume set id: IRM_CCSNA_X86FRE_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1353462
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 5B4 1460
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
+new file mode 100644
+index 0000000..e3da298
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2791264.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CPRNA_X64FREV_EN-US_DV5
++Volume set id: IRM_CPRNA_X64FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1785996
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 86A 2154
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
+new file mode 100644
+index 0000000..abc0a0a
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2791509.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CPRNA_X86FREV_EN-US_DV5
++Volume set id: IRM_CPRNA_X86FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1334550
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 5B4 1460
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
+new file mode 100644
+index 0000000..f316eb4
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2791292.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CPRA_X64FREV_EN-US_DV5
++Volume set id: IRM_CPRA_X64FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1853637
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 86A 2154
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
+new file mode 100644
+index 0000000..0cf82db
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2791634.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CPRA_X86FREV_EN-US_DV5
++Volume set id: IRM_CPRA_X86FREV_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1380291
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 5B4 1460
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
+new file mode 100644
+index 0000000..5449da1
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_x64_dvd_2707217.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CCSA_X64FRE_EN-US_DV5
++Volume set id: IRM_CCSA_X64FRE_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1903953
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 86A 2154
+diff --git a/test/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
+new file mode 100644
+index 0000000..82cc49e
+--- /dev/null
++++ b/test/isodata/windows/win8.1/en_windows_8_1_x86_dvd_2707392.iso.txt
+@@ -0,0 +1,30 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: IRM_CCSA_X86FRE_EN-US_DV5
++Volume set id: IRM_CCSA_X86FRE_EN-US_DV5
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.53 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1423404
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 5B4 1460
++
+-- 
+1.8.5.3
+
diff --git a/SOURCES/fedora-win7-Improve-add-data.patch b/SOURCES/fedora-win7-Improve-add-data.patch
new file mode 100644
index 0000000..244ece6
--- /dev/null
+++ b/SOURCES/fedora-win7-Improve-add-data.patch
@@ -0,0 +1,175 @@
+From 179a83b02a01769836473b59f03c887e1070a4c8 Mon Sep 17 00:00:00 2001
+From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
+Date: Tue, 10 Sep 2013 04:40:51 +0300
+Subject: [PATCH] fedora,win7: Improve & add data
+
+---
+ data/oses/fedora.xml.in                            | 89 ++++++++++++++++++++--
+ data/oses/windows.xml.in                           |  2 +-
+ ..._enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng |  2 +
+ ..._enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt | 29 +++++++
+ 4 files changed, 115 insertions(+), 7 deletions(-)
+ create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
+ create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
+
+diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
+index ae4256d..e5456fe 100644
+--- a/data/oses/fedora.xml.in
++++ b/data/oses/fedora.xml.in
+@@ -1445,14 +1445,91 @@
+     <resources arch="all">
+       <minimum>
+         <n-cpus>1</n-cpus>
+-        <ram>805306368</ram>
++        <cpu>1000000000</cpu>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
+       </minimum>
++    </resources>
+ 
+-      <recommended>
+-        <cpu>400000000</cpu>
+-        <ram>1207959552</ram>
+-        <storage>9663676416</storage>
+-      </recommended>
++    <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/20">
++    <short-id>fedora20</short-id>
++    <_name>Fedora 20</_name>
++    <version>20</version>
++    <_vendor>Fedora Project</_vendor>
++    <family>linux</family>
++    <distro>fedora</distro>
++    <codename>Heisenbug</codename>
++    <upgrades id="http://fedoraproject.org/fedora/19"/>
++    <derives-from id="http://fedoraproject.org/fedora/19"/>
++
++    <media arch="i686">
++      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso</url> -->
++      <iso>
++        <volume-id>Fedora 20.* 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/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso</url> -->
++      <iso>
++        <volume-id>Fedora 20.* 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/20/Live/i386/Fedora-Live-Desktop-i686-20-1.iso</url> -->
++      <iso>
++        <volume-id>Fedora-Live-.*-i686-20</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/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso</url> -->
++      <iso>
++        <volume-id>Fedora-Live-.*-x86_64-20</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/20/Fedora/i386/os/</url> -->
++      <treeinfo>
++        <family>Fedora</family>
++        <version>20</version>
++        <arch>i386</arch>
++      </treeinfo>
++    </tree>
++    <tree arch="x86_64">
++      <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/os/</url> -->
++      <treeinfo>
++        <family>Fedora</family>
++        <version>20</version>
++        <arch>x86_64</arch>
++      </treeinfo>
++    </tree>
++
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
++      </minimum>
+     </resources>
+ 
+     <installer>
+diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
+index 26d4410..002227b 100644
+--- a/data/oses/windows.xml.in
++++ b/data/oses/windows.xml.in
+@@ -745,7 +745,7 @@
+     </media>
+     <media arch="x86_64" installer-reboots="2">
+       <iso>
+-        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_</volume-id>
++        <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL|GSP1RMCNENXVOL)_</volume-id>
+         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+       </iso>
+diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
+new file mode 100644
+index 0000000..e46008a
+--- /dev/null
++++ b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
+@@ -0,0 +1,2 @@
++[general]
++l10n-language=en_US
+diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
+new file mode 100644
+index 0000000..9f8097c
+--- /dev/null
++++ b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: 
++Volume id: GSP1RMCNENXVOL_EN_DVD
++Volume set id: GSP1RMCNENXVOL_EN_DVD
++Publisher id: MICROSOFT CORPORATION
++Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
++Application id: CDIMAGE 2.54 (01/01/2005 TM)
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1049368
++El Torito VD version 1 found, boot catalog is in sector 22
++NO Joliet present
++NO Rock Ridge present
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID 'Microsoft Corporation'
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 8
++        Bootoff 2DF 735
+-- 
+1.8.4.2
+
diff --git a/SOURCES/install-script-rhel-Fix-for-Server-7.0.patch b/SOURCES/install-script-rhel-Fix-for-Server-7.0.patch
new file mode 100644
index 0000000..959600c
--- /dev/null
+++ b/SOURCES/install-script-rhel-Fix-for-Server-7.0.patch
@@ -0,0 +1,54 @@
+From 0403a05d466e8c24ee721a9541e8b4a322b58125 Mon Sep 17 00:00:00 2001
+From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
+Date: Fri, 22 Nov 2013 13:35:21 +0000
+Subject: [PATCH 2/2] install-script,rhel: Fix for 'Server' & 7.0
+
+---
+ data/install-scripts/rhel.xml | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/data/install-scripts/rhel.xml b/data/install-scripts/rhel.xml
+index 980814b..840344b 100644
+--- a/data/install-scripts/rhel.xml
++++ b/data/install-scripts/rhel.xml
+@@ -51,6 +51,7 @@
+         <xsl:template match="/install-script-config">
+ # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
+ install
++cdrom
+ text
+ <!-- FIXME: RHEL requires keyboard layout to be a console layout so to do this right, we'll need
+             mapping from language to console layout. -->
+@@ -152,6 +153,7 @@ reboot
+         <xsl:template match="/install-script-config">
+ # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
+ install
++cdrom
+ keyboard us
+ lang <xsl:value-of select="config/l10n-language"/>
+ network --onboot yes --device eth0 --bootproto dhcp --noipv6 --hostname=<xsl:value-of select="config/hostname"/>
+@@ -176,13 +178,19 @@ reboot
+ %packages
+ @core
+ @x11
++<xsl:choose>
++  <xsl:when test="os/version &lt; 7">
+ @basic-desktop
+ @general-desktop
+ @desktop-platform
+-@internet-applications
++  </xsl:when>
++  <xsl:otherwise>
++@gnome-desktop
++@multimedia
++  </xsl:otherwise>
++</xsl:choose>
+ @internet-browser
+ @input-methods
+-@office-suite
+ 
+ %end
+ 
+-- 
+1.8.4.2
+
diff --git a/SOURCES/rhel-Add-info-on-6.5-and-7.0.patch b/SOURCES/rhel-Add-info-on-6.5-and-7.0.patch
new file mode 100644
index 0000000..1f7658b
--- /dev/null
+++ b/SOURCES/rhel-Add-info-on-6.5-and-7.0.patch
@@ -0,0 +1,141 @@
+From 3133d9d9f2ba7071103779f8571094b1497d8141 Mon Sep 17 00:00:00 2001
+From: Giuseppe Scrivano <gscrivan@redhat.com>
+Date: Thu, 10 Oct 2013 17:40:06 +0200
+Subject: [PATCH 1/2] rhel: Add info on 6.5 and 7.0
+
+Also fix RHEL 5.8 data.
+---
+ data/oses/rhel.xml.in | 112 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 110 insertions(+), 2 deletions(-)
+
+diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
+index 6985404..d1942b7 100644
+--- a/data/oses/rhel.xml.in
++++ b/data/oses/rhel.xml.in
+@@ -638,8 +638,8 @@
+     <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"/>
++    <upgrades id="http://redhat.com/rhel/5.7"/>
++    <derives-from id="http://redhat.com/rhel/5.7"/>
+ 
+     <release-date>2012-02-21</release-date>
+     <eol-date>2020-03-31</eol-date>
+@@ -914,4 +914,112 @@
+       <script id='http://redhat.com/scripts/rhel/desktop'/>
+     </installer>
+   </os>
++
++  <os id="http://redhat.com/rhel/6.5">
++    <short-id>rhel6.5</short-id>
++    <_name>Red Hat Enterprise Linux 6.5</_name>
++    <version>6.5</version>
++    <_vendor>Red Hat, Inc</_vendor>
++    <family>linux</family>
++    <distro>rhel</distro>
++    <codename>Santiago</codename>
++    <upgrades id="http://redhat.com/rhel/6.4"/>
++    <derives-from id="http://redhat.com/rhel/6.4"/>
++
++    <release-date>2013-11-21</release-date>
++    <eol-date>2023-11-30</eol-date>
++
++    <media arch="i686">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL_6.5 i386.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL_6.5 x86_64.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <ram>536870912</ram>
++      </minimum>
++
++      <recommended>
++        <cpu>400000000</cpu>
++        <ram>1073741824</ram>
++        <storage>9663676416</storage>
++      </recommended>
++    </resources>
++
++    <installer>
++      <script id='http://redhat.com/scripts/rhel/jeos'/>
++      <script id='http://redhat.com/scripts/rhel/desktop'/>
++    </installer>
++  </os>
++
++  <!-- If you add a new 6.x entry here, please don't forget to update the
++       'upgrades' node under 'rhel7.0' entry below. -->
++
++  <os id="http://redhat.com/rhel/7.0">
++    <short-id>rhel7.0</short-id>
++    <_name>Red Hat Enterprise Linux 7.0</_name>
++    <version>7.0</version>
++    <_vendor>Red Hat, Inc</_vendor>
++    <family>linux</family>
++    <distro>rhel</distro>
++    <upgrades id="http://redhat.com/rhel/6.5"/>
++
++    <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 -->
++      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
++      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
++      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
++    </devices>
++
++    <media arch="i686">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.0.*i386.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.0.*x86_64.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>400000000</cpu>
++        <ram>1073741824</ram>
++        <storage>9663676416</storage>
++      </recommended>
++    </resources>
++
++    <installer>
++      <script id='http://redhat.com/scripts/rhel/jeos'/>
++      <script id='http://redhat.com/scripts/rhel/desktop'/>
++    </installer>
++  </os>
+ </libosinfo>
+-- 
+1.8.4.2
+
diff --git a/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch b/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch
new file mode 100644
index 0000000..a58e414
--- /dev/null
+++ b/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch
@@ -0,0 +1,114 @@
+From 993d27a8a900e3bf7f858e81129dcbbcb6daddcd Mon Sep 17 00:00:00 2001
+From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
+Date: Thu, 9 Jan 2014 16:24:25 +0000
+Subject: [PATCH] Remove unsigned drivers from unsecure locations
+
+---
+ data/oses/windows.xml.in | 84 ------------------------------------------------
+ 1 file changed, 84 deletions(-)
+
+diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
+index 002227b..67c491d 100644
+--- a/data/oses/windows.xml.in
++++ b/data/oses/windows.xml.in
+@@ -381,50 +381,6 @@
+       <script id='http://microsoft.com/windows/reg/desktop'/>
+       <script id='http://microsoft.com/windows/cmd/desktop'/>
+     </installer>
+-
+-    <!-- virtio block device driver -->
+-    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/winxp/x86" pre-installable="true" signed="false">
+-      <file>viostor.cat</file>
+-      <file>viostor.inf</file>
+-      <file>viostor.sys</file>
+-      <!-- For now we require this for pre-installation but we should probably generate this too -->
+-      <file>txtsetup.oem</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-    </driver>
+-
+-    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/winxp/amd64" pre-installable="true" signed="false">
+-      <file>viostor.cat</file>
+-      <file>viostor.inf</file>
+-      <file>viostor.sys</file>
+-      <!-- For now we require this for pre-installation but we should probably generate this too -->
+-      <file>txtsetup.oem</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-    </driver>
+-
+-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+-    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-      <file>spice-guest-tools-0.52.exe</file>
+-      <file>spice-guest-tools-0.52.cmd</file>
+-      <file>redhat09.cer</file>
+-      <file>redhat10.cer</file>
+-      <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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+-    </driver>
+-
+-    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-      <file>spice-guest-tools-0.52.exe</file>
+-      <file>spice-guest-tools-0.52.cmd</file>
+-      <file>redhat09.cer</file>
+-      <file>redhat10.cer</file>
+-      <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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+-    </driver>
+   </os>
+ 
+   <os id="http://microsoft.com/win/2k3">
+@@ -778,46 +734,6 @@
+       <script id='http://microsoft.com/windows/unattend/desktop'/>
+       <script id='http://microsoft.com/windows/cmd/desktop'/>
+     </installer>
+-
+-    <!-- virtio block device driver -->
+-    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/win7/x86" pre-installable="true" signed="false">
+-      <file>viostor.cat</file>
+-      <file>viostor.inf</file>
+-      <file>viostor.sys</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-    </driver>
+-
+-    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/win7/amd64" pre-installable="true" signed="false">
+-      <file>viostor.cat</file>
+-      <file>viostor.inf</file>
+-      <file>viostor.sys</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-    </driver>
+-
+-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+-    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-      <file>spice-guest-tools-0.52.exe</file>
+-      <file>spice-guest-tools-0.52.cmd</file>
+-      <file>redhat09.cer</file>
+-      <file>redhat10.cer</file>
+-      <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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+-    </driver>
+-
+-    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-      <file>spice-guest-tools-0.52.exe</file>
+-      <file>spice-guest-tools-0.52.cmd</file>
+-      <file>redhat09.cer</file>
+-      <file>redhat10.cer</file>
+-      <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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+-    </driver>
+   </os>
+ 
+   <os id="http://microsoft.com/win/8">
+-- 
+1.8.4.2
+
diff --git a/SOURCES/win8.1-disable-unattended-installer.patch b/SOURCES/win8.1-disable-unattended-installer.patch
new file mode 100644
index 0000000..b25ea0d
--- /dev/null
+++ b/SOURCES/win8.1-disable-unattended-installer.patch
@@ -0,0 +1,33 @@
+From 49ae46cda4fbd2e95dc794cb64aec27117351c85 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Fri, 21 Feb 2014 16:29:36 +0100
+Subject: [PATCH] win8.1: Disable unattended installation
+
+When win8.1 entry was added it was mostly a c&p from a previous
+version and the installer part was mistakenly also copied. Since
+win8.1 unattended installation has never been tested and some people
+have reported it not to work, lets disable it for now and re-enable
+when we assure it works.
+---
+ data/oses/windows.xml.in | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
+index 723d1dc..b7d5c21 100644
+--- a/data/oses/windows.xml.in
++++ b/data/oses/windows.xml.in
+@@ -1013,11 +1013,6 @@
+     <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>
+ 
+ </libosinfo>
+-- 
+1.8.5.3
+
diff --git a/SPECS/libosinfo.spec b/SPECS/libosinfo.spec
index e7bfe49..cfe11d7 100644
--- a/SPECS/libosinfo.spec
+++ b/SPECS/libosinfo.spec
@@ -18,7 +18,7 @@
 Summary: A library for managing OS information for virtualization
 Name: libosinfo
 Version: 0.2.7
-Release: 2%{?dist}%{?extra_release}
+Release: 10%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: https://fedorahosted.org/releases/l/i/%{name}/%{name}-%{version}.tar.gz
@@ -41,6 +41,30 @@ Requires: hwdata
 Requires: udev
 %endif
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1015055
+# RHEL7 dvd iso not recognized
+Patch0: rhel-Add-info-on-6.5-and-7.0.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1033007
+# Boxes support for RHEL7 express install
+Patch1: install-script-rhel-Fix-for-Server-7.0.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1047774
+# OS detection fails for a Windows 7 ISO
+Patch2: fedora-win7-Improve-add-data.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1066042
+# support windows 8.1 in libosinfo
+Patch3: add-windows-8.1-support.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1066042
+# 1067431 - cannot install win 8.1
+Patch4: win8.1-disable-unattended-installer.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1032524
+# Don't advertise unsigned drivers from unsecure locations
+Patch5: rm-unsigned-drivers-from-unsecure-locations.patch
+
 %description
 libosinfo is a library that allows virtualization provisioning tools to
 determine the optimal device settings for a hypervisor/operating system
@@ -74,6 +98,12 @@ This package provides the Vala bindings for libosinfo library.
 
 %prep
 %setup -q
+%patch0 -p1 -b .add-info-on-rhel-6.5-and-7.0
+%patch1 -p1 -b .fix-install-script-for-rhel-server-and-7.0
+%patch2 -p1 -b .fedora-win7-Improve-add-data
+%patch3 -p1 -b .add-windows-8.1-support
+%patch4 -p1 -b .win8.1-disable-unattended-installer
+%patch5 -p1 -b .rm-unsigned-drivers-from-unsecure-locations
 
 %build
 %if %{with_gir}
@@ -160,6 +190,31 @@ rm -fr %{buildroot}
 %{_datadir}/vala/vapi/libosinfo-1.0.vapi
 
 %changelog
+* Fri Feb 28 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-10
+- Rebuild with -fstack-protector-strong (#1070773).
+
+* Fri Feb 28 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-9
+- Remove unsigned drivers from unsecure locations (#1032524).
+
+* Mon Feb 24 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-8
+- Disable unattended installation scripts for Windows 8.1 (#1067431).
+
+* Tue Feb 18 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-7
+- Support windows 8.1 (#1066042).
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.2.7-6
+- Mass rebuild 2014-01-24
+
+* Tue Jan  7 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-5
+- fedora,win7: Improve & add data (#1047774).
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.2.7-4
+- Mass rebuild 2013-12-27
+
+* Thu Dec  5 2013 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-3
+- rhel: Add info on 6.5 and 7.0 (#1015055).
+- install-script,rhel: Fix for 'Server' & 7.0 (#1033007).
+
 * Fri Jul 19 2013 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-2
 - Don't install udev rule in RHEL7+ either (#983169).