diff --git a/modify-volume-id-for-windows.patch b/modify-volume-id-for-windows.patch
new file mode 100644
index 0000000..ab39298
--- /dev/null
+++ b/modify-volume-id-for-windows.patch
@@ -0,0 +1,144 @@
+diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-10.xml osinfo-db-20180311/os/microsoft.com/win-10.xml
+--- osinfo-db-20180311-org/os/microsoft.com/win-10.xml 2018-04-04 17:46:41.451731061 -0400
++++ osinfo-db-20180311/os/microsoft.com/win-10.xml 2018-04-04 17:40:50.358930629 -0400
+@@ -68,7 +68,7 @@
+
+
+
+- (J_)?CEDN?A_X64FRE_
++ (J_)?CEDN?A_X64FREE?_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+
+@@ -120,7 +120,7 @@
+
+
+
+- (J_)?(CCSN?A|CCOMA)_X64FRE_
++ (J_)?(CCSN?A|CCOMA)_X64FREE?_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+
+diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k12r2.xml osinfo-db-20180311/os/microsoft.com/win-2k12r2.xml
+--- osinfo-db-20180311-org/os/microsoft.com/win-2k12r2.xml 2018-04-04 17:46:41.451731061 -0400
++++ osinfo-db-20180311/os/microsoft.com/win-2k12r2.xml 2018-04-04 17:48:15.943930299 -0400
+@@ -68,7 +68,7 @@
+
+
+
+- (IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_
++ (IRM_SSS_X64FREE?|IRM_SSS_X64CHK|IR3_SSS_X64FREE?|IR5_SSS_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+@@ -76,7 +76,7 @@
+
+
+
+- (IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_
++ (IRM_SSSO_X64CHK|IR5_SSSO_X64FREE?|IRM_SSSO_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+@@ -84,7 +84,7 @@
+
+
+
+- (IRM_SHV_X64CHK|IRM_SHV_X64FRE)_
++ (IRM_SHV_X64CHK|IRM_SHV_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+@@ -92,7 +92,7 @@
+
+
+
+- (IR5_SSS_X64FREV|IR2_SSS_X64FREV)_
++ (IR5_SSS_X64FREV|IR2_SSS_X64FREV|IR1_SSS_X64FREV)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k12.xml osinfo-db-20180311/os/microsoft.com/win-2k12.xml
+--- osinfo-db-20180311-org/os/microsoft.com/win-2k12.xml 2018-04-04 17:46:41.451731061 -0400
++++ osinfo-db-20180311/os/microsoft.com/win-2k12.xml 2018-04-04 17:41:43.167048199 -0400
+@@ -68,7 +68,7 @@
+
+
+
+- (HRM_SSS_X64CHK|HRM_SSS_X64FRE)_
++ (HRM_SSS_X64CHK|HRM_SSS_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+@@ -77,7 +77,7 @@
+
+
+
+- (HRM_SSSO_X64FRE)_
++ (HRM_SSSO_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+@@ -85,7 +85,7 @@
+
+
+
+- (HRM_SHV_X64CHK|HRM_SHV_X64FRE)_
++ (HRM_SHV_X64CHK|HRM_SHV_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k16.xml osinfo-db-20180311/os/microsoft.com/win-2k16.xml
+--- osinfo-db-20180311-org/os/microsoft.com/win-2k16.xml 2018-04-04 17:46:41.451731061 -0400
++++ osinfo-db-20180311/os/microsoft.com/win-2k16.xml 2018-04-04 17:39:19.718809457 -0400
+@@ -28,7 +28,7 @@
+
+
+
+- ^(SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_
++ ^(SSS_X64CHK|SSS_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+@@ -36,7 +36,7 @@
+
+
+
+- ^(SESS_X64FRE)_
++ ^(SESS_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+@@ -44,7 +44,7 @@
+
+
+
+- ^(SHV_X64CHK|SHV_X64FRE)_
++ ^(SHV_X64CHK|SHV_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]]*_([[:upper:]]*)
+
+diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-8.1.xml osinfo-db-20180311/os/microsoft.com/win-8.1.xml
+--- osinfo-db-20180311-org/os/microsoft.com/win-8.1.xml 2018-04-04 17:46:41.451731061 -0400
++++ osinfo-db-20180311/os/microsoft.com/win-8.1.xml 2018-04-04 17:39:44.510843045 -0400
+@@ -148,7 +148,7 @@
+
+
+
+- (IR[M35]_CCSN?A_X64FRE)_
++ (IR[M35]_CCSN?A_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+
+diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-8.xml osinfo-db-20180311/os/microsoft.com/win-8.xml
+--- osinfo-db-20180311-org/os/microsoft.com/win-8.xml 2018-04-04 17:46:41.451731061 -0400
++++ osinfo-db-20180311/os/microsoft.com/win-8.xml 2018-04-04 17:42:28.079156558 -0400
+@@ -78,7 +78,7 @@
+
+
+
+- (HB1_CCPA_X64FRE|HRM_CCSN?A_X64FRE)_
++ (HB1_CCPA_X64FREE?|HRM_CCSN?A_X64FREE?)_
+ MICROSOFT CORPORATION
+ [[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)
+
diff --git a/osinfo-db.changes b/osinfo-db.changes
index da72bbd..4e67152 100644
--- a/osinfo-db.changes
+++ b/osinfo-db.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr 4 22:15:01 UTC 2018 - lyan@suse.com
+
+- bsc#974580 - modify volume id for some windows iso files
+ First, use "X64FREE?" instead of "X64FRE".
+ Second, add "IR1_SSS_X64FREV_EN-US_DV5".
+ modify-volume-id-for-windows.patch
+
-------------------------------------------------------------------
Fri Mar 23 13:51:30 MDT 2018 - carnold@suse.com
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 69dd6df..e59e816 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -29,6 +29,7 @@ Patch20: add-caasp-support.patch
Patch21: add-opensuse-leap-15-support.patch
Patch22: add-sle15-support.patch
Patch23: add-oes-support.patch
+Patch24: modify-volume-id-for-windows.patch
BuildRequires: intltool
BuildRequires: osinfo-db-tools
@@ -43,6 +44,7 @@ provisioning of new virtual machines
%patch21 -p1
%patch22 -p1
%patch23 -p1
+%patch24 -p1
%build
cd %{_builddir}