diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
index 993985e9..2708ea04 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
@@ -766,6 +766,7 @@
       <repopackage name="yum-metadata-parser"/>
       <repopackage name="zypper"/>
       <repopackage name="openSUSE-Tumbleweed-Kubic-release" addarch="x86_64"/>
+      <repopackage name="openSUSE-Tumbleweed-Kubic-release-dvd" addarch="x86_64"/>
     </repopackages>
   </instsource>
 </image>
diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec b/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
index fdbaf58d..f5d0954f 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec
@@ -43,6 +43,7 @@ Provides:       product-label() = openSUSE%20Tumbleweed%20Kubic
 Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180320
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-endoflife()
+Requires:       product_flavor(openSUSE-Tumbleweed-Kubic)
 
 
 
@@ -55,6 +56,27 @@ openSUSE Tumbleweed Kubic combines the benefits of a rolling
       openSUSE Tumbleweed while redefining the operating system into a small,
       efficient and reliable distribution.
 
+%package dvd
+License:        BSD-3-Clause
+Group:          System/Fhs
+Provides:       product_flavor()
+Provides:       flavor(dvd)
+Provides:       product_flavor(openSUSE-Tumbleweed-Kubic) = 20180320-0
+Summary:        openSUSE Tumbleweed Kubic
+
+%description dvd
+openSUSE Tumbleweed Kubic combines the benefits of a rolling
+      OS with a container orchestration platform.
+
+      It is a modern Linux Operating System, designed for containers and
+      optimized for large, clustered deployments.  It inherits the benefits of
+      openSUSE Tumbleweed while redefining the operating system into a small,
+      efficient and reliable distribution.
+
+%files dvd
+%defattr(-,root,root)
+%doc %{_defaultdocdir}/openSUSE-Tumbleweed-Kubic-release-dvd
+
 
 
 %prep
@@ -132,6 +154,7 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Tumbleweed-Kubic.prod << EOF
   </urls>
   <buildconfig>
     <producttheme>Kubic</producttheme>
+    <create_flavors>true</create_flavors>
   </buildconfig>
   <installconfig>
     <defaultlang>en_US</defaultlang>
@@ -145,6 +168,12 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-Tumbleweed-Kubic.prod << EOF
 
 EOF
 
+mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-Tumbleweed-Kubic-release-dvd
+cat >$RPM_BUILD_ROOT/%{_defaultdocdir}/openSUSE-Tumbleweed-Kubic-release-dvd/README << EOF
+This package only exists for providing the product flavor 'dvd'.
+
+EOF
+
 
 
 %files
diff --git a/_service:product_converter:openSUSE-release.spec b/_service:product_converter:openSUSE-release.spec
index ae22cda2..f5ef778c 100644
--- a/_service:product_converter:openSUSE-release.spec
+++ b/_service:product_converter:openSUSE-release.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openSUSE
+# spec file for package openSUSE-release
 #
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
diff --git a/openSUSE-Tumbleweed-Kubic.product b/openSUSE-Tumbleweed-Kubic.product
index f58ee933..497138cb 100644
--- a/openSUSE-Tumbleweed-Kubic.product
+++ b/openSUSE-Tumbleweed-Kubic.product
@@ -33,7 +33,8 @@
 
       <buildconfig>
         <!-- This section is needed to generate the installation media -->
-        <producttheme>Kubic</producttheme>
+	<producttheme>Kubic</producttheme>
+	<create_flavors>true</create_flavors>
       </buildconfig>
 
       <installconfig>
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 1d2af09b..9340d8f4 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openSUSE
+# spec file for package openSUSE-release
 #
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #