diff --git a/libs/libjaylink/Makefile b/libs/libjaylink/Makefile
index 2ed5753b189112..2213dd004e2789 100644
--- a/libs/libjaylink/Makefile
+++ b/libs/libjaylink/Makefile
@@ -9,7 +9,7 @@ PKG_SOURCE_URL:=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/$(PKG_VER
 PKG_HASH:=a2d98c1aa13dcf41c6c681767a43cdefc42b6f71af9362937555051007514cd9
 
 PKG_MAINTAINER:=Paul Fertser <fercerpav@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
 PKG_INSTALL:=1
diff --git a/libs/libnetfilter-cthelper/Makefile b/libs/libnetfilter-cthelper/Makefile
index f1ad412ad44180..10261e48410195 100644
--- a/libs/libnetfilter-cthelper/Makefile
+++ b/libs/libnetfilter-cthelper/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://netfilter.org/pub/libnetfilter_cthelper/
 PKG_HASH:=07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d
 
 PKG_FIXUP:=autoreconf
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_CPE_ID:=cpe:/a:netfilter:libnetfilter_cthelper
 
 PKG_INSTALL:=1
diff --git a/libs/libnetfilter-cttimeout/Makefile b/libs/libnetfilter-cttimeout/Makefile
index e4e720d50219a0..bd17d095c20fd3 100644
--- a/libs/libnetfilter-cttimeout/Makefile
+++ b/libs/libnetfilter-cttimeout/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://netfilter.org/pub/libnetfilter_cttimeout/
 PKG_HASH:=aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba
 
 PKG_FIXUP:=autoreconf
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_CPE_ID:=cpe:/a:netfilter:libnetfilter_cttimeout
 
 PKG_INSTALL:=1
diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile
index 5023d29bc4dfcd..1e46ddc19cca99 100644
--- a/libs/libnetfilter-log/Makefile
+++ b/libs/libnetfilter-log/Makefile
@@ -17,7 +17,7 @@ PKG_HASH:=e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
 
 PKG_FIXUP:=autoreconf
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 
 PKG_INSTALL:=1
 
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 5281674a50d7f9..d8bc633e1b0fd4 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -19,7 +19,7 @@ PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 include $(INCLUDE_DIR)/package.mk
 
 PKG_FIXUP:=autoreconf
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 
 define Package/igmpproxy
   SECTION:=net
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 2f71ea5abb90b3..9a432c3cabc96f 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -21,7 +21,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://nmap.org/dist/
 PKG_HASH:=df512492ffd108e53a27a06f26d8635bbe89e0e569455dc8ffef058c035d51b2
 
-PKG_LICENSE:=NPSL-0.94-or-NPSL-0.95
+PKG_LICENSE:=NPSL-0.95
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:nmap:nmap
 
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 114519f64fa623..129349d5137443 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 PKG_HASH:=ef6026dd2aea8d56059638d5d3262902c892ceba9f88395835e0d06d3fb63238
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)-$(PKG_REALVERSION)
 
-PKG_LICENSE:=BSD ISC
+PKG_LICENSE:=BSD-2-Clause BSD-3-Clause ISC
 PKG_LICENSE_FILES:=LICENCE
 PKG_CPE_ID:=cpe:/a:openbsd:openssh
 
diff --git a/utils/rpcd-mod-wireguard/Makefile b/utils/rpcd-mod-wireguard/Makefile
index ca4a36f005d7de..e72795a7c6b8ba 100644
--- a/utils/rpcd-mod-wireguard/Makefile
+++ b/utils/rpcd-mod-wireguard/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=rpcd-mod-wireguard
 PKG_RELEASE=2
 
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_BUILD_FLAGS:=gc-sections
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/xz/Makefile b/utils/xz/Makefile
index 2f4cee3036fff5..57db085f77629c 100644
--- a/utils/xz/Makefile
+++ b/utils/xz/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=https://github.com/tukaani-project/xz/releases/download/v$(PKG_V
 PKG_HASH:=33bf69c0d6c698e83a68f77e6c1f465778e418ca0b3d59860d3ab446f4ac99a6
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
-PKG_LICENSE:=Public-Domain LGPL-2.1-or-later 0BSD
+PKG_LICENSE:=LGPL-2.1-or-later 0BSD
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:tukaani:xz
 
diff --git a/utils/zoneinfo/Makefile b/utils/zoneinfo/Makefile
index ce34a360e81d9a..5be329d1537fd8 100644
--- a/utils/zoneinfo/Makefile
+++ b/utils/zoneinfo/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 #As i couldn't find real license used "Public Domain"
 #as reference to https://data.iana.org/time-zones/tz-link.html
-PKG_LICENSE:=Public-Domain
+PKG_LICENSE:=Unlicense
 
 PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz
 PKG_SOURCE_CODE:=tzcode$(PKG_VERSION).tar.gz