diff --git a/recipes-abiword/abiword/abiword_3.0.5.bb b/recipes-abiword/abiword/abiword_3.0.5.bb
index 2e41a88..05c6e8e 100644
--- a/recipes-abiword/abiword/abiword_3.0.5.bb
+++ b/recipes-abiword/abiword/abiword_3.0.5.bb
@@ -1,7 +1,7 @@
 SUMMARY = "AbiWord is free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
 DEPENDS  = " \
     perl-native \
diff --git a/recipes-devtools/archive-zip/archive-zip_1.31.bb b/recipes-devtools/archive-zip/archive-zip_1.31.bb
index c5330d0..37cd223 100644
--- a/recipes-devtools/archive-zip/archive-zip_1.31.bb
+++ b/recipes-devtools/archive-zip/archive-zip_1.31.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "perl interface to ZIP archive files"
 SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=385c55653886acac3821999a3ccd17b3"
 
 PATCHREV = "04"
diff --git a/recipes-filter/libmwaw/libmwaw_0.3.17.bb b/recipes-filter/libmwaw/libmwaw_0.3.17.bb
index 96e7cfe..59f7bc8 100644
--- a/recipes-filter/libmwaw/libmwaw_0.3.17.bb
+++ b/recipes-filter/libmwaw/libmwaw_0.3.17.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A library for import of many old Mac document formats"
 HOMEPAGE = "http://sourceforge.net/projects/libmwaw"
-LICENSE = " LGPLv2.1 & MPL-2.0"
+LICENSE = " LGPL-2.1-only & MPL-2.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING.LGPL;md5=a049c5e22d3bd7bc3c9a2e9135a6d104 \
     file://COPYING.MPL;md5=cce0d89a18de69e7f51f693182ac4a3e \
diff --git a/recipes-libreoffice/libreoffice/libreoffice.inc b/recipes-libreoffice/libreoffice/libreoffice.inc
index a016e3d..c90d8d9 100644
--- a/recipes-libreoffice/libreoffice/libreoffice.inc
+++ b/recipes-libreoffice/libreoffice/libreoffice.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Libre office base"
-LICENSE = "GPLv3 & LGPLv3 & MPLv1.1"
+LICENSE = "GPL-3.0-only & LGPL-3.0-only & MPL-1.1"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
     file://COPYING.LGPL;md5=6a6a8e020838b23406c81b19c1d46df6 \
diff --git a/recipes-support/clucene/clucene-core_2.3.3.4.bb b/recipes-support/clucene/clucene-core_2.3.3.4.bb
index 5afb5e5..f8f5b00 100644
--- a/recipes-support/clucene/clucene-core_2.3.3.4.bb
+++ b/recipes-support/clucene/clucene-core_2.3.3.4.bb
@@ -1,6 +1,6 @@
 SUMMARY = "CLucene is a indexing and searching API"
 HOMEPAGE = "http://www.sourceforge.net/projects/clucene"
-LICENSE = "LGPLv2+ & Apache-2.0"
+LICENSE = "LGPL-2.0-or-later & Apache-2.0"
 LIC_FILES_CHKSUM = " \
     file://APACHE.license;md5=86d3f3a95c324c9479bd8986968f4327 \
     file://LGPL.license;md5=464215a90afcdfbae965d89feb928c7e \
diff --git a/recipes-support/graphite2/graphite2.bb b/recipes-support/graphite2/graphite2.bb
index 7a9783e..fd2116a 100644
--- a/recipes-support/graphite2/graphite2.bb
+++ b/recipes-support/graphite2/graphite2.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Font rendering capabilities for complex non-Roman writing systems"
 HOMEPAGE = "http://sourceforge.net/projects/silgraphite"
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b0452d508cc4eb104de0226a5b0c8786"
 
 inherit cmake
diff --git a/recipes-support/gtkmathview/gtkmathview_0.8.0.bb b/recipes-support/gtkmathview/gtkmathview_0.8.0.bb
index 7a35b29..f3f14ac 100644
--- a/recipes-support/gtkmathview/gtkmathview_0.8.0.bb
+++ b/recipes-support/gtkmathview/gtkmathview_0.8.0.bb
@@ -1,7 +1,7 @@
 HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
 DEPENDS = "t1lib gtk+ popt libxslt-native libxml2"
 
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 
 PR = "r3"
