diff --git a/openscap-opensuse-cpe.patch b/openscap-opensuse-cpe.patch
index caece96..d1add70 100644
--- a/openscap-opensuse-cpe.patch
+++ b/openscap-opensuse-cpe.patch
@@ -2,7 +2,7 @@ Index: openscap-1.3.5/cpe/openscap-cpe-dict.xml
 ===================================================================
 --- openscap-1.3.5.orig/cpe/openscap-cpe-dict.xml
 +++ openscap-1.3.5/cpe/openscap-cpe-dict.xml
-@@ -53,4 +53,16 @@
+@@ -53,4 +53,20 @@
              <title xml:lang="en-us">Fedora 35</title>
              <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:35</check>
        </cpe-item>
@@ -17,13 +17,17 @@ Index: openscap-1.3.5/cpe/openscap-cpe-dict.xml
 +      <cpe-item name="cpe:/o:opensuse:leap:15.3">
 +            <title xml:lang="en-us">openSUSE Leap 15.3</title>
 +            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:153</check>
++      </cpe-item>
++      <cpe-item name="cpe:/o:opensuse:tumbleweed">
++            <title xml:lang="en-us">openSUSE Tumbleweed</title>
++            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:9999</check>
 +      </cpe-item>
  </cpe-list>
 Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
 ===================================================================
 --- openscap-1.3.5.orig/cpe/openscap-cpe-oval.xml
 +++ openscap-1.3.5/cpe/openscap-cpe-oval.xml
-@@ -690,6 +690,45 @@
+@@ -690,6 +690,58 @@
                          <criterion comment="openSUSE Leap 15.0 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:150"/>
                    </criteria>
              </definition>
@@ -65,11 +69,24 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
 +                  <criteria>
 +                        <criterion comment="openSUSE Leap 15.3 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:153"/>
 +                  </criteria>
++            </definition>
++            <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:9999" version="1">
++                  <metadata>
++                        <title>openSUSE Tumbleweed</title>
++                        <affected family="unix">
++                            <platform>openSUSE Tumbleweed</platform>
++                        </affected>
++                        <reference ref_id="cpe:/o:opensuse:tumbleweed" source="CPE"/>
++                        <description>The operating system installed on the system is openSUSE Tumbleweed</description>
++                  </metadata>
++                  <criteria>
++                        <criterion comment="openSUSE Tumbleweed is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:9999"/>
++                  </criteria>
 +            </definition>
              <definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
                    <metadata>
                          <title>Wind River Linux</title>
-@@ -1087,6 +1126,21 @@
+@@ -1087,6 +1139,26 @@
                    <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
                    <state state_ref="oval:org.open-scap.cpe.opensuse:ste:150"/>
              </rpminfo_test>
@@ -87,11 +104,16 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
 +                  xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
 +                  <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
 +                  <state state_ref="oval:org.open-scap.cpe.opensuse:ste:153"/>
++            </rpminfo_test>
++            <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:9999" version="2" check="at least one" comment="openSUSE-release is openSUSE Tumbleweed"
++                  xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
++                  <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
++                  <state state_ref="oval:org.open-scap.cpe.opensuse:ste:9999"/>
 +            </rpminfo_test>
              <family_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.wrlinux:tst:1" version="1" check="only one"
                    comment="Installed operating system is part of the Unix family."
                    xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
-@@ -1415,6 +1469,15 @@
+@@ -1415,6 +1487,19 @@
              <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:150" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                    <version operation="pattern match">^15.0$</version>
              </rpminfo_state>
@@ -103,6 +125,10 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
 +            </rpminfo_state>
 +            <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:153" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
 +                  <version operation="pattern match">^15.3$</version>
++            </rpminfo_state>
++            <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:9999" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
++              <!-- matching for timestamp -->
++              <version operation="pattern match">^\d{8}$</version>
 +            </rpminfo_state>
              <textfilecontent54_state
                              id="oval:org.open-scap.cpe.wrlinux-release:ste:8"
diff --git a/openscap-suse-cpe.patch b/openscap-suse-cpe.patch
index fdf2e28..0be8687 100644
--- a/openscap-suse-cpe.patch
+++ b/openscap-suse-cpe.patch
@@ -2,9 +2,9 @@ Index: openscap-1.3.5/cpe/openscap-cpe-dict.xml
 ===================================================================
 --- openscap-1.3.5.orig/cpe/openscap-cpe-dict.xml
 +++ openscap-1.3.5/cpe/openscap-cpe-dict.xml
-@@ -65,4 +65,20 @@
-             <title xml:lang="en-us">openSUSE Leap 15.3</title>
-             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:153</check>
+@@ -69,4 +69,20 @@
+             <title xml:lang="en-us">openSUSE Tumbleweed</title>
+             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:9999</check>
        </cpe-item>
 +      <cpe-item name="cpe:/o:suse:sles:12">
 +            <title xml:lang="en-us">SUSE Linux Enterprise Server 12</title>
@@ -27,8 +27,8 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
 ===================================================================
 --- openscap-1.3.5.orig/cpe/openscap-cpe-oval.xml
 +++ openscap-1.3.5/cpe/openscap-cpe-oval.xml
-@@ -729,6 +729,32 @@
-                         <criterion comment="openSUSE Leap 15.3 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:153"/>
+@@ -742,6 +742,32 @@
+                         <criterion comment="openSUSE Tumbleweed is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:9999"/>
                    </criteria>
              </definition>
 +            <definition class="inventory" id="oval:org.open-scap.cpe.sles:def:15" version="1">
@@ -60,7 +60,7 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
              <definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
                    <metadata>
                          <title>Wind River Linux</title>
-@@ -1071,6 +1097,11 @@
+@@ -1084,6 +1110,11 @@
                    <object object_ref="oval:org.open-scap.cpe.sles-release:obj:1"/>
                    <state state_ref="oval:org.open-scap.cpe.sles:ste:12"/>
              </rpminfo_test>
@@ -72,7 +72,7 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
              <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:10" version="1" check="at least one" comment="sled-release is version 10"
                    xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                    <object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
-@@ -1086,6 +1117,11 @@
+@@ -1099,6 +1130,11 @@
                    <object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
                    <state state_ref="oval:org.open-scap.cpe.sled:ste:12"/>
              </rpminfo_test>
@@ -84,7 +84,7 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
              <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:1" version="1" check="at least one" comment="openSUSE-release is version 11.4"
                    xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                    <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
-@@ -1436,6 +1472,9 @@
+@@ -1454,6 +1490,9 @@
              <rpminfo_state id="oval:org.open-scap.cpe.sles:ste:12" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                    <version operation="pattern match">^12($|[^\d])</version>
              </rpminfo_state>
@@ -94,7 +94,7 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
              <rpminfo_state id="oval:org.open-scap.cpe.sled:ste:10" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                    <version operation="pattern match">^10($|[^\d])</version>
              </rpminfo_state>
-@@ -1445,6 +1484,9 @@
+@@ -1463,6 +1502,9 @@
              <rpminfo_state id="oval:org.open-scap.cpe.sled:ste:12" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                    <version operation="pattern match">^12($|[^\d])</version>
              </rpminfo_state>
diff --git a/openscap.changes b/openscap.changes
index 15b8e4f..6eb1b45 100644
--- a/openscap.changes
+++ b/openscap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 14 13:58:45 UTC 2021 - Robert Frohl <rfrohl@suse.com>
+
+- Add definition tumbleweed to openscap-opensuse-cpe.patch (boo#1186735)
+
 -------------------------------------------------------------------
 Wed Jun  2 15:11:14 UTC 2021 - Robert Frohl <rfrohl@suse.com>