diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
index 76d96ff..305b6ca 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux kernel for Aspeed"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 PROVIDES += "virtual/kernel"
 
diff --git a/meta-google/recipes-extended/networking/mstpd_git.bb b/meta-google/recipes-extended/networking/mstpd_git.bb
index 902e006..75692a6 100644
--- a/meta-google/recipes-extended/networking/mstpd_git.bb
+++ b/meta-google/recipes-extended/networking/mstpd_git.bb
@@ -1,6 +1,6 @@
 PR = "r1"
 PV = "0.1+git${SRCPV}"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4"
 
 SRC_URI = "git://github.com/mstpd/mstpd;branch=master;protocol=https"
diff --git a/meta-google/recipes-extended/networking/sslh_git.bb b/meta-google/recipes-extended/networking/sslh_git.bb
index 6e62b96..c96b26e 100644
--- a/meta-google/recipes-extended/networking/sslh_git.bb
+++ b/meta-google/recipes-extended/networking/sslh_git.bb
@@ -1,6 +1,6 @@
 PR = "r2"
 PV = "0.1+git${SRCPV}"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/yrutschle/sslh;branch=master;protocol=https"
diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc
index 3459a4f..732506f 100644
--- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc
+++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux kernel for GXP"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 PROVIDES += "virtual/kernel"
 
diff --git a/meta-ibm/meta-fsp2/recipes-bsp/u-boot/u-boot-fsp2_git.bb b/meta-ibm/meta-fsp2/recipes-bsp/u-boot/u-boot-fsp2_git.bb
index aae0c09..10e89be 100644
--- a/meta-ibm/meta-fsp2/recipes-bsp/u-boot/u-boot-fsp2_git.bb
+++ b/meta-ibm/meta-fsp2/recipes-bsp/u-boot/u-boot-fsp2_git.bb
@@ -2,7 +2,7 @@
 
 SRC_URI = "git://github.com/openbmc/u-boot;branch=v2017.11-fsp2-openbmc;protocol=https"
 SRCREV = "d675f0a16ecc876b1aa78b4151af89c80fe0f4b9"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 S = "${WORKDIR}/git"
 
diff --git a/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
index 9419494..37f34cb 100644
--- a/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
+++ b/meta-ibm/meta-fsp2/recipes-kernel/linux/linux-fsp2.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux kernel for the FSP2 system on a chip"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 KCONFIG_MODE="--alldefconfig"
 
diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb
index 37200d5..5ec9420d 100644
--- a/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb
+++ b/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb
@@ -3,7 +3,7 @@
 HOMEPAGE = "https://github.com/Nuvoton-Israel/bingo"
 PR = "r1"
 PV = "0.1+git${SRCPV}"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI += "git://github.com/Nuvoton-Israel/bingo;branch=master;protocol=https"
diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.17.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.17.bb
index 7e1912d..21ae615 100644
--- a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.17.bb
+++ b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.17.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Primary bootloader for NPCM7XX (Poleg) devices"
 DESCRIPTION = "Primary bootloader for NPCM7XX (Poleg) devices"
 HOMEPAGE = "https://github.com/Nuvoton-Israel/npcm7xx-bootblock"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 FILENAME = "Poleg_bootblock_${PV}.bin"
diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-igps-native_02.01.12.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-igps-native_02.01.12.bb
index b0db682..5ef884c 100644
--- a/meta-nuvoton/recipes-bsp/images/npcm7xx-igps-native_02.01.12.bb
+++ b/meta-nuvoton/recipes-bsp/images/npcm7xx-igps-native_02.01.12.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Image Generation and Programming Scripts for NPCM7XX (Poleg) devices"
 DESCRIPTION = "Image Generation and Programming Scripts for NPCM7XX (Poleg) devices"
 HOMEPAGE = "https://github.com/Nuvoton-Israel/igps"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = " \
diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
index 585a154..13e68e5 100644
--- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
+++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux kernel for Nuvoton NPCM7xx"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 PROVIDES += "virtual/kernel"
 
diff --git a/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb b/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb
index 2bd5292..956ffa8 100644
--- a/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb
+++ b/meta-nuvoton/recipes-nuvoton/loadsvf/loadsvf_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "CPLD/FPGA Programmer"
 PR = "r1"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/Nuvoton-Israel/loadsvf.git;branch=master;protocol=https"
diff --git a/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
index e08859c..54303fa 100644
--- a/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
+++ b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Command line tools for hardware device registers"
 HOMEPAGE = "https://github.com/jonmayergoogle/iotools"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRCREV = "8d928b3360246b8ead95b442ca3887ce8b8f942f"
 SRC_URI = "git://git@github.com/jonmayergoogle/iotools.git;protocol=https;branch=master"
diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb
index 4ddd03c..67dc660 100644
--- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb
+++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "OpenBMC VNC server and ipKVM daemon"
 DESCRIPTION = "obmc-ikvm is a vncserver for JPEG-serving V4L2 devices to allow ipKVM"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e"
 
 DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces"
diff --git a/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb b/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
index 4845418..04e6a7e 100644
--- a/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
+++ b/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
@@ -8,7 +8,7 @@
 
 HOMEPAGE = "http://arthurdejong.org/nss-pam-ldapd/"
 
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 SECTION = "base"