diff --git a/recipes-support/hyphen/hyphen_2.8.8.bb b/recipes-support/hyphen/hyphen_2.8.8.bb
index e0022a7..75b3187 100644
--- a/recipes-support/hyphen/hyphen_2.8.8.bb
+++ b/recipes-support/hyphen/hyphen_2.8.8.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A text hyphenation library"
 HOMEPAGE = "http://hunspell.sourceforge.net/"
-LICENSE = "LGPLv2.1 | GPLv2 | MPLv1.1"
+LICENSE = "LGPL-2.1-only | GPL-2.0-only | MPL-1.1"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=d45e3467790c1cae990cc9ca3293bc97 \
     file://COPYING.LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
diff --git a/recipes-support/libcmis/libcmis_0.5.2.bb b/recipes-support/libcmis/libcmis_0.5.2.bb
index 8b99372..bd7b3ee 100644
--- a/recipes-support/libcmis/libcmis_0.5.2.bb
+++ b/recipes-support/libcmis/libcmis_0.5.2.bb
@@ -1,6 +1,6 @@
 SUMMARY = "C++ client library for the CMIS interface"
 HOMEPAGE = "https://github.com/tdf/libcmis"
-LICENSE = "MPL-1.1 & GPLv2 & LGPLv2.1"
+LICENSE = "MPL-1.1 & GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = " \
     file://COPYING.MPL;md5=0117647fecb9a932c25a7bbfc0333c37 \
     file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
diff --git a/recipes-support/liblangtag/liblangtag_0.6.3.bb b/recipes-support/liblangtag/liblangtag_0.6.3.bb
index 006e6f7..83cf627 100644
--- a/recipes-support/liblangtag/liblangtag_0.6.3.bb
+++ b/recipes-support/liblangtag/liblangtag_0.6.3.bb
@@ -1,6 +1,6 @@
 SUMMARY = "An interface library to access tags for identifying languages"
 HOMEPAGE = "http://tagoh.bitbucket.org/liblangtag/"
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
diff --git a/recipes-support/lpsolve/lpsolve_5.5.2.5.bb b/recipes-support/lpsolve/lpsolve_5.5.2.5.bb
index 1a02c9e..410ca62 100644
--- a/recipes-support/lpsolve/lpsolve_5.5.2.5.bb
+++ b/recipes-support/lpsolve/lpsolve_5.5.2.5.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A Mixed Integer Linear Programming (MILP) solver"
 HOMEPAGE = "http://lpsolve.sourceforge.net/5.5/"
-LICENSE = "LGPL2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://README.txt;start_line=6;end_line=7;md5=883769a4ee3f3c1843e536ab0fabb3b2"
 
 SRC_URI = " \
diff --git a/recipes-support/redland/rasqal_0.9.33.bb b/recipes-support/redland/rasqal_0.9.33.bb
index 80857bc..3e1444a 100644
--- a/recipes-support/redland/rasqal_0.9.33.bb
+++ b/recipes-support/redland/rasqal_0.9.33.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Library for querying RDF"
-LICENSE = "GPLv2 | LGPLv2"
+LICENSE = "GPL-2.0-only | LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
diff --git a/recipes-support/redland/redland_1.0.17.bb b/recipes-support/redland/redland_1.0.17.bb
index 7ce28b1..f3e3bc8 100644
--- a/recipes-support/redland/redland_1.0.17.bb
+++ b/recipes-support/redland/redland_1.0.17.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Library providing the RDF API and triple stores"
-LICENSE = "GPLv2 | LGPLv2"
+LICENSE = "GPL-2.0-only | LGPL-2.0-only"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
diff --git a/recipes-support/t1lib/t1lib_5.1.2.bb b/recipes-support/t1lib/t1lib_5.1.2.bb
index 6e64bf6..a836f98 100644
--- a/recipes-support/t1lib/t1lib_5.1.2.bb
+++ b/recipes-support/t1lib/t1lib_5.1.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "A Type1 Font Rastering Library"
 SECTION = "libs"
 DEPENDS = "virtual/libx11 libxaw"
 
-LICENSE = "LGPLv2 & GPLv2"
+LICENSE = "LGPL-2.0-only & GPL-2.0-only"
 LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \
     file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \
diff --git a/recipes-support/wv/wv_1.2.9.bb b/recipes-support/wv/wv_1.2.9.bb
index acb8964..aef9924 100644
--- a/recipes-support/wv/wv_1.2.9.bb
+++ b/recipes-support/wv/wv_1.2.9.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Programs for accessing Microsoft Word documents"
 HOMEPAGE = "http://wvware.sourceforge.net/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f"
 
 DEPENDS = "libgsf glib-2.0 libpng"