diff --git a/classes/reuse_license_checksums.bbclass b/classes/reuse_license_checksums.bbclass
index 1e7719a..fb23883 100644
--- a/classes/reuse_license_checksums.bbclass
+++ b/classes/reuse_license_checksums.bbclass
@@ -64,6 +64,8 @@ do_populate_lic_prepend() {
             "6a2eced623a7c9d0c8996ce24917d006",
             "e4b79a181b6483b37d39a27f4d75e60a",
         ],
+        'MIT-CMU': [ 'b6936b5be2ab721140d9bf57c37b0b92' ],
+        'Unicode-DFS-2016': [ '3daac258519ec32945c80ae0f7ba88f4' ]
     }
 
     # generate flat list of used license identifiers
@@ -75,6 +77,10 @@ do_populate_lic_prepend() {
     recipe_licenses = package_license_statement.split()
     recipe_licenses = list(map(str.strip, recipe_licenses))
 
+    package_license_qa_whitelist = d.getVar('REUSE_LICENSECHECK_WHITELIST') or ''
+    recipe_licenses_qa_whitelist = package_license_qa_whitelist.split()
+    recipe_licenses_qa_whitelist = list(map(str.strip, recipe_licenses_qa_whitelist))
+
     if d.getVar('LIC_FILES_CHKSUM') and not d.getVar('LIC_FILES_CHKSUM') == '':
         print("Aborting LIC_FILES_CHKSUM computation, value already set to:", d.getVar('LIC_FILES_CHKSUM'))
     else:
@@ -111,5 +117,7 @@ do_populate_lic_prepend() {
             if license_name in spdx_id_to_yocto_map:
                 if list(set(recipe_licenses) & set(spdx_id_to_yocto_map[license_name])):
                     continue
+            if license_name in recipe_licenses_qa_whitelist:
+                continue
             bb.warn("QA Issue: %s [%s]" % (license_name + " found in SRC but not in package license statement", "reuse_license"))
 }
diff --git a/conf/licenses/MIT-CMU b/conf/licenses/MIT-CMU
new file mode 100644
index 0000000..81c351b
--- /dev/null
+++ b/conf/licenses/MIT-CMU
@@ -0,0 +1,17 @@
+<copyright notice> By obtaining, using, and/or copying this software and/or
+its associated documentation, you agree that you have read, understood, and
+will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its associated
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appears in all copies, and that both that
+copyright notice and this permission notice appear in supporting documentation,
+and that the name of the copyright holder not be used in advertising or publicity
+pertaining to distribution of the software without specific, written permission.
+
+THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/conf/licenses/Unicode-DFS-2016 b/conf/licenses/Unicode-DFS-2016
new file mode 100644
index 0000000..80bd8b3
--- /dev/null
+++ b/conf/licenses/Unicode-DFS-2016
@@ -0,0 +1,49 @@
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+Unicode Data Files include all data files under the directories http://www.unicode.org/Public/,
+http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
+http://www.unicode.org/ivd/data/, and http://www.unicode.org/utility/trac/browser/.
+
+Unicode Data Files do not include PDF online code charts under the directory
+http://www.unicode.org/Public/.
+
+Software includes any source code published in the Unicode Standard or under
+the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/,
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
+and http://www.unicode.org/utility/trac/browser/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
+INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"),
+AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND
+BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE,
+DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE Copyright © 1991-2016 Unicode, Inc. All rights
+reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the Unicode data files and any associated documentation (the "Data Files")
+or Unicode software and any associated documentation (the "Software") to deal
+in the Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell copies
+of the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+
+(a) this copyright and permission notice appear with all copies of the Data
+Files or Software, or
+
+   (b) this copyright and permission notice appear in associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in these Data Files or Software without prior written authorization of the
+copyright holder.
diff --git a/recipes-kf5/tier1/kcalendarcore.inc b/recipes-kf5/tier1/kcalendarcore.inc
index 9cef78b..2ee57ff 100644
--- a/recipes-kf5/tier1/kcalendarcore.inc
+++ b/recipes-kf5/tier1/kcalendarcore.inc
@@ -3,10 +3,12 @@
 #
 # SPDX-License-Identifier: MIT
 
-# note: autotests contain LGPL-3.0-or-later
 LICENSE = "BSD-3-Clause & LGPL-2.0+"
 PR = "r0"
 
+# licenses only contained in autotests
+REUSE_LICENSECHECK_WHITELIST = "LGPL-3.0-or-later"
+
 DEPENDS = " \
     qtbase \
     libical \
diff --git a/recipes-kf5/tier1/kcodecs.inc b/recipes-kf5/tier1/kcodecs.inc
index 2538c82..2a78af3 100644
--- a/recipes-kf5/tier1/kcodecs.inc
+++ b/recipes-kf5/tier1/kcodecs.inc
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "MIT & BSD-3-Clause & LGPL-2.0+ & LGPL-2.0"
 PR = "r0"
 
 DEPENDS = "qtbase gperf-native"
diff --git a/recipes-kf5/tier1/kconfig.inc b/recipes-kf5/tier1/kconfig.inc
index 6383fdb..66fca69 100644
--- a/recipes-kf5/tier1/kconfig.inc
+++ b/recipes-kf5/tier1/kconfig.inc
@@ -6,7 +6,7 @@
 # requires session management support in QtGui
 # eg. via PACKAGECONFIG_append_pn-qtbase = "sm" in local.conf
 
-LICENSE = "LGPL-2.1"
+LICENSE = "MIT & BSD-2-Clause & BSD-3-Clause & LGPL-2.0+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase kconfig-native"
diff --git a/recipes-kf5/tier1/kdbusaddons.inc b/recipes-kf5/tier1/kdbusaddons.inc
index 5de47eb..152335e 100644
--- a/recipes-kf5/tier1/kdbusaddons.inc
+++ b/recipes-kf5/tier1/kdbusaddons.inc
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.0+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase"
diff --git a/recipes-kf5/tier1/kguiaddons.inc b/recipes-kf5/tier1/kguiaddons.inc
index a3df479..564f603 100644
--- a/recipes-kf5/tier1/kguiaddons.inc
+++ b/recipes-kf5/tier1/kguiaddons.inc
@@ -5,9 +5,12 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.0+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
+# licenses only contained in autotests
+REUSE_LICENSECHECK_WHITELIST = "GPL-2.0-only GPL-3.0-only LicenseRef-KDE-Accepted-GPL"
+
 DEPENDS = " \
     qtbase \
     qtwayland \
diff --git a/recipes-kf5/tier1/kimageformats.inc b/recipes-kf5/tier1/kimageformats.inc
index 0d01530..8af4906 100644
--- a/recipes-kf5/tier1/kimageformats.inc
+++ b/recipes-kf5/tier1/kimageformats.inc
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-2-Clause & LGPL-2.0+ & LGPL-2.1+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase"
diff --git a/recipes-kf5/tier1/kitemmodels.inc b/recipes-kf5/tier1/kitemmodels.inc
index 663d04d..777232f 100644
--- a/recipes-kf5/tier1/kitemmodels.inc
+++ b/recipes-kf5/tier1/kitemmodels.inc
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.0+ & LGPL-2.1+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase"
diff --git a/recipes-kf5/tier1/kquickcharts.inc b/recipes-kf5/tier1/kquickcharts.inc
index 2386472..c491356 100644
--- a/recipes-kf5/tier1/kquickcharts.inc
+++ b/recipes-kf5/tier1/kquickcharts.inc
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "MIT & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = " \
diff --git a/recipes-kf5/tier1/kwayland.inc b/recipes-kf5/tier1/kwayland.inc
index de3531e..6a8b52c 100644
--- a/recipes-kf5/tier1/kwayland.inc
+++ b/recipes-kf5/tier1/kwayland.inc
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "MIT & MIT-CMU & BSD-3-Clause & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = " \
diff --git a/recipes-kf5/tier1/kwidgetsaddons.inc b/recipes-kf5/tier1/kwidgetsaddons.inc
index 67d8f12..f1a0b8f 100644
--- a/recipes-kf5/tier1/kwidgetsaddons.inc
+++ b/recipes-kf5/tier1/kwidgetsaddons.inc
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & LGPL-2.0+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase"
diff --git a/recipes-kf5/tier1/kwindowsystem.inc b/recipes-kf5/tier1/kwindowsystem.inc
index cc15b32..752615c 100644
--- a/recipes-kf5/tier1/kwindowsystem.inc
+++ b/recipes-kf5/tier1/kwindowsystem.inc
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "MIT & BSD-3-Clause & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = " \
diff --git a/recipes-kf5/tier1/modemmanager-qt.inc b/recipes-kf5/tier1/modemmanager-qt.inc
index 87c6aac..e2b074b 100644
--- a/recipes-kf5/tier1/modemmanager-qt.inc
+++ b/recipes-kf5/tier1/modemmanager-qt.inc
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase modemmanager"
diff --git a/recipes-kf5/tier1/networkmanager-qt.inc b/recipes-kf5/tier1/networkmanager-qt.inc
index 2c5c68e..ad61cb7 100644
--- a/recipes-kf5/tier1/networkmanager-qt.inc
+++ b/recipes-kf5/tier1/networkmanager-qt.inc
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase networkmanager"
diff --git a/recipes-kf5/tier1/solid.inc b/recipes-kf5/tier1/solid.inc
index 8ea3b6d..1f5fb5d 100644
--- a/recipes-kf5/tier1/solid.inc
+++ b/recipes-kf5/tier1/solid.inc
@@ -6,7 +6,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & LGPL-2.1+ & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase bison-native"
diff --git a/recipes-kf5/tier1/sonnet.inc b/recipes-kf5/tier1/sonnet.inc
index c609c57..0c061ed 100644
--- a/recipes-kf5/tier1/sonnet.inc
+++ b/recipes-kf5/tier1/sonnet.inc
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & LGPL-2.0+ & LGPL-2.1+"
 PR = "r0"
 
 DEPENDS = "qtbase sonnet-native"
diff --git a/recipes-kf5/tier1/syntax-highlighting.inc b/recipes-kf5/tier1/syntax-highlighting.inc
index 5b75f1f..200b616 100644
--- a/recipes-kf5/tier1/syntax-highlighting.inc
+++ b/recipes-kf5/tier1/syntax-highlighting.inc
@@ -3,9 +3,12 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "MIT"
+LICENSE = "MIT & LGPL-2.0+"
 PR = "r0"
 
+# licenses only contained in autotests
+REUSE_LICENSECHECK_WHITELIST = "LGPL-2.1-or-later GPL-2.0-only"
+
 DEPENDS = " \
     qtbase \
     ${BPN}-native \
diff --git a/recipes-kf5/tier2/kcompletion.inc b/recipes-kf5/tier2/kcompletion.inc
index a3560fe..4a3e0d1 100644
--- a/recipes-kf5/tier2/kcompletion.inc
+++ b/recipes-kf5/tier2/kcompletion.inc
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & LGPL-2.0+ & LGPL-2.1+"
 PR = "r0"
 
 DEPENDS = " \
diff --git a/recipes-kf5/tier2/kcontacts.inc b/recipes-kf5/tier2/kcontacts.inc
index 346d00c..e1c54ca 100644
--- a/recipes-kf5/tier2/kcontacts.inc
+++ b/recipes-kf5/tier2/kcontacts.inc
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.0"
+LICENSE = "MIT & BSD-3-Clause & LGPL-2.0+ & Unicode-DFS-2016"
 PR = "r0"
 
 DEPENDS = " \
diff --git a/recipes-kf5/tier2/kfilemetadata.inc b/recipes-kf5/tier2/kfilemetadata.inc
index a6c02dd..ca14c55 100644
--- a/recipes-kf5/tier2/kfilemetadata.inc
+++ b/recipes-kf5/tier2/kfilemetadata.inc
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & (LGPL-2.1 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = " \
diff --git a/recipes-kf5/tier3/ktexteditor.inc b/recipes-kf5/tier3/ktexteditor.inc
index 5d018bb..d236fd7 100644
--- a/recipes-kf5/tier3/ktexteditor.inc
+++ b/recipes-kf5/tier3/ktexteditor.inc
@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.0"
+LICENSE = "MIT & BSD-2-Clause & LGPL-2.0"
 PR = "r0"
 
 DEPENDS = " \
diff --git a/recipes-kf5/tier3/ktextwidgets.inc b/recipes-kf5/tier3/ktextwidgets.inc
index 8a67679..a7293c7 100644
--- a/recipes-kf5/tier3/ktextwidgets.inc
+++ b/recipes-kf5/tier3/ktextwidgets.inc
@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1+ & (LGPL-2.0 | LGPL-3.0 | LicenseRef-KDE-Accepted-LGPL)"
 PR = "r0"
 
 DEPENDS = "qtbase \