diff --git a/community/6tunnel/APKBUILD b/community/6tunnel/APKBUILD
index a46f2a0437ab810fea9805855a354b407226d15d..e2e399ec9b1526950e0cdf23be0df935741dd04b 100644
--- a/community/6tunnel/APKBUILD
+++ b/community/6tunnel/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="TCP proxy for non-IPv6 applications"
 url="http://toxygen.net/6tunnel"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="automake autoconf"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/wojtekka/$pkgname/archive/$pkgver.tar.gz
diff --git a/community/R/APKBUILD b/community/R/APKBUILD
index c345e7a5b6c5a2662c71e8bb014d17326f2e25f9..b574714ca3958fbf4305a7d66424a2dec8e0c206 100644
--- a/community/R/APKBUILD
+++ b/community/R/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Language and environment for statistical computing"
 url="https://www.r-project.org"
 arch="all !s390x"
-license="GPL-2 GPL-3 LGPL-2.1"
+license="GPL-2.0 GPL-3 LGPL-2.1"
 depends="$pkgname-mathlib"
 depends_dev="gcc gfortran icu-dev libjpeg-turbo libpng-dev make openblas-dev
 	pcre-dev>=8.10 readline-dev xz-dev zlib-dev bzip2-dev curl-dev>=7.28
diff --git a/community/abiword/APKBUILD b/community/abiword/APKBUILD
index 1651e290d2b39720f20174f76e79738e0b9feb98..aa3708d44e23f28ef90ff67616635eb709e45d77 100644
--- a/community/abiword/APKBUILD
+++ b/community/abiword/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A fully-featured word processor"
 url="http://www.abisource.com"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="gtk+3.0-dev libgsf-dev enchant-dev fribidi-dev wv-dev
 	popt-dev libjpeg-turbo-dev librsvg-dev bzip2-dev goffice-dev pcre-dev
 	libxslt-dev"
diff --git a/community/abook/APKBUILD b/community/abook/APKBUILD
index 1f26e4a39f5ce39c9ce50e15e7f2033c18c27faa..a1a4a221da13368b86ae8281939b2a5312cec8c4 100644
--- a/community/abook/APKBUILD
+++ b/community/abook/APKBUILD
@@ -6,7 +6,7 @@ _ver=${pkgver/_pre/pre}
 pkgrel=3
 pkgdesc="Text-based addressbook designed for use with Mutt"
 url="http://abook.sourceforge.net"
-license="GPL2"
+license="GPL-2.0"
 arch="all"
 makedepends="ncurses-dev readline-dev automake autoconf gettext-dev"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/community/acccheck/APKBUILD b/community/acccheck/APKBUILD
index 45f4a1013061961d139fd4784896a011811a41a3..8a3d90307ff91fcd72a4d81824626c4bb2a331ef 100644
--- a/community/acccheck/APKBUILD
+++ b/community/acccheck/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A password dictionary attack tool"
 url="https://labs.portcullis.co.uk/tools/acccheck/"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends="perl"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/community/acf-vlc-daemon/APKBUILD b/community/acf-vlc-daemon/APKBUILD
index ccb0ecd7575b0e22588ffd8c29648083245b5986..0eca325cc2cf7f437c76ff4b78e97a6b1f5ee151 100644
--- a/community/acf-vlc-daemon/APKBUILD
+++ b/community/acf-vlc-daemon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for vlc"
 url="https://git.alpinelinux.org/cgit/acf/acf-vlc-daemon"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core vlc-daemon"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/community/afl/APKBUILD b/community/afl/APKBUILD
index e1219b4d0a2e5395f689942a6dd45ff301dcb6b2..9f8481e64eef48afb3029256114b7503191fdd8c 100644
--- a/community/afl/APKBUILD
+++ b/community/afl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="American fuzzy lop - a fuzzer relying on genetic algorithms instead brute force"
 url="http://lcamtuf.coredump.cx/afl/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="clang llvm"
 makedepends="clang-dev llvm-dev"
 subpackages="$pkgname-doc"
diff --git a/community/afpfs-ng/APKBUILD b/community/afpfs-ng/APKBUILD
index 926cefaafad56742de55e5b0ba8c4c18c5ea0865..5ec0787717617bd4b62af70eca9bb0f08ebb2b7d 100644
--- a/community/afpfs-ng/APKBUILD
+++ b/community/afpfs-ng/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=8
 pkgdesc="A client for the Apple Filing Protocol (AFP)"
 url="http://alexthepuffin.googlepages.com/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="libgcrypt-dev libedit-dev ncurses-dev"
 makedepends="$depends_dev autoconf automake libtool linux-headers"
diff --git a/community/aha/APKBUILD b/community/aha/APKBUILD
index 7128b38bd9d755a063de8536bf690cc08e0e94ef..30e3efc12433ec58b6a29b525258ca9e514a6ea0 100644
--- a/community/aha/APKBUILD
+++ b/community/aha/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ANSI color to HTML converter"
 url="http://anonscm.debian.org/gitweb/?p=collab-maint/aha.git;a=summary"
 arch="all"
-license="MPL 1.1"
+license="MPL-1.1"
 depends=""
 depends_dev=""
 makedepends=""
diff --git a/community/aircrack-ng/APKBUILD b/community/aircrack-ng/APKBUILD
index a406e5df21bf48f0de598615f7d28106c69d471b..74fad0ef0e52cdbd15a10ebd792f1fe578553fff 100644
--- a/community/aircrack-ng/APKBUILD
+++ b/community/aircrack-ng/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=5
 pkgdesc="Key cracker for the 802.11 WEP and WPA-PSK protocols"
 url="http://www.aircrack-ng.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="ethtool wireless-tools iw sqlite grep pciutils"
 makedepends="coreutils libressl-dev sqlite-dev libnl-dev linux-headers pcre-dev
 	bsd-compat-headers zlib-dev"
diff --git a/community/albatross-themes/APKBUILD b/community/albatross-themes/APKBUILD
index 6492e0741d73532074bceedecdb2a30d5e43fd6e..d597e2ce13976daf7932f7192b828c1fb29c6e3b 100644
--- a/community/albatross-themes/APKBUILD
+++ b/community/albatross-themes/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A clean minimalistic theme for Xfce, GTK 2 and 3"
 url="http://shimmerproject.org/project/albatross/"
 arch="noarch"
-license="GPLv2 or CC-BY-SA"
+license="GPL-2.0 or CC-BY-SA"
 makedepends="$depends_dev"
 subpackages="$pkgname-gtk2 $pkgname-gtk3 $pkgname-metacity $pkgname-xfwm4"
 source="albatross-$pkgver.tar.gz::https://github.com/shimmerproject/Albatross/archive/v$pkgver.tar.gz"
diff --git a/community/alien/APKBUILD b/community/alien/APKBUILD
index ed69c7c7255bd4967489f5f46a80e9fb36c09011..ea827136ef78c3185efb49e8004c8a5c0bb9e839 100644
--- a/community/alien/APKBUILD
+++ b/community/alien/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Alien is a program that converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
 url="http://joeyh.name/code/alien"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/community/anytun/APKBUILD b/community/anytun/APKBUILD
index 11aabe0e7f4ab20d139dd1bd003d431683ada0d5..b7c7b95040b058f0302487ac5f8cf71541eaca8e 100644
--- a/community/anytun/APKBUILD
+++ b/community/anytun/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Secure anycast tunneling protocol implementation for flexible and fault-tolerant VPNs"
 url="http://www.anytun.org"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev="libressl-dev boost-dev linux-headers"
 makedepends="$depends_dev"
diff --git a/community/apache-ant/APKBUILD b/community/apache-ant/APKBUILD
index a7b82ab542c03a1e39419af841f1359578045665..658baeec3be6b1ca8605b9e89ada2d3b96ed2bb7 100644
--- a/community/apache-ant/APKBUILD
+++ b/community/apache-ant/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A java-based build tool."
 url="http://ant.apache.org/"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 makedepends=""
 source="http://archive.apache.org/dist/ant/binaries/$pkgname-$pkgver-bin.tar.bz2"
diff --git a/community/arandr/APKBUILD b/community/arandr/APKBUILD
index d816ab1b97d91f83a156fc9c1c094ce0ca7ea61d..7396643d69fce59d20dcaed0c2b50cde9b68ee87 100644
--- a/community/arandr/APKBUILD
+++ b/community/arandr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ARandR provides a simple visual front end for XRandR"
 url="http://christian.amsuess.com/tools/arandr/"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="py-gtk xrandr"
 makedepends="py2-docutils gettext"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/community/archivemount/APKBUILD b/community/archivemount/APKBUILD
index 5dca042d8759f0e7bf2f3bec04c74d389b4170ef..8c8e006c7dc1442ca8e13654145c12052f18a1c4 100644
--- a/community/archivemount/APKBUILD
+++ b/community/archivemount/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="FUSE based filesystem for mounting compressed archives"
 url="http://www.cybernoia.de/software/archivemount/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev fuse-dev libarchive-dev"
diff --git a/community/arping/APKBUILD b/community/arping/APKBUILD
index d464c7cab7623857fd7cb75ffaec6c50792b4f55..c29136ec3964c4f8beeaef8d5ade8cd6e57083a6 100644
--- a/community/arping/APKBUILD
+++ b/community/arping/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="An ARP ping utility"
 url="http://www.habets.pp.se/synscan/programs.php?prog=arping"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="!iputils"
 makedepends="libnet-dev libpcap-dev"
 checkdepends="subunit-dev check-dev"
diff --git a/community/asciinema/APKBUILD b/community/asciinema/APKBUILD
index e6d56a1591788c70cff608c5923cfcc647c91ceb..dc5189e6014083946e7a3b066f7a1c29651a318e 100644
--- a/community/asciinema/APKBUILD
+++ b/community/asciinema/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Command line recorder for asciinema.org service"
 url="https://github.com/asciinema/asciinema/"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 depends="ncurses"
 makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
diff --git a/community/asio/APKBUILD b/community/asio/APKBUILD
index bf5e8f22c659950041fbf7878becd31be3ccd9da..9f8116678c5c06b51771a6c4797b72febfac562d 100644
--- a/community/asio/APKBUILD
+++ b/community/asio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A cross-platform C++ library for network programming"
 url="https://think-async.com"
 arch="all"
-license="Boost"
+license="BSL-1.0"
 depends=""
 depends_dev="boost-dev libressl-dev"
 makedepends="$depends_dev"
diff --git a/community/aspcud/APKBUILD b/community/aspcud/APKBUILD
index fd5381a14dc6806b76516f71f1a0090732c2c978..c623272dbc6a73c31334bcc3e4e993d6e41d04a0 100644
--- a/community/aspcud/APKBUILD
+++ b/community/aspcud/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Package dependency solver"
 url="http://potassco.sourceforge.net/"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 depends="boost gringo clasp"
 makedepends="boost-dev cmake re2c"
 install=""
diff --git a/community/asterisk-chan-dongle/APKBUILD b/community/asterisk-chan-dongle/APKBUILD
index 77d83372168c54f1fdad7480dea985de9675f97f..79607cbdcaf3b8973dd652b3ddfc18384659e609 100644
--- a/community/asterisk-chan-dongle/APKBUILD
+++ b/community/asterisk-chan-dongle/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="GSM modem dongle channel driver"
 url="https://github.com/oleg-krv/asterisk-chan-dongle/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="asterisk"
 depends_dev=""
 makedepends="$depends_dev asterisk-dev automake autoconf"
diff --git a/community/atheme-iris/APKBUILD b/community/atheme-iris/APKBUILD
index 7e08da9c8bbf92f40d5060a6b58281acf513d327..83439f5fbdfa9c3515e1105b96bb6cb10670970a 100644
--- a/community/atheme-iris/APKBUILD
+++ b/community/atheme-iris/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="AJAX IRC client. It is a drop-in replacement for qwebirc."
 url="http://www.atheme.net/iris.html"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="py-twisted py-simplejson py-openssl py-zope-interface"
 depends_dev=""
 makedepends="$depends_dev python2-dev"
diff --git a/community/atril/APKBUILD b/community/atril/APKBUILD
index c612eb0e26faf3d3755a28fbce1c02036dcfcbdd..6dbb54512d577ddf8cc8cb7f85a7ba35b9c4d082 100644
--- a/community/atril/APKBUILD
+++ b/community/atril/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A document viewer for MATE"
 url="https://github.com/mate-desktop/atril"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="mate-icon-theme abiword-plugin-epub"
 # make check is broken: https://github.com/mate-desktop/atril/issues/167
 options="!check"
diff --git a/community/attica/APKBUILD b/community/attica/APKBUILD
index de61c454758bf631c25b32bb99d41f56b17b4b87..91366a2139085424c543cec210a5c9abe352c72a 100644
--- a/community/attica/APKBUILD
+++ b/community/attica/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Freedesktop OCS binding for Qt"
 url="http://www.kde.org/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="qt-dev cmake automoc4"
 subpackages="$pkgname-dev"
 source="http://download.kde.org/stable/attica/attica-$pkgver.tar.bz2"
diff --git a/community/audacity/APKBUILD b/community/audacity/APKBUILD
index 301417b5dd685b1c88a8d33615fbd3d7c63c7833..23aa2168d53645a089a5aad063153d094e86cbd1 100644
--- a/community/audacity/APKBUILD
+++ b/community/audacity/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Multitrack audio editor"
 url="http://audacity.sourceforge.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="$depends_dev
 	alsa-lib-dev
 	bash
diff --git a/community/autoconf2.13/APKBUILD b/community/autoconf2.13/APKBUILD
index 727d25eef643ffde6ae45061cf8d1c924fb6b95c..443b409c014681a8ee91b66c813f7cbda5da4846 100644
--- a/community/autoconf2.13/APKBUILD
+++ b/community/autoconf2.13/APKBUILD
@@ -4,7 +4,7 @@ pkgver=2.13
 pkgrel=0
 pkgdesc="A GNU tool for automatically configuring source code"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 url="https://www.gnu.org/software/autoconf"
 depends="m4 perl"
 source="ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-${pkgver}.tar.gz
diff --git a/community/awake/APKBUILD b/community/awake/APKBUILD
index cf610955f34381da753d4a71562ef2cc2699ed6c..faae05630d2639f87e8f2c7bce317c4bb5d56772 100644
--- a/community/awake/APKBUILD
+++ b/community/awake/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A python command and library to 'wake on lan' a remote host"
 url="https://github.com/cyraxjoe/awake"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="py3-awake"
 makedepends="python3-dev"
 subpackages="py3-$pkgname:py3 $pkgname-doc"
diff --git a/community/awesome/APKBUILD b/community/awesome/APKBUILD
index 62b7be11fc899942b50b43c55c32af1705b4a845..e4ae6dbc6081cea36cc5df547690845ffb3c0211 100644
--- a/community/awesome/APKBUILD
+++ b/community/awesome/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="lua-configurable window manager framework"
 url="http://awesome.naquadah.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="imagemagick lua5.1-lgi cairo-gobject pango"
 makedepends="lua lua5.1 lua5.1-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev
 	imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev
diff --git a/community/babl/APKBUILD b/community/babl/APKBUILD
index 994728270cc13afd72eb0a9a758f0c8a561c7a78..3b7efc42b13fcce998826b1d803f415d04b755d5 100644
--- a/community/babl/APKBUILD
+++ b/community/babl/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Dynamic, any to any, pixel format conversion library"
 url="http://gegl.org/babl/"
 arch="all"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 subpackages="$pkgname-dev"
 source="http://ftp.gimp.org/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
 
diff --git a/community/bannergrab/APKBUILD b/community/bannergrab/APKBUILD
index cc23355c7dea05cfbd9c2b03ca0c677b379e4e88..ab2102c470147f0928abfbb68ccd775ad6314ae4 100644
--- a/community/bannergrab/APKBUILD
+++ b/community/bannergrab/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="A banner grabbing tool"
 url="https://sourceforge.net/projects/bannergrab"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="libressl-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz"
diff --git a/community/bareos-webui/APKBUILD b/community/bareos-webui/APKBUILD
index 60a73fd8eff949f956b44ca30f0c7728e484a004..cc7aa2173fa6b1325154dd46c30024bd8d06458c 100644
--- a/community/bareos-webui/APKBUILD
+++ b/community/bareos-webui/APKBUILD
@@ -9,7 +9,7 @@ pkgdesc="Bareos Web User Interface"
 url="http://www.bareos.org/en/bareos-webui.html"
 arch="noarch"
 options="!check"
-license=" AGPL-3.0"
+license="AGPL-3.0"
 depends="$_php-bz2 $_php-ctype $_php-curl $_php-dom $_php-fileinfo $_php-gettext $_php-gd
 	$_php-iconv $_php-intl $_php-json $_php-mbstring $_php-openssl $_php-session
 	$_php-simplexml $_php-xml $_php-xmlreader $_php-xmlwriter $_php-zip
diff --git a/community/bareos/APKBUILD b/community/bareos/APKBUILD
index 3ea1eb760a4bdd1bb50fbba9ea873a0632a975e8..4fbb886c3af819b5886b961ecaae6cdf292bf905 100644
--- a/community/bareos/APKBUILD
+++ b/community/bareos/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
 url="http://www.bareos.org"
 arch="all"
 options="!check"
-license="AGPL3"
+license="AGPL-3.0"
 depends="perl"
 makedepends="file libtool libintl libpcap-dev lzo-dev \
 	sqlite-dev postgresql-dev gnutls-dev mariadb-dev acl-dev \
diff --git a/community/biber/APKBUILD b/community/biber/APKBUILD
index e1659015d1289b15cadd843af21e8063a6bd39cd..beb84b2d00146e366ac966cd972fcfbd17952fdf 100644
--- a/community/biber/APKBUILD
+++ b/community/biber/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Backend processor for BibLaTeX"
 url="https://github.com/plk/biber"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl perl-module-build perl-config-autoconf
 	perl-extutils-libbuilder perl-test-differences perl-file-which
 	perl-class-accessor perl-data-compare perl-data-dump perl-data-uniqid
diff --git a/community/binaryen/APKBUILD b/community/binaryen/APKBUILD
index a229eb8084bbbb82ce5d6225c7fc1d696d53cfb9..2e18346afe9d43adce27f240bca6c19cdb8e7a9c 100644
--- a/community/binaryen/APKBUILD
+++ b/community/binaryen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Compiler infrastructure and toolchain library for WebAssembly, in C++"
 url="https://github.com/WebAssembly/binaryen"
 arch="all !s390x"
-license="ASL-2.0"
+license="Apache-2.0"
 makedepends="cmake"
 checkdepends="nodejs python2"
 subpackages="$pkgname-dev"
diff --git a/community/binutils-avr/APKBUILD b/community/binutils-avr/APKBUILD
index c2dc2f9bf526390b7777e7eacf1da7f1305035b1..d337b388dca8cddbeeab40812d2231609929c81b 100644
--- a/community/binutils-avr/APKBUILD
+++ b/community/binutils-avr/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Tools necessary to build programs for AVR targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake"
 arch="all"
-license="GPL2 GPL3+ LGPL2 BSD"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
 	binutils-ld-fix-static-linking.patch
diff --git a/community/bogofilter/APKBUILD b/community/bogofilter/APKBUILD
index 99fb2ad51bb93810c1f4a4ebe04aae5d34584ea9..bef2c37ea04f4aa22f54d8eeaf318213a79e25c3 100644
--- a/community/bogofilter/APKBUILD
+++ b/community/bogofilter/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Bayesian mail filter that classifies mail by statistical analysis of the message's header and content."
 url="http://bogofilter.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="sqlite-dev"
diff --git a/community/btrbk/APKBUILD b/community/btrbk/APKBUILD
index 2953367ee6d13b9b83703edded29678a069e2988..696cc4bfedb497ce0a61c934be3da28ecf57bbb0 100644
--- a/community/btrbk/APKBUILD
+++ b/community/btrbk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Backup tool for btrfs subvolumes with atomic snapshots & incremental transfers"
 url="http://digint.ch/btrbk/"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="perl perl-date-calc btrfs-progs"
 makedepends="asciidoc"
 options="!check"
diff --git a/community/bubblewrap/APKBUILD b/community/bubblewrap/APKBUILD
index d33b1303e09c2db120df86a54e3c927e65e2c8e2..e2ecf4978d121f3658591f240b7e69b9877fc0ce 100644
--- a/community/bubblewrap/APKBUILD
+++ b/community/bubblewrap/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Unprivileged sandboxing tool"
 url="https://github.com/projectatomic/bubblewrap"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check suid"
 makedepends="autoconf automake libcap-dev docbook-xsl"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
diff --git a/community/buildbot/APKBUILD b/community/buildbot/APKBUILD
index 9d9698b66a8a7b9dafd5b4940822c18574343588..207c6a945ce6074cbb1fc110befdcfdaf959c807 100644
--- a/community/buildbot/APKBUILD
+++ b/community/buildbot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Continuous integration testing framework"
 url="http://buildbot.net/"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends="python2 py-twisted py-simplejson py2-sqlalchemy
 	py2-pysqlite py-jinja2 py2-sqlalchemy-migrate
 	py-dateutil py-setuptools"
diff --git a/community/bvi/APKBUILD b/community/bvi/APKBUILD
index 7d73fadd902e2c9bb3ec2616685ec24b1582719b..8aada1e9583ab0e01bd785baf7e83c17adec334c 100644
--- a/community/bvi/APKBUILD
+++ b/community/bvi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Display-oriented editor for binary files based on vi"
 url="http://bvi.sourceforge.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="ncurses-dev"
 install=""
diff --git a/community/bzr/APKBUILD b/community/bzr/APKBUILD
index e518081b1649eda0c2fafbb16aca253ab2647b98..7c4bc8484eae030f45283d67c1f11902fa35bd62 100644
--- a/community/bzr/APKBUILD
+++ b/community/bzr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 url="http://bazaar.canonical.com/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2"
 makedepends="python2-dev"
 subpackages="$pkgname-doc"
diff --git a/community/cabal/APKBUILD b/community/cabal/APKBUILD
index 76ff24b7c4c9e1d80d17ed5979e7d4b9ee93b975..cf825d6f931f235d265b20846c0e85e53e34c2d0 100644
--- a/community/cabal/APKBUILD
+++ b/community/cabal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="The Haskell Cabal"
 url="http://haskell.org"
 arch="armhf x86_64"
-license="BSD3"
+license="BSD-3-Clause"
 depends="gmp zlib"
 makedepends="ghc gmp-dev libffi-dev zlib-dev binutils-gold chrpath"
 subpackages="$pkgname-doc"
diff --git a/community/cacti/APKBUILD b/community/cacti/APKBUILD
index 8b32671c61c3236efc86ee608ecf2ab274ddb7ad..197a03d450ca9927be7c609078d0e9defc05692a 100644
--- a/community/cacti/APKBUILD
+++ b/community/cacti/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The complete rrdtool-based graphing solution"
 url="http://www.cacti.net"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 options="!check"
 pkgusers=$pkgname
 pkggroups="www-data"
diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD
index 1d020410f7b965dc3f35d7d43800d6ed1dd6c22e..0d235aab5044db860d8146541faea4db6afa4b45 100644
--- a/community/caddy/APKBUILD
+++ b/community/caddy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 url="https://caddyserver.com/"
 arch="all !s390x"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="ca-certificates"
 makedepends="go libcap bash"
 install="$pkgname.pre-install"
diff --git a/community/caja-extensions/APKBUILD b/community/caja-extensions/APKBUILD
index 008b37fac3f4a095a89f70bfc81e74825d02cfdc..1ba7c77b984fdb6abe30b2b9c3e5bcf64a4b8b94 100644
--- a/community/caja-extensions/APKBUILD
+++ b/community/caja-extensions/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Set of extensions for Caja file manager"
 url="https://github.com/mate-desktop/caja-extensions"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="caja"
 makedepends="glib-dev gtk+3.0-dev caja-dev dconf-dev
 	mate-desktop-dev"
diff --git a/community/caja/APKBUILD b/community/caja/APKBUILD
index 4a6b652fda7df33b85f796ffd3352fc1ba5c3ef2..2acec9693bad03ec2997ce7bc08b2e02566fb484 100644
--- a/community/caja/APKBUILD
+++ b/community/caja/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The file manager for the MATE desktop"
 url="https://github.com/mate-desktop/caja"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common mate-desktop"
 options="!check"
 makedepends="$depends_dev intltool libtool dconf-dev gtk+3.0-dev libunique3-dev
diff --git a/community/camlp4/APKBUILD b/community/camlp4/APKBUILD
index a4fbd37f74e3794f37c5e698bb51f99055340f3e..beac9f559a895cabd8b853f8f27c8fb7157ac431 100644
--- a/community/camlp4/APKBUILD
+++ b/community/camlp4/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Caml preprocessor and pretty-printer"
 url="https://github.com/ocaml/camlp4/releases"
 arch="all !x86 !armhf !s390x" #ocaml not avail on excluded platforms
-license="LGPL2"
+license="LGPL-2.0"
 depends="ocaml"
 makedepends="ocamlbuild"
 options="!makeflags !emptydirs staticlibs"
diff --git a/community/capitaine-cursors/APKBUILD b/community/capitaine-cursors/APKBUILD
index 653a8478158830f67b148a162f1dae70ae53aafa..1b7ed9b557bc842fe9569e950132268f8167a2f0 100644
--- a/community/capitaine-cursors/APKBUILD
+++ b/community/capitaine-cursors/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="An x-cursor theme inspired by macOS and based on KDE Breeze"
 url="https://github.com/keeferrourke/capitaine-cursors"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 source="https://github.com/keeferrourke/capitaine-cursors/archive/r$pkgver.tar.gz"
 options="!check"
 builddir="$srcdir"/$pkgname-r$pkgver
diff --git a/community/captagent/APKBUILD b/community/captagent/APKBUILD
index 321559becb16c32e8841708a217ef0793428b251..fb98e3a0bdd189d1c69bcf91f84e2b4adfe0cc0d 100644
--- a/community/captagent/APKBUILD
+++ b/community/captagent/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="HEP Capture Agent for HOMER"
 url="https://github.com/sipcapture/captagent"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="autoconf automake bison expat-dev flex flex-dev json-c-dev
              libpcap-dev libtool libuv-dev linux-headers"
 source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/captagent/archive/$pkgver.tar.gz
diff --git a/community/cargo/APKBUILD b/community/cargo/APKBUILD
index 0ca60973511eca2db5942ec5c0a2c220219acca4..4aa01f057e1f8d8033bb97c9df648c1077508fef 100644
--- a/community/cargo/APKBUILD
+++ b/community/cargo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="The Rust package manager"
 url="https://crates.io"
 arch="x86_64"  # limited by rust pkg
-license="MIT ASL-2.0"
+license="MIT Apache-2.0"
 depends="rust"
 makedepends="cmake curl-dev libgit2-dev libssh2-dev libressl-dev python2 zlib-dev"
 subpackages="$pkgname-doc
diff --git a/community/cassandra-cpp-driver/APKBUILD b/community/cassandra-cpp-driver/APKBUILD
index 6ab55679a90d2bca5680f86d2e578f689c12ceb1..4e62366148276fc05007e51c16d9b4b41928702b 100644
--- a/community/cassandra-cpp-driver/APKBUILD
+++ b/community/cassandra-cpp-driver/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Cassandra CPP Driver"
 url="http://datastax.github.io/cpp-driver/"
 arch="x86_64 x86 ppc64le"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=
 makedepends="cmake make libressl-dev libuv-dev"
 subpackages="$pkgname-dev"
diff --git a/community/ccid/APKBUILD b/community/ccid/APKBUILD
index c5c82141037fc5461548dd10f640f561b4971a97..d550493047d620c5cc82cfe9aebaf69648504b76 100644
--- a/community/ccid/APKBUILD
+++ b/community/ccid/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="USB CCID/ICCD SmartCard reader driver"
 url="https://pcsclite.alioth.debian.org/ccid.html"
 arch="all"
-license="LGPL2.1+"
+license="LGPL-2.1-or-later"
 depends="pcsc-lite"
 makedepends="perl libusb-dev pcsc-lite-dev"
 install=""
diff --git a/community/cfengine/APKBUILD b/community/cfengine/APKBUILD
index 2572eed4785aca72042f48330d50427ab7fe676b..b525c2893028fd8f4c2d74a24750969843d269ac 100644
--- a/community/cfengine/APKBUILD
+++ b/community/cfengine/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A systems administration tool for networks"
 url="http://www.cfengine.com/"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 makedepends="$depends_dev lmdb-dev libressl-dev bison flex-dev
 	acl-dev pcre-dev linux-headers"
 subpackages="$pkgname-doc $pkgname-masterfiles::noarch"
diff --git a/community/chntpw/APKBUILD b/community/chntpw/APKBUILD
index e878a787f6e68b8b418fa1b8a03c083936c5299e..86f00e4e07f658431c74246045495fc85a3567c6 100644
--- a/community/chntpw/APKBUILD
+++ b/community/chntpw/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Change passwords in Windows SAM files"
 url="http://pogostick.net/~pnh/ntpasswd/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libressl-dev"
 source="http://pogostick.net/~pnh/ntpasswd/$pkgname-source-$pkgver.zip
 	stdint.patch"
diff --git a/community/clasp/APKBUILD b/community/clasp/APKBUILD
index 7a5b8392230ff899384a62a57aaa46c1c4893bcf..018b0842ae2e35fa39374701a16cb313072f9b13 100644
--- a/community/clasp/APKBUILD
+++ b/community/clasp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Answer set solver for (extended) normal logic programs"
 url="https://potassco.org/"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 depends=""
 makedepends="bash"
 install=""
diff --git a/community/claws-mail/APKBUILD b/community/claws-mail/APKBUILD
index 23a334df4b27cb1f49af225ea0c2a874c5834006..68b7483b0126413f2ae7df2034c3e7ab892f3ab1 100644
--- a/community/claws-mail/APKBUILD
+++ b/community/claws-mail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A GTK+ based e-mail client."
 url="http://www.claws-mail.org"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang
 	$pkgname-plugins-acpi-notifier:_acpi
 	$pkgname-plugins-address-keeper:_address_keeper
diff --git a/community/cloc/APKBUILD b/community/cloc/APKBUILD
index 2242d8fd8a46e2847db223278081aee77a5320aa..f76eb5712523f445303a680f22bcf615f372f2d3 100644
--- a/community/cloc/APKBUILD
+++ b/community/cloc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Count lines of code"
 url="https://github.com/AlDanial/cloc"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl perl-algorithm-diff perl-regexp-common"
 makedepends=""
 subpackages="$pkgname-doc"
diff --git a/community/clsync/APKBUILD b/community/clsync/APKBUILD
index f5f1ae57fe434967e5caf0aa9ccffb76c65c95cc..e06d4e0fc9896ba18263892522e174d6f09dd3ee 100644
--- a/community/clsync/APKBUILD
+++ b/community/clsync/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="File live sync daemon based on inotify"
 url="https://github.com/xaionaro/clsync"
 arch="x86 x86_64"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends=""
 depends_dev="glib-dev fts-dev libcap-dev libexecinfo-dev linux-headers musl-dev"
 makedepends="$depends_dev autoconf automake file libtool"
diff --git a/community/cmus/APKBUILD b/community/cmus/APKBUILD
index 7f2cad93ce4ad8ab84e7cceff6d151317c6aded4..2c1a7e96fa5bee002927a6a5f671feb2f24eec01 100644
--- a/community/cmus/APKBUILD
+++ b/community/cmus/APKBUILD
@@ -8,7 +8,7 @@ _ver=${pkgver/_rc/-rc}
 pkgdesc="A very feature-rich ncurses-based music player"
 url="http://cmus.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="alsa-lib-dev faad2-dev flac-dev libmad-dev opusfile-dev
diff --git a/community/connman/APKBUILD b/community/connman/APKBUILD
index e84228dfd216981cdaeaeb8a1694ff37e5414d01..3b7a296437b1330502245b91e8c14de10214ca4c 100644
--- a/community/connman/APKBUILD
+++ b/community/connman/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A daemon for managing internet connections"
 url="http://connman.net/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="wpa_supplicant"
 makedepends="autoconf automake libtool
 	glib-dev iptables-dev readline-dev dbus-dev
diff --git a/community/copy-router-config/APKBUILD b/community/copy-router-config/APKBUILD
index 9ab306f3ae8c5c763bae9201b49e093589c174d6..bdf0a20e9afcd5a21c685e97714743c51a05ecbc 100644
--- a/community/copy-router-config/APKBUILD
+++ b/community/copy-router-config/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="copy-router-config and merge-router-config to copy and merge Cisco Routers Configuration"
 url="https://www.offensive-security.com/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl perl-cisco-copyconfig"
 makedepends=""
 source="http://ftp.tku.edu.tw/kali/pool/main/c/$pkgname/${pkgname}_${pkgver}.orig.tar.gz"
diff --git a/community/corebird/APKBUILD b/community/corebird/APKBUILD
index ad0fc9a372481cb89e1293dd1ec3d0e70176deb1..347d54723226decda379dcbdc39fa32c036ea7b8 100644
--- a/community/corebird/APKBUILD
+++ b/community/corebird/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Corebird is a modern, easy and fun Twitter client"
 url="https://corebird.baedert.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="gtk+3.0-dev rest-dev json-glib-dev sqlite-dev libsoup-dev libgee-dev
 		vala tiff automake autoconf libtool intltool glib-dev libxml2-utils file"
 options="libtool !check"
diff --git a/community/cppcheck/APKBUILD b/community/cppcheck/APKBUILD
index 0f7a5f00bf591a95d3d9fec488aa9a9b6f3c63d2..f84078eda7e2b5f9f993fd1e5599c8469bab2d93 100644
--- a/community/cppcheck/APKBUILD
+++ b/community/cppcheck/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A static analysis tool for C/C++ code"
 url="http://cppcheck.sourceforge.net"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="docbook-xsl pcre-dev qt5-qttools-dev"
 subpackages="$pkgname-doc $pkgname-htmlreport::noarch $pkgname-gui"
diff --git a/community/dash/APKBUILD b/community/dash/APKBUILD
index 3e855de69946ee5d629749814f18753738aaf1bb..f9352be29665747d54e65127ce0ddc504450e00b 100644
--- a/community/dash/APKBUILD
+++ b/community/dash/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Small and fast POSIX-compliant shell"
 url="http://gondor.apana.org.au/~herbert/dash/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 # needs 'nl' utility from coreutils
 makedepends="coreutils"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
diff --git a/community/davfs2/APKBUILD b/community/davfs2/APKBUILD
index 357a2fa8d4c032734d9526813c8e90b74ee8c74f..faa498121fdb0cf2b6c7e9f3cf1b11fd113c371d 100644
--- a/community/davfs2/APKBUILD
+++ b/community/davfs2/APKBUILD
@@ -8,7 +8,7 @@ url="http://savannah.nongnu.org/projects/davfs2"
 options="suid"
 pkggroups="davfs2"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev="libxml2-dev neon-dev zlib-dev linux-headers"
 makedepends="$depends_dev autoconf automake libtool"
diff --git a/community/dcadec/APKBUILD b/community/dcadec/APKBUILD
index 47a359de7159ff0cb639d70d4f83a11270a37823..37bcc6edccfbdd352fbe1b75d6b5e45d07ea6fb8 100644
--- a/community/dcadec/APKBUILD
+++ b/community/dcadec/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="DTS Coherent Acoustics decoder with support for HD extensions"
 url="https://github.com/foo86/dcadec"
 arch="all"
-license="LGPLv2.1"
+license="LGPL-2.1"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/community/ddrescue/APKBUILD b/community/ddrescue/APKBUILD
index f8e39d696f76b760c476bb7fb850237d075038e7..7320baa23b2cf473d0931af5ee72f65eecf63e80 100644
--- a/community/ddrescue/APKBUILD
+++ b/community/ddrescue/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Data recovery tool for block devices with errors"
 url="https://www.gnu.org/s/ddrescue/ddrescue.html"
 arch="all !aarch64"
-license="GPL3+"
+license="GPL-3.0-or-later"
 subpackages="$pkgname-doc"
 source="http://ftp.heanet.ie/mirrors/gnu/$pkgname/$pkgname-$pkgver.tar.lz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/community/dia/APKBUILD b/community/dia/APKBUILD
index d8c82f35828755eb395517c2aa856799f364d117..2b0fff5b2e225ad366d324469dec428fa4846bac 100644
--- a/community/dia/APKBUILD
+++ b/community/dia/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="a GTK+ based diagram creation program"
 url="http://live.gnome.org/Dia"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="gtk+2.0-dev libxml2-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://download.gnome.org/sources/dia/${pkgver%.*}/dia-$pkgver.tar.xz
diff --git a/community/diff-pdf/APKBUILD b/community/diff-pdf/APKBUILD
index 4cb28f10b81a359aed369ae926832aa8321500d4..430676e963ca40489066bdcf682429fda367d7ed 100644
--- a/community/diff-pdf/APKBUILD
+++ b/community/diff-pdf/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A simple tool for visually comparing two PDF files"
 url="https://vslavik.github.io/diff-pdf/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="autoconf automake cairo-dev poppler-dev wxgtk-dev"
 source="$pkgname-$_gitrev.tar.gz::https://github.com/vslavik/$pkgname/archive/$_gitrev.tar.gz"
 builddir="$srcdir/$pkgname-$_gitrev"
diff --git a/community/dnsrecon/APKBUILD b/community/dnsrecon/APKBUILD
index 8726a2baf692b34ec1f0e9259aa03c6f77aa5566..28064df3e6f0d3a4b76936564eeabea61c682cd7 100644
--- a/community/dnsrecon/APKBUILD
+++ b/community/dnsrecon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="DNS Enumeration Script"
 url="https://github.com/darkoperator/dnsrecon"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2 py2-dnspython py2-netaddr"
 install=""
 subpackages=""
diff --git a/community/docker-py/APKBUILD b/community/docker-py/APKBUILD
index e2bce61addacd992f0f3ec783017b364f0682c7c..254a790c7d9543b0c47e7e80ce401ead58db2181 100644
--- a/community/docker-py/APKBUILD
+++ b/community/docker-py/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An API client for docker written in Python"
 url="https://github.com/dotcloud/docker-py"
 arch="noarch"
-license="APACHE"
+license="Apache"
 depends="python2 py2-requests py2-six py2-websocket-client dockerpy-creds"
 makedepends="python2-dev py2-pip py-setuptools py2-six flake8 py-mock"
 source="$pkgname-$pkgver.tar.gz::https://github.com/docker/$pkgname/archive/$pkgver.tar.gz"
diff --git a/community/docker-registry/APKBUILD b/community/docker-registry/APKBUILD
index 7c9490b44a038354a22cc8299d944349e6cba7b1..71ef739d85c15b0384fd7ccb56b84326d0712968 100644
--- a/community/docker-registry/APKBUILD
+++ b/community/docker-registry/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An implementation of the Docker Registry HTTP API V2 for use with docker 1.6+"
 url="https://github.com/docker/distribution"
 arch="x86 x86_64 ppc64le"
-license="ASL-2.0"
+license="Apache-2.0"
 makedepends="git go"
 install="$pkgname.pre-install"
 pkgusers="docker-registry"
diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD
index 2c7f90f45af4e52beaa57b3132057814e75916ca..fdbed11084cbfc227ad85ffacc0290baca725973 100644
--- a/community/docker/APKBUILD
+++ b/community/docker/APKBUILD
@@ -7,7 +7,7 @@ _gitcommit=v$_ver
 pkgdesc="Pack, ship and run any application as a lightweight container"
 url="http://www.docker.io/"
 arch="all !s390x"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="ca-certificates iptables"
 makedepends="go btrfs-progs-dev bash linux-headers coreutils libseccomp-dev cmake lvm2-dev libtool"
 options="!check"
diff --git a/community/dockerpy-creds/APKBUILD b/community/dockerpy-creds/APKBUILD
index 57f30d97271e80c74000c64b7101f297fbdc23d1..1bf6067ff303be90611c504d474900bfbd79131b 100644
--- a/community/dockerpy-creds/APKBUILD
+++ b/community/dockerpy-creds/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Python bindings for the docker credentials store API"
 url="https://github.com/shin-/dockerpy-creds"
 arch="noarch"
-license="APACHE"
+license="Apache"
 depends="python2 py2-six"
 makedepends="python2-dev py-setuptools"
 source="$pkgname-$pkgver.tar.gz::https://github.com/shin-/dockerpy-creds/archive/$pkgver.tar.gz"
diff --git a/community/duo_unix/APKBUILD b/community/duo_unix/APKBUILD
index 5efc216cf553dd0b7fe88b87aaa3f2b1f9c37d76..8ea50ffb48f177c174027954b870d9914b660b3d 100644
--- a/community/duo_unix/APKBUILD
+++ b/community/duo_unix/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="duosecurity.com two-factor authentication"
 url="https://duo.com/support/documentation/duounix"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="libressl-dev zlib-dev"
 makedepends="$depends_dev"
diff --git a/community/dynamips/APKBUILD b/community/dynamips/APKBUILD
index fd83a83f649113fe496612fce6747c9cd8f5c71a..2573d2d5ff5774bb5ef8dbed15d56a234e90c654 100644
--- a/community/dynamips/APKBUILD
+++ b/community/dynamips/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Cisco router emulator"
 url="https://github.com/GNS3/dynamips"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="cmake libpcap-dev libelf-dev linux-headers paxmark libnsl-dev"
 subpackages="$pkgname-doc"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/GNS3/${pkgname}/archive/v${pkgver}.tar.gz
diff --git a/community/easy-rsa/APKBUILD b/community/easy-rsa/APKBUILD
index 1b59914803e1861925c6cf7d53496f5f529dc252..dac27b43bbd8e0693084ed16fb48d54e39eb04cc 100644
--- a/community/easy-rsa/APKBUILD
+++ b/community/easy-rsa/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Simple shell based CA utility"
 url="https://github.com/OpenVPN/easy-rsa"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="openssl"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/OpenVPN/easy-rsa/archive/v$pkgver.tar.gz"
diff --git a/community/elasticsearch/APKBUILD b/community/elasticsearch/APKBUILD
index cee64164b1757881708ea7c8d5f10830e94d7ad9..1dccab8e5501cc1b835cf4af10115453cc519c8e 100644
--- a/community/elasticsearch/APKBUILD
+++ b/community/elasticsearch/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Open Source, Distributed, RESTful Search Engine"
 url="https://www.elastic.co/products/elasticsearch"
 arch="x86 x86_64"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="java-jna-native>=4.1 openjdk8-jre bash"
 makedepends=""
 install="$pkgname.pre-install"
diff --git a/community/elixir/APKBUILD b/community/elixir/APKBUILD
index 08193a861debc526e5a60c630a39f51bc377f6aa..a78d9f58182a69158ba34add1e91e6a4f059de07 100644
--- a/community/elixir/APKBUILD
+++ b/community/elixir/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Elixir is a dynamic, functional language designed for building scalable and maintainable applications"
 url="http://elixir-lang.org"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 options="!check"
 depends="erlang erlang-inets erlang-ssl
 	erlang-public-key erlang-asn1 erlang-sasl erlang-erl-interface erlang-dev"
diff --git a/community/emacs/APKBUILD b/community/emacs/APKBUILD
index 24d386a97769e18e8c6b01a8b2fed5f9c10a6c53..05b76da9b8876a3f2ad9f02d66820955283fa022 100644
--- a/community/emacs/APKBUILD
+++ b/community/emacs/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="The extensible, customizable, self-documenting real-time display editor
 arch="all !aarch64"
 depends="emacs-nox"
 url="https://www.gnu.org/software/emacs/emacs.html"
-license="GPL3"
+license="GPL-3.0"
 makedepends="autoconf automake linux-headers paxmark gawk
 	librsvg-dev giflib-dev libxpm-dev gtk+2.0-dev gconf-dev alsa-lib-dev
 	glib-dev fontconfig-dev libpng-dev
diff --git a/community/engrampa/APKBUILD b/community/engrampa/APKBUILD
index 583b4355eb35edb0f5c93ed6908aef4f37b968db..af39c0817e40f84acbbb343876d6bf111f694abb 100644
--- a/community/engrampa/APKBUILD
+++ b/community/engrampa/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An archive manager for the MATE"
 url="http://mate-desktop.org/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="libxml2-utils"
 makedepends="glib-dev gtk+3.0-dev caja-dev itstool libsm-dev"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/community/eom/APKBUILD b/community/eom/APKBUILD
index 175e0d26ffe15eba184f04cd97a4948f66e08460..804671534937038721c2bf37a176ca1bd1c0ed8e 100644
--- a/community/eom/APKBUILD
+++ b/community/eom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A simple graphics viewer for the MATE"
 url="https://github.com/mate-desktop/eom"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="mate-icon-theme libxml2-utils"
 makedepends="glib-dev gtk+3.0-dev itstool mate-desktop-dev
 	libexif-dev lcms2-dev dconf-dev dbus-dev librsvg-dev 
diff --git a/community/erlang/APKBUILD b/community/erlang/APKBUILD
index 4cfab43ed617cc35ddb188176f677e130db07e0e..1ddc5700c7fab9d81d05e49faf1c54d64b50a630 100644
--- a/community/erlang/APKBUILD
+++ b/community/erlang/APKBUILD
@@ -8,7 +8,7 @@ _srcver=$pkgver
 pkgrel=2
 pkgdesc="General-purpose programming language and runtime environment"
 url="http://www.erlang.org/"
-license="ASL 2.0"
+license="Apache-2.0"
 arch="all"
 depends="$pkgname-kernel $pkgname-stdlib $pkgname-compiler"
 makedepends="perl-dev zlib-dev ncurses-dev libressl-dev openjdk8 unixodbc-dev
diff --git a/community/etckeeper/APKBUILD b/community/etckeeper/APKBUILD
index 9e4825941802b10bd77e87c5d95a46c993bed945..a8e43b6d747518ba3481396f61f0340f61483590 100644
--- a/community/etckeeper/APKBUILD
+++ b/community/etckeeper/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Store /etc in git."
 url="http://etckeeper.branchable.com"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 checkdepends="bats fakeroot"
 depends="findutils git"
 subpackages="$pkgname-doc"
diff --git a/community/evtest/APKBUILD b/community/evtest/APKBUILD
index 520210e9a3b8b4a24f165abecf33e513548bc227..0a98dc6cfb0d970b4e17f002e6451f36df045ad9 100644
--- a/community/evtest/APKBUILD
+++ b/community/evtest/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="monitor input layer events"
 url="https://cgit.freedesktop.org/evtest/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/community/exim/APKBUILD b/community/exim/APKBUILD
index 7470a69fb70d3bc7512ebaac26a23ae3c12d8a73..2972152a1f0aa1bc90f6d70b1df63c4c7464cfdd 100644
--- a/community/exim/APKBUILD
+++ b/community/exim/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="A Message Transfer Agent"
 url="http://www.exim.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="!check suid"
 depends="ca-certificates"
 pkgusers="$pkgname"
diff --git a/community/ezstream/APKBUILD b/community/ezstream/APKBUILD
index 1288b4c2f77190bb2e5cb40a7d5b5f5e817f2099..d102f2a90e08b94ced744875b0e77983ebae7550 100644
--- a/community/ezstream/APKBUILD
+++ b/community/ezstream/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Ezstream is a command line source client for Icecast media streaming servers."
 url="http://www.icecast.org/ezstream.php"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libshout-dev libxml2-dev libvorbis-dev"
diff --git a/community/fann/APKBUILD b/community/fann/APKBUILD
index 7ef5fb6ed6a011df8670f02733d13f76d8953ed8..82727c0dd4735586492e49e346dd136ff5b0d2c5 100644
--- a/community/fann/APKBUILD
+++ b/community/fann/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Fast Artificial Neural Network Library"
 url="http://leenissen.dk/fann/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="cmake"
 subpackages="$pkgname-dev $pkgname-fixed:_lib $pkgname-float:_lib $pkgname-double:_lib"
 source="$pkgname-$pkgver.tar.gz::https://github.com/lib$pkgname/$pkgname/archive/$pkgver.tar.gz"
diff --git a/community/fbida/APKBUILD b/community/fbida/APKBUILD
index 3e16f29552487181fcd451519cd1cb2b87faafa1..15f6aa705c2b782d08ec15bff943139c900d6cb7 100644
--- a/community/fbida/APKBUILD
+++ b/community/fbida/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Few applications to display and elementary edit images"
 url="http://www.kraxel.org/blog/linux/$pkgname/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="freetype-dev fontconfig-dev libdrm-dev libexif-dev
diff --git a/community/ffmpegthumbnailer/APKBUILD b/community/ffmpegthumbnailer/APKBUILD
index 339f9f736c6ee5bd70b0224941020b86e5b806be..5563bcee0b54c57f77b9e768c9da56a162283d39 100644
--- a/community/ffmpegthumbnailer/APKBUILD
+++ b/community/ffmpegthumbnailer/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Lightweight video thumbnailer that can be used by file managers"
 url="https://github.com/dirkvdb/ffmpegthumbnailer"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="ffmpeg-dev libpng-dev libjpeg-turbo-dev cmake"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.bz2::https://github.com/dirkvdb/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2"
diff --git a/community/firejail/APKBUILD b/community/firejail/APKBUILD
index 7b4bec0f8da209f75f076266919a9d54beffaab6..cdc1d5e1330e6b7e5f0cfe644bcfb11c4ab54b88 100644
--- a/community/firejail/APKBUILD
+++ b/community/firejail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Linux namespaces and seccomp-bpf sandbox"
 url="https://firejail.wordpress.com/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="bash"
 makedepends="linux-headers"
 checkdepends="expect"
diff --git a/community/firetools/APKBUILD b/community/firetools/APKBUILD
index 2f68354cae9e9a0239041cbea1ca0cb286b6c5b0..b2daefef3cc7849b68409f18e6ebfe077760967e 100644
--- a/community/firetools/APKBUILD
+++ b/community/firetools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Firejail sandbox launcher integrated with the system tray"
 url="https://l3net.wordpress.com/projects/firejail/#firetools"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="firejail xterm qt5-qtsvg mesa-dri-swrast"
 makedepends="qt5-qtbase-dev qt5-qtsvg-dev"
 options="!check"
diff --git a/community/fuse-exfat/APKBUILD b/community/fuse-exfat/APKBUILD
index 353b5e94d49dd4e6defaa6d429c7fb4e30ddd7e5..237112e1a91a3794df70c7d54d848f038a074cf6 100644
--- a/community/fuse-exfat/APKBUILD
+++ b/community/fuse-exfat/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Free exFAT file system implementation"
 url="https://github.com/relan/exfat"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 provides="$_pkgreal"
 depends="fuse"
 makedepends="autoconf automake fuse-dev"
diff --git a/community/fvwm/APKBUILD b/community/fvwm/APKBUILD
index 3e9e77823f527aa12f19c6c04604a07f88d0db9b..e1cb3a03b075da90695e67dc291378fb73ad2ef0 100644
--- a/community/fvwm/APKBUILD
+++ b/community/fvwm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="FVWM is a powerful desktop window manager for the X  Window system"
 url="http://fvwm.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="perl libxslt libxcursor-dev libx11-dev freetype-dev fontconfig-dev
diff --git a/community/gammu/APKBUILD b/community/gammu/APKBUILD
index 3ff943e5faa9737102baff9c0e1c887d540bb2f8..d7a03febe64d24389b6a074cbfedc1bf19929021 100644
--- a/community/gammu/APKBUILD
+++ b/community/gammu/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Gammu provides an abstraction layer for cell phones access"
 url="https://wammu.eu/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="dialog bluez"
 makedepends="unixodbc-dev libdbi-dev postgresql-dev
 	bluez-dev mysql-dev libusb-dev curl-dev cmake doxygen linux-headers"
diff --git a/community/gdnsd/APKBUILD b/community/gdnsd/APKBUILD
index 951772df15d43bf9c55ce3e365a2de7f12acb322..5d42536bd45748be3adefd80a740bbf69e2fc1d8 100644
--- a/community/gdnsd/APKBUILD
+++ b/community/gdnsd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Geographic Authoritative DNS server"
 url="https://github.com/blblack/gdnsd/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 options="!checkroot"
diff --git a/community/geany-plugins/APKBUILD b/community/geany-plugins/APKBUILD
index 9e009f841b93f7e9e3412ffa12c5458f43e17c0c..350f645bf5c5783753eafc6d699676e0d603ec77 100644
--- a/community/geany-plugins/APKBUILD
+++ b/community/geany-plugins/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Plugins for Geany"
 url="https://plugins.geany.org/"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends=""
 makedepends="lua-dev geany-dev enchant-dev intltool gtkspell-dev libxml2-dev
 	bash vte-dev vala libsoup-dev gpgme-dev python2-dev py-gtk-dev"
diff --git a/community/gegl/APKBUILD b/community/gegl/APKBUILD
index e3852295d89cfccf4cb0c16880b2e116fa8f1a6f..0b6df284255a610332bc1844cd20f402ee34a2b1 100644
--- a/community/gegl/APKBUILD
+++ b/community/gegl/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=5
 pkgdesc="Graph based image processing framework"
 url="http://www.gegl.org/"
 arch="all"
-license="GPL3 LGPL3"
+license="GPL-3.0 LGPL-3.0"
 makedepends="babl-dev libpng-dev libjpeg-turbo-dev gtk+-dev librsvg-dev
 	lua5.1-dev jasper-dev exiv2-dev"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/geocode-glib/APKBUILD b/community/geocode-glib/APKBUILD
index 8fd0cfa77e9eb05106da52c06025a3b39f705870..615b34616515e41e8e785dc8d4e02980a57239e4 100644
--- a/community/geocode-glib/APKBUILD
+++ b/community/geocode-glib/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Geocoding helper library"
 url="https://www.gnome.org/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev glib-dev gobject-introspection-dev intltool
diff --git a/community/geth/APKBUILD b/community/geth/APKBUILD
index 76b50c65802a35f019a7058ef9a49beb71ea3d98..2c7bf6602c875dd9ec0eaf81824108e8e06c164a 100644
--- a/community/geth/APKBUILD
+++ b/community/geth/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Official Go implementation of the Ethereum protocol"
 url="https://geth.ethereum.org/"
 arch="all"
-license="LGPLv3"
+license="LGPL-3.0"
 makedepends="go linux-headers"
 checkdepends="fuse"
 options="!check"
diff --git a/community/ghc/APKBUILD b/community/ghc/APKBUILD
index 9b922eb4aebf2c9d1e750090de004a6937d246a3..f1c52931570402268980d97b2a9d07589a2e9a9a 100644
--- a/community/ghc/APKBUILD
+++ b/community/ghc/APKBUILD
@@ -8,7 +8,7 @@ arch="x86_64 armhf"
 # Note ghc's license is basically BSD-3. If you'd like to know more visit:
 # * https://www.haskell.org/ghc/license
 # * https://ghc.haskell.org/trac/ghc/wiki/Licensing
-license="custom:BSD-3"
+license="BSD-3-Clause"
 # Note that ghc is sensitive to the version of llvm used,
 # hence the llvm3.7 package.
 #
diff --git a/community/gifsicle/APKBUILD b/community/gifsicle/APKBUILD
index 7dc4d6bce9beafa80cf431420d77fb961d1b9c8e..610019356b8c60945ace35b8f78052dc47d0864e 100644
--- a/community/gifsicle/APKBUILD
+++ b/community/gifsicle/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Command-line tool for making, editing, and getting information about GIF animations"
 url="http://www.lcdf.org/gifsicle/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libx11-dev libice-dev libsm-dev"
 subpackages="$pkgname-doc"
 source="http://www.lcdf.org/gifsicle/gifsicle-$pkgver.tar.gz"
diff --git a/community/gimp/APKBUILD b/community/gimp/APKBUILD
index 1e212aec7038ea50573540d78cdbff9ee4c55a95..9fe1e2d356efdafbcc03fe0aea5cc450f8831a64 100644
--- a/community/gimp/APKBUILD
+++ b/community/gimp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="GNU Image Manipulation Program"
 url="https://www.gimp.org/"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends="dbus"
 makedepends="gtk+-dev libxpm-dev libxmu-dev librsvg-dev dbus-glib-dev
 	libexif-dev desktop-file-utils intltool gegl-dev tiff-dev
diff --git a/community/glances/APKBUILD b/community/glances/APKBUILD
index b83323a207e427214b5c9e8e9dca6d3e5d95bf2b..ae5a1d7ab9f2847d2c0569eeb693822d3460b430 100644
--- a/community/glances/APKBUILD
+++ b/community/glances/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A CLI curses based monitoring tool"
 url="http://nicolargo.github.com/glances/"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends="py2-psutil py2-bottle py2-snmp py2-batinfo docker-py py-setuptools"
 makedepends="python2-dev py-setuptools"
 subpackages="$pkgname-doc"
diff --git a/community/gnomad2/APKBUILD b/community/gnomad2/APKBUILD
index f95e5c68bbdf6fbc7bb1854f8848dff0fcd3e5e2..436f9bce86230fdb8b908de43c9cf6a77968cbaf 100644
--- a/community/gnomad2/APKBUILD
+++ b/community/gnomad2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs"
 url="http://gnomad2.sourceforge.net"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 makedepends="gtk+2.0-dev libnjb-dev libmtp-dev libid3tag-dev
 	taglib-dev libgudev-dev"
 subpackages="$pkgname-lang $pkgname-doc"
diff --git a/community/gnome-colors/APKBUILD b/community/gnome-colors/APKBUILD
index 97231a484eec2678e348ffeb25958c93014faabd..da380374492e6db80d39f92f8bc42f6eb92a9930 100644
--- a/community/gnome-colors/APKBUILD
+++ b/community/gnome-colors/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="gnome-colors icon themes meta package (all themes)"
 url="https://code.google.com/p/gnome-colors/"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 subpackages="$pkgname-common
 	     gnome-brave-icon-theme:brave
 	     gnome-dust-icon-theme:dust
diff --git a/community/gnome-themes-standard/APKBUILD b/community/gnome-themes-standard/APKBUILD
index 78a35086984fd8eae5d9d6a8ade6e2a63411144e..d9601698dc2451e7d558d5b9d658ed08f183796e 100644
--- a/community/gnome-themes-standard/APKBUILD
+++ b/community/gnome-themes-standard/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Default themes for the GNOME desktop"
 url="http://www.gnome.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="adwaita-gtk2-theme"
 depends_dev="gtk+3.0-dev librsvg-dev"
 makedepends="$depends_dev intltool"
diff --git a/community/gns3-converter/APKBUILD b/community/gns3-converter/APKBUILD
index 7f6833760b65ca33806b53507643c561705b6160..bb041877a861cbf7426e6023bf8886f3ec1e75bd 100644
--- a/community/gns3-converter/APKBUILD
+++ b/community/gns3-converter/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="GNS3 topology converter."
 url="https://github.com/dlintott/gns3-converter"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="py3-cx_freeze py3-six py3-configobj python3"
 makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/GNS3/$pkgname/archive/v$pkgver.tar.gz"
diff --git a/community/gns3-gui/APKBUILD b/community/gns3-gui/APKBUILD
index 906ad75e037c8311b41ecf816937f77b2c505d1d..92ac68615f5e5fa429137a96b4efa97bd7773059 100644
--- a/community/gns3-gui/APKBUILD
+++ b/community/gns3-gui/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="GNS3 network simulator. Graphical user interface package."
 url="https://github.com/GNS3/gns3-gui"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="python3 py3-paramiko gns3-converter py3-psutil py3-jsonschema
 	py3-raven py3-qt5 qt5-qtsvg"
 makedepends="python3-dev py-setuptools"
diff --git a/community/gns3-server/APKBUILD b/community/gns3-server/APKBUILD
index 96b14981519d85f3f63620ddddefb9694fe9dbd7..6fe588e93bd0a75de5d3b81c3f4929239078dfc9 100644
--- a/community/gns3-server/APKBUILD
+++ b/community/gns3-server/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="GNS3 network simulator. Server package."
 url="https://github.com/GNS3/gns3-server"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="busybox dynamips python3 py3-psutil py3-jinja2 py3-aiohttp
 	py3-aiohttp-cors py3-pytest py3-netifaces py3-ws4py py3-zipstream
 	py3-raven py3-jsonschema py3-yarl py3-multidict py3-prompt_toolkit"
diff --git a/community/google-authenticator/APKBUILD b/community/google-authenticator/APKBUILD
index e10bcf17e37c87dfb9f12b02278504a7e78e17b4..5c06471d8ceb31ba5fb7f48c01e2450b68b3b862 100644
--- a/community/google-authenticator/APKBUILD
+++ b/community/google-authenticator/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Google Authenticator PAM module"
 url="https://github.com/google/google-authenticator"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 makedepends="autoconf automake libtool linux-pam-dev m4 libressl-dev"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/google/google-authenticator/archive/$pkgver.tar.gz"
diff --git a/community/gource/APKBUILD b/community/gource/APKBUILD
index 77f36fc1016a6c2dcf123c0fcb6775a28ae5df30..d0b46479b274a813357a352eb09f014a17055793 100644
--- a/community/gource/APKBUILD
+++ b/community/gource/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Software version control visualization"
 url="http://gource.io/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="ftgl-dev sdl2-dev sdl2_image-dev pcre-dev glew-dev libpng-dev
 	libjpeg-turbo-dev glu-dev boost-dev glm-dev"
 subpackages="$pkgname-doc"
diff --git a/community/gringo/APKBUILD b/community/gringo/APKBUILD
index 77983dca13d01ce6e187ed13b5d3a8bf62f8cd71..81d53f11dd0284716308c4b84573281be7194065 100644
--- a/community/gringo/APKBUILD
+++ b/community/gringo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Grounder to translate user-provided logic programs"
 url="https://potassco.org/"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 depends=""
 makedepends="re2c scons bison python2"
 install=""
diff --git a/community/gsettings-desktop-schemas/APKBUILD b/community/gsettings-desktop-schemas/APKBUILD
index 53058a8dbf9e71a71f873af8abec55c9a5e73406..675e81e50ab5bb7fab5c13414de83e20b280235e 100644
--- a/community/gsettings-desktop-schemas/APKBUILD
+++ b/community/gsettings-desktop-schemas/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A collection of GSettings schemas"
 url="http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas"
 arch="noarch"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 makedepends="glib-dev intltool gobject-introspection-dev"
 subpackages="$pkgname-dev"
 source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
diff --git a/community/gsoap/APKBUILD b/community/gsoap/APKBUILD
index f925c815bcab9cc614311498d1f8b0c6bebbd61c..b18a022e02d52d0e2a48f07863683f1fbd055c0a 100644
--- a/community/gsoap/APKBUILD
+++ b/community/gsoap/APKBUILD
@@ -5,7 +5,7 @@ pkgver=2.8.55
 pkgrel=0
 arch="all"
 pkgdesc='A cross-platform C and C++ SDK for SOAP/XML Web services'
-license="GPL-2 gSOAP"
+license="GPL-2.0 gSOAP"
 url="http://gsoap2.sourceforge.net"
 makedepends="autoconf automake bison flex zlib-dev libressl-dev libtool"
 subpackages="$pkgname-dev"
diff --git a/community/guvcview/APKBUILD b/community/guvcview/APKBUILD
index a99a560b5f5c723faab4425972a899811ed6b5e9..dad992486bbc76d78f6c1ef8aa4136977b870bf9 100644
--- a/community/guvcview/APKBUILD
+++ b/community/guvcview/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Webcam viewer"
 url="http://guvcview.sourceforge.net/"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 depends=
 depends_dev=
 makedepends="gtk+3.0-dev eudev-dev sdl-dev portaudio-dev ffmpeg-dev gsl-dev
diff --git a/community/hivex/APKBUILD b/community/hivex/APKBUILD
index b7f3ef52cd6486ad4371f91c512f4658c3bf19e9..2bc3b98d3354f0cf375c5ed1680fdf2b6ad53ff4 100644
--- a/community/hivex/APKBUILD
+++ b/community/hivex/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="System for extracting the contents of Windows Registry."
 url="http://libguestfs.org"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 makedepends="python2-dev libxml2-dev readline-dev perl-dev"
 checkdepends="bash"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/community/homer-ui/APKBUILD b/community/homer-ui/APKBUILD
index f60b7c765337a1561b903edb0272c90a6512e464..32e03e2f12a7ad0dfab3efbf86aa0f3c53efd1a3 100644
--- a/community/homer-ui/APKBUILD
+++ b/community/homer-ui/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="HOMER User-Interface"
 url="https://github.com/sipcapture/homer-ui"
 arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
 depends="homer-api"
 depends_dev=
 makedepends="$depends_dev"
diff --git a/community/httpry/APKBUILD b/community/httpry/APKBUILD
index 5baf23d0accb9c43b3e8692f1ae6b2c8c5295d18..01d32cc96f595d6bc5d1eec2d160478a3d561eec 100644
--- a/community/httpry/APKBUILD
+++ b/community/httpry/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="A packet sniffer designed for HTTP traffic"
 # Sources at https://github.com/jbittel/httpry/
 url="http://dumpsterventures.com/jason/httpry/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libpcap-dev"
 subpackages="$pkgname-doc"
 source="http://dumpsterventures.com/jason/httpry/$pkgname-$pkgver.tar.gz"
diff --git a/community/hugo/APKBUILD b/community/hugo/APKBUILD
index 49e7fa19c3e2421a0cf2fc905de826c51455f866..9c5b9e422764ed2eb2a100358f1e5505837239a6 100644
--- a/community/hugo/APKBUILD
+++ b/community/hugo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Fast and Flexible Static Site Generator built with love in GoLang"
 url="http://gohugo.io/"
 arch="all"
-license="Apache 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="go govendor"
 install=""
diff --git a/community/hydrogen/APKBUILD b/community/hydrogen/APKBUILD
index e7c9ccda6ace73af62f1b0cc9faa01fb17987d49..d47716a40ac7a0335640fb3dd59215bb294d5acb 100644
--- a/community/hydrogen/APKBUILD
+++ b/community/hydrogen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Advanced drum machine for GNU/Linux"
 url="http://www.hydrogen-music.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="qt-dev alsa-lib-dev flac-dev libsndfile-dev cmake portaudio-dev
 	libarchive-dev jack-dev"
diff --git a/community/hyphen/APKBUILD b/community/hyphen/APKBUILD
index 6025435fd9bc96a76eb45e25dea30a491a4e62e5..6cc35afeea5cebe8ae1317eb1dc07b4f7337b7bb 100644
--- a/community/hyphen/APKBUILD
+++ b/community/hyphen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Library for high quality hyphenation and justification"
 url="http://hunspell.sourceforge.net/"
 arch="all"
-license="GPL2+ LGPL2+ MPL 1.1"
+license="GPL-2.0-or-later LGPL-2.0-or-later MPL-1.1"
 subpackages="$pkgname-dev $pkgname-en"
 depends_dev="perl"
 makedepends="$depends_dev"
diff --git a/community/ices/APKBUILD b/community/ices/APKBUILD
index 09299c6391f3abdba984578e5d1b4a412b348f24..26c94b1db0af1ec434efccdb574030b9d66e68a0 100644
--- a/community/ices/APKBUILD
+++ b/community/ices/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Source client for broadcasting in MP3 format to an icecast2 server"
 url="http://icecast.org/ices.php"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="libogg-dev libxml2-dev libvorbis-dev libshout-dev alsa-lib-dev
 			lame-dev perl-dev python2-dev libxml2-dev linux-headers"
diff --git a/community/icingaweb2-module-director/APKBUILD b/community/icingaweb2-module-director/APKBUILD
index 873154e63d14c020bd17be17d6f34f913a9dcd34..41b0583dfd7529f4cce60894da751231c97f3ec7 100644
--- a/community/icingaweb2-module-director/APKBUILD
+++ b/community/icingaweb2-module-director/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Configuration frontend for Icinga 2, integrated automation"
 url="http://www.icinga.org"
 arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
 _php=php7
 depends="icingaweb2 ${_php}-curl"
 options="!check"
diff --git a/community/incron/APKBUILD b/community/incron/APKBUILD
index 2c12cecf6723fae52ddb6f38b1cf7c2b8daf5097..2133eedc1e0f972605f123bc7b3809aa88796c56 100644
--- a/community/incron/APKBUILD
+++ b/community/incron/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Inotify cron system"
 url="http://inotify.aiken.cz"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="argp-standalone"
 subpackages="$pkgname-doc"
 options="suid"
diff --git a/community/inetutils-syslogd/APKBUILD b/community/inetutils-syslogd/APKBUILD
index a53ed9449e804e3535d4eb26b9f754b584d24213..3b3c29158b8619a7b12adab37a7df4fb21b91044 100644
--- a/community/inetutils-syslogd/APKBUILD
+++ b/community/inetutils-syslogd/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A small syslogd for logging to multiple files"
 url="https://www.gnu.org/software/inetutils/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends_dev="readline-dev ncurses-dev"
 makedepends="$depends_dev"
 install="$pkgname.post-install $pkgname.post-deinstall"
diff --git a/community/innoextract/APKBUILD b/community/innoextract/APKBUILD
index c020bbc7d85619e484941018fdcd9b270cbb9640..707222a12c154ef0efdbbe6e3d22dbfa65b12ca6 100644
--- a/community/innoextract/APKBUILD
+++ b/community/innoextract/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A tool to extract installers created by Inno Setup"
 url="http://constexpr.org/innoextract/"
 arch="all"
-license="ZLIB"
+license="zlib"
 depends=""
 depends_dev="cmake boost-dev xz-dev"
 makedepends="$depends_dev"
diff --git a/community/inotify-tools-inc/APKBUILD b/community/inotify-tools-inc/APKBUILD
index caec1b35dd115bb7d582ffc8992d9d8b3879eb7d..d49588744cbbdc574e54b2952dbf9cc153f5fefa 100644
--- a/community/inotify-tools-inc/APKBUILD
+++ b/community/inotify-tools-inc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="inotify-tools patched to add --include regex"
 url="https://github.com/rvoicilas/inotify-tools"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="!inotify-tools"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/downloads/rvoicilas/$_realname/$_realname-$pkgver.tar.gz
diff --git a/community/ioping/APKBUILD b/community/ioping/APKBUILD
index f7c7f4d211965a9de343267eaee0234afe322840..4922a43ee038e9ee9beda3c9b8a79b57df9d7f43 100644
--- a/community/ioping/APKBUILD
+++ b/community/ioping/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A simple disk i/o latency measurement tool"
 url="https://github.com/koct9i/ioping"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev linux-headers"
diff --git a/community/iotop/APKBUILD b/community/iotop/APKBUILD
index 34bcf7eeb45f8a39d3d1c075975b4d2d86536574..5acbc732a8d1a331e3fc56286ec47ba485797fc4 100644
--- a/community/iotop/APKBUILD
+++ b/community/iotop/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="I/O monitoring tool"
 url="http://guichaz.free.fr/iotop/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/community/iouyap/APKBUILD b/community/iouyap/APKBUILD
index d2828f5716927323582515869d90caf94c8852d4..d3e43a5c634994e3310e59754247c0e384f10c37 100644
--- a/community/iouyap/APKBUILD
+++ b/community/iouyap/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Bridge IOU to UDP, TAP and Ethernet."
 url="https://github.com/GNS3/iouyap"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="$depends_dev linux-headers bison flex bsd-compat-headers"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/GNS3/$pkgname/archive/v$pkgver.tar.gz
diff --git a/community/irrlicht/APKBUILD b/community/irrlicht/APKBUILD
index e7bc39e9be698e18cb9b846f67b24e523b07a4ee..4cd27eb97eb275cbe6dc402d83c794413fc039fa 100644
--- a/community/irrlicht/APKBUILD
+++ b/community/irrlicht/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="High performance realtime 3D engine written in C++"
 url="http://irrlicht.sourceforge.net"
 arch="all"
-license="ZLIB"
+license="zlib"
 depends=""
 makedepends="mesa-dev libjpeg-turbo-dev bzip2 libpng-dev zlib-dev bzip2-dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/community/irssi-xmpp/APKBUILD b/community/irssi-xmpp/APKBUILD
index 4dee6c792ccf2d6e536079665d2bd2664d9fcd6b..174ebb0ae111ba506712fa4c2891b103811f1a74 100644
--- a/community/irssi-xmpp/APKBUILD
+++ b/community/irssi-xmpp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An irssi plugin to connect to the Jabber network"
 url="https://cybione.org/~irssi-xmpp/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="irssi-dev loudmouth-dev"
 subpackages="$pkgname-doc"
 options="!check"
diff --git a/community/isync/APKBUILD b/community/isync/APKBUILD
index d80556bfd8a77a20a850b7148c29463f7a7a3077..69e859a439459f4f6caa210af8ee45ec529d34ca 100644
--- a/community/isync/APKBUILD
+++ b/community/isync/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="IMAP and MailDir mailbox synchronizer"
 url="http://isync.sourceforge.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="$depends_dev libressl-dev cyrus-sasl-dev zlib-dev db-dev perl-dev"
 subpackages="$pkgname-doc"
diff --git a/community/java-jansi-native/APKBUILD b/community/java-jansi-native/APKBUILD
index d2c8cca97c171b158c6047223319c755a9555974..9e8b318faa522e3d2eabdcea30f5ca66e0dbfc3c 100644
--- a/community/java-jansi-native/APKBUILD
+++ b/community/java-jansi-native/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Native JNI libraries used by the Jansi project."
 url="https://github.com/fusesource/jansi-native"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 makedepends="autoconf automake libtool maven openjdk8"
 source="https://github.com/fusesource/$_pkgname/archive/$_pkgname-$pkgver.tar.gz"
diff --git a/community/java-jffi/APKBUILD b/community/java-jffi/APKBUILD
index 3ecf36e0a1f7d3711e1c5e9eb02e4a9072567366..0ea2a3277a7238983202e9151404971d0158921f 100644
--- a/community/java-jffi/APKBUILD
+++ b/community/java-jffi/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Java Foreign Function Interface"
 url="https://github.com/jnr/jffi"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 makedepends="apache-ant file openjdk8"
 subpackages="$pkgname-native"
diff --git a/community/java-jna/APKBUILD b/community/java-jna/APKBUILD
index b91bf8e5988163385f959020661a0a75c259ce31..a4cef43167dfb7b85f8a6d601474941aa0a7b063 100644
--- a/community/java-jna/APKBUILD
+++ b/community/java-jna/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="JNA provides Java programs easy access to native shared libraries."
 url="https://github.com/java-native-access/jna"
 arch="all"
-license="ASL-2.0 LGPL-2.1"
+license="Apache-2.0 LGPL-2.1"
 depends="openjdk8-jre-base"
 makedepends="apache-ant autoconf automake libffi-dev>=3.2 libtool openjdk8"
 subpackages="$pkgname-native"
diff --git a/community/java-lz4/APKBUILD b/community/java-lz4/APKBUILD
index f11484808eca9a402cdad480e0b59490e72671c6..c813ddaefc64f83bcc2cc1fe1080750ab3532af3 100644
--- a/community/java-lz4/APKBUILD
+++ b/community/java-lz4/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="LZ4 compression for Java"
 url="https://github.com/jpountz/lz4-java"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 makedepends="apache-ant openjdk8"
 subpackages="$pkgname-native"
diff --git a/community/java-postgresql-jdbc/APKBUILD b/community/java-postgresql-jdbc/APKBUILD
index b148d30903b2662a041e422d5cc82f7980148312..07977a139dc6769e09db11b1a6273fe332ae3569 100644
--- a/community/java-postgresql-jdbc/APKBUILD
+++ b/community/java-postgresql-jdbc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
 url="https://jdbc.postgresql.org"
 arch="noarch"
-license="BSD-3"
+license="BSD-3-Clause"
 depends=""
 makedepends="openjdk8 maven"
 source="$pkgname-$pkgver.tar.gz::https://github.com/pgjdbc/pgjdbc/archive/REL$pkgver.tar.gz"
diff --git a/community/java-snappy/APKBUILD b/community/java-snappy/APKBUILD
index 9af31496b947ee8148d023f8fa55e42678b8e3df..55b2d3d5b297c433c4d32c2151250c9e23f0d0c3 100644
--- a/community/java-snappy/APKBUILD
+++ b/community/java-snappy/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Snappy compressor/decompressor for Java"
 url="https://github.com/xerial/snappy-java"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 makedepends="bash openjdk8 perl snappy-dev>=$_libver"
 subpackages="$pkgname-native"
diff --git a/community/jetty-runner/APKBUILD b/community/jetty-runner/APKBUILD
index 13b6b0d272cf5f5f4f159883b0a5da43c36cc0a0..7fccd290924998ad2a0eb05e4575775dcc3dbeb9 100644
--- a/community/jetty-runner/APKBUILD
+++ b/community/jetty-runner/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Fast and easy way to run Java web application from the command line."
 url="https://www.eclipse.org/jetty"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 makedepends=""
 source="https://repo.maven.apache.org/maven2/org/eclipse/jetty/$pkgname/$_pkgver/$pkgname-$_pkgver.jar
diff --git a/community/john/APKBUILD b/community/john/APKBUILD
index 4e6e9694580def26ad6156bffd28bc6da9f24951..3a82d185c13ef5c86d212f9d8376460859b9490e 100644
--- a/community/john/APKBUILD
+++ b/community/john/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=8
 pkgdesc="John the Ripper password cracker"
 url="http://www.openwall.com/john"
 arch="x86_64 armhf ppc64le"
-license="GPL2"
+license="GPL-2.0"
 depends="nss"
 options="!strip"
 makedepends="libpcap-dev libressl-dev gmp-dev yasm-dev zlib-dev"
diff --git a/community/jpegoptim/APKBUILD b/community/jpegoptim/APKBUILD
index 9b668002a95f7d2c97db3ca05fae341715aa2406..0b6fcfc3acf45d1f994f4c7315cf28463a3993d3 100644
--- a/community/jpegoptim/APKBUILD
+++ b/community/jpegoptim/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Utility to optimize jpeg files"
 url="https://github.com/tjko/jpegoptim"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="libjpeg-turbo-dev"
 options="!check"
diff --git a/community/jreen/APKBUILD b/community/jreen/APKBUILD
index d124f2310713e41ebafa5ec42c49a9a644b14935..b75465566ed8301dc7eafdd936f0cf6a9f68e916 100644
--- a/community/jreen/APKBUILD
+++ b/community/jreen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Free and Opensource Jabber library, written in C++ using cross-platform framework Qt."
 url="http://qutim.org/jreen"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="qt-dev speex-dev libgsasl-dev"
 makedepends="$depends_dev cmake"
diff --git a/community/jruby/APKBUILD b/community/jruby/APKBUILD
index ac284ce839a0740a7059c5f9fb50be14b5ede749..3e22b7fe4ae0d357a565ceb4a51a995a167a0d5a 100644
--- a/community/jruby/APKBUILD
+++ b/community/jruby/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An implementation of Ruby on the JVM"
 url="http://jruby.org"
 arch="noarch"
-license="EPL GPL-2 LGPL-2.1 custom"
+license="EPL GPL-2.0 LGPL-2.1 custom"
 # libc6-compat: https://github.com/jnr/jnr-posix/issues/73
 depends="$pkgname-libs java-jffi-native>=1.2 libc6-compat>=1.1.12-r5 openjdk8-jre-base"
 makedepends="openjdk8 zip"
diff --git a/community/junit/APKBUILD b/community/junit/APKBUILD
index 8a8bdb946f505a29b816a8a0727bfd6675a9b957..71c39342c234756337f146211476bececa8e3c1b 100644
--- a/community/junit/APKBUILD
+++ b/community/junit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A programmer-oriented testing framework for Java"
 url="http://junit.org/"
 arch="noarch"
-license="Eclipse 1.0"
+license="EPL-1.0"
 depends=""
 source="http://search.maven.org/remotecontent?filepath=$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.jar"
 
diff --git a/community/kbuild/APKBUILD b/community/kbuild/APKBUILD
index b353ae46fefb4a9656dc1914e799ad4da8ee132e..7825d6faa5993c135af4398d7485ac596ed13201 100644
--- a/community/kbuild/APKBUILD
+++ b/community/kbuild/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A makefile framework for writing simple makefiles for complex tasks"
 url="http://svn.netlabs.org/kbuild/wiki"
 arch="x86 x86_64"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="autoconf automake flex bison"
diff --git a/community/keepassx/APKBUILD b/community/keepassx/APKBUILD
index 9d71ceea9e1837d57dc60f29a4027830b9d509e2..8a9b3735f8a4f329cefc8b358a2358367b8be372 100644
--- a/community/keepassx/APKBUILD
+++ b/community/keepassx/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A password manager"
 url="http://www.keepassx.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="cmake qt-dev libxtst-dev libgcrypt-dev"
 source="http://www.keepassx.org/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz
 	musl-fixes.patch
diff --git a/community/keybinder3/APKBUILD b/community/keybinder3/APKBUILD
index af902383a7b6c532b57e23f39ba2027ef3e1ad5a..75b613a06a0d3acdf6d943b98ab7424c20629e94 100644
--- a/community/keybinder3/APKBUILD
+++ b/community/keybinder3/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Library for registering global key bindings, for gtk-based applications. GTK3 version"
 url="https://github.com/engla/keybinder"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="gtk+3.0-dev python2-dev py-gobject
 gobject-introspection-dev automake autoconf libtool gnome-common
 gtk-doc"
diff --git a/community/kiwiirc/APKBUILD b/community/kiwiirc/APKBUILD
index 3b76ff5aadc627640f903a622a6bc69ad9e799d4..f5fef4532d83224b1fe15a8fb15dcaef8c3fff36 100644
--- a/community/kiwiirc/APKBUILD
+++ b/community/kiwiirc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A hand-crafted webirc client"
 url="https://www.kiwiirc.com/"
 arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
 depends="nodejs>=0.10.0"
 makedepends="nodejs nodejs-npm"
 install="$pkgname.pre-install"
diff --git a/community/knot/APKBUILD b/community/knot/APKBUILD
index 978856da9118a7566f84d5e17cd3a5acef316789..58f5105455969a48f3eafbce0c42593ebc16244a 100644
--- a/community/knot/APKBUILD
+++ b/community/knot/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
 pkgdesc="An high-performance authoritative-only DNS server"
 url="https://www.knot-dns.cz"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="gnutls-dev libedit-dev libcap-ng-dev libidn-dev lmdb-dev
 	libressl-dev userspace-rcu-dev zlib-dev
diff --git a/community/lasem/APKBUILD b/community/lasem/APKBUILD
index bf9870868450938548f3a301eb488bd91ced6178..c5c36cae2271970d25ed15a8bd435546d68505d1 100644
--- a/community/lasem/APKBUILD
+++ b/community/lasem/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A library for rendering SVG and Mathml, implementing a DOM like API"
 url="https://wiki.gnome.org/Projects/Lasem"
 arch="all"
-license="LGPL2 GPL2"
+license="LGPL-2.0 GPL-2.0"
 makedepends="intltool gdk-pixbuf-dev gobject-introspection-dev libxml2-dev
 	pango-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-render"
diff --git a/community/lastpass-cli/APKBUILD b/community/lastpass-cli/APKBUILD
index f736b912cce662fcceb61d7dab67a96a45f3b7c7..d043add160e243ae9d7dae720d875bfbecf28efe 100644
--- a/community/lastpass-cli/APKBUILD
+++ b/community/lastpass-cli/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="LastPass command line interface tool"
 url="https://lastpass.com/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libressl-dev curl-dev libxml2-dev asciidoc cmake bash"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
 source="$pkgname-$pkgver.tar.gz::https://github.com/${pkgname/-*/}/$pkgname/archive/v${pkgver}.tar.gz
diff --git a/community/leafpad/APKBUILD b/community/leafpad/APKBUILD
index 53dbf2356f4dfe7c1327cb647bb80ae47e14f495..c18069d50c383ebb5079e09996bf2d7d1e05fd59 100644
--- a/community/leafpad/APKBUILD
+++ b/community/leafpad/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A simple GTK+ text editor"
 url="http://tarot.freeshell.org/leafpad"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="gtk+2.0-dev"
 makedepends="$depends_dev"
diff --git a/community/lensfun/APKBUILD b/community/lensfun/APKBUILD
index 3d8ef415d4beda9c7e3dbfd5144afc5a393423b1..067c701fe907226610c5e4ea742dc5d440e49d3e 100644
--- a/community/lensfun/APKBUILD
+++ b/community/lensfun/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Image manipulation library to rectify lens defects"
 url="http://lensfun.sourceforge.net/"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 makedepends="py-docutils cmake doxygen libpng glib-dev"
 subpackages="$pkgname-dev"
 source="http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/community/letsencrypt-nosudo/APKBUILD b/community/letsencrypt-nosudo/APKBUILD
index 42d6bffe877a94227f20db750d3ff99009297958..40b8588628806243800e64fc9d85c4933254b56a 100644
--- a/community/letsencrypt-nosudo/APKBUILD
+++ b/community/letsencrypt-nosudo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Free HTTPS certificates without having to trust the letsencrypt cli with sudo/root"
 url="https://github.com/diafygi/letsencrypt-nosudo"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="python2"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/community/libabw/APKBUILD b/community/libabw/APKBUILD
index 51c09d7f14a7f91cddeff2fa5d9aeca2dfe4d75d..f3d525b0020e659a3f7a9d07d81fd9ecae80b0c8 100644
--- a/community/libabw/APKBUILD
+++ b/community/libabw/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Import filter and tools for AbiWord documents"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="librevenge-dev libxml2-dev zlib-dev boost-dev"
 makedepends="$depends_dev doxygen gperf perl"
diff --git a/community/libcdr/APKBUILD b/community/libcdr/APKBUILD
index a8c1dd9e5ec43893463db2c9600d3c996840abd5..8ea9ec8e182d3778f129741a41b38eb72fe18943 100644
--- a/community/libcdr/APKBUILD
+++ b/community/libcdr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Import filter and tools for Corel DRAW files"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends_dev="boost-dev"
 makedepends="$depends_dev doxygen icu-dev lcms2-dev zlib-dev librevenge-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
diff --git a/community/libcmis/APKBUILD b/community/libcmis/APKBUILD
index 90485bfd7c77f3b93d567f3582a1813baff1579e..1a36546676262a5da50b9927bff2da38f3cb79ad 100644
--- a/community/libcmis/APKBUILD
+++ b/community/libcmis/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="CMIS protocol client library"
 url="https://sourceforge.net/projects/libcmis/"
 arch="all"
-license="MPL1.1+ GPLv2+ LGPLv2+"
+license="MPL-1.1 GPL-2.0-or-later LGPL-2.0-or-later"
 depends=""
 depends_dev="curl-dev libxml2-dev cppunit-dev boost-dev"
 makedepends="$depends_dev autoconf automake libtool"
diff --git a/community/libcoap/APKBUILD b/community/libcoap/APKBUILD
index 65f17759ea98f6b149c85ad6be3883747cc138d3..8a356b5d8c1fef638d23bb949e5b8346eb4319f2 100644
--- a/community/libcoap/APKBUILD
+++ b/community/libcoap/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A CoAP (RFC 7252) implementation"
 url="https://github.com/obgm/libcoap"
 arch="all"
-license="BSD GPL2+"
+license="BSD GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="automake autoconf libtool asciidoc"
diff --git a/community/libcoro/APKBUILD b/community/libcoro/APKBUILD
index 1370449f6a60eb7316ae2f89dd6cea72ac2b36bb..ffe8042fb1b6a6802caa52b07bc503ac444a146a 100644
--- a/community/libcoro/APKBUILD
+++ b/community/libcoro/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Coroutines (cooperative multitasking) in a portable fashion implemented in C"
 url="http://software.schmorp.de/pkg/libcoro.html"
 arch="all"
-license="BSD-2"
+license="BSD-2-Clause"
 makedepends="cvs gzip musl-dev"
 subpackages="$pkgname-dev"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/community/libcouchbase/APKBUILD b/community/libcouchbase/APKBUILD
index 1484602d9ef30be45ddc028ce92e8ef10e088158..d30a87a1d258cd3e488336831f23adba2a6b590f 100644
--- a/community/libcouchbase/APKBUILD
+++ b/community/libcouchbase/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="C client library for Couchbase"
 url="https://developer.couchbase.com/community"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=
 depends_dev="musl-dev libressl-dev snappy-dev"
 makedepends="$depends_dev cmake perl libtool libev-dev libevent-dev libuv-dev"
diff --git a/community/libdbi-drivers/APKBUILD b/community/libdbi-drivers/APKBUILD
index 90678c76ca4363c59a5162cec249a9ffdca7d9be..81b8e6ec658ae4a738d1885606e51e737f8abbc8 100644
--- a/community/libdbi-drivers/APKBUILD
+++ b/community/libdbi-drivers/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Provides the database-specific drivers for the libdbi framework"
 url="http://libdbi-drivers.sourceforge.net/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="libdbi-dev freetds-dev mysql-dev postgresql-dev sqlite-dev
diff --git a/community/libe-book/APKBUILD b/community/libe-book/APKBUILD
index eebf0a1a1628007d79c706a6dadab66cc7026f80..fa541de01e4241c3b3fe6ef0f998b7eeec1ee806 100644
--- a/community/libe-book/APKBUILD
+++ b/community/libe-book/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="Import filter and tools for various ebook formats"
 url="https://sourceforge.net/projects/libebook/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends_dev="boost-dev icu-dev librevenge-dev libxml2-dev zlib-dev"
 makedepends="$depends_dev doxygen gperf"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
diff --git a/community/libetonyek/APKBUILD b/community/libetonyek/APKBUILD
index a1b2aab849bbe179e215a100b433eebc570b0a7f..11afd63c9c36d44f79f7186e0ce96f67dec9bbb2 100644
--- a/community/libetonyek/APKBUILD
+++ b/community/libetonyek/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for Apple Keynote presentations"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="glm-dev boost-dev librevenge-dev libxml2-dev zlib-dev liblangtag-dev"
 makedepends="$depends_dev gperf doxygen mdds1.0-dev"
diff --git a/community/libewf/APKBUILD b/community/libewf/APKBUILD
index 9b5a3e3c86dedecbcf2924e56d0f480b5ac8dc2a..5064dc3445fd57f23ad82c2b9d2d61187b63f8ae 100644
--- a/community/libewf/APKBUILD
+++ b/community/libewf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library to support the Expert Witness Compression Format"
 url="http://libewf.sourceforge.net"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="zlib-dev bzip2-dev libressl-dev util-linux-dev"
 makedepends="$depends_dev"
diff --git a/community/libexttextcat/APKBUILD b/community/libexttextcat/APKBUILD
index 330add4609ccbb3e7296e268340f7ed29df6e61e..ed7babe01f05c452bef6a52f74bc0e0abb94f4d4 100644
--- a/community/libexttextcat/APKBUILD
+++ b/community/libexttextcat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An N-Gram-Based Text Categorization library"
 url="http://www.freedesktop.org/wiki/Software/libexttextcat/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 checkdepends="bash"
 subpackages="$pkgname-dev"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/community/libfreehand/APKBUILD b/community/libfreehand/APKBUILD
index f7c97e8ab501d3a5bdf6e9f1e7ea5a974397c2e5..9842331767c5c256b8fdc6558dee816982185fa2 100644
--- a/community/libfreehand/APKBUILD
+++ b/community/libfreehand/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for Adobe FreeHand documents"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="libxml2-dev lcms2-dev icu-dev"
 makedepends="$depends_dev gperf perl doxygen librevenge-dev zlib-dev"
diff --git a/community/libftdi1/APKBUILD b/community/libftdi1/APKBUILD
index 7cdbd0628c9c268808a89c879168d631f057b2f5..5754d617921ee2e6b672a1cd28bbb20899c0d746 100644
--- a/community/libftdi1/APKBUILD
+++ b/community/libftdi1/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A library to talk to FTDI chips"
 url="https://www.intra2net.com/en/developer/libftdi/download.php"
 arch="all"
-license="LGPL2, GPL2"
+license="LGPL-2.0 GPL-2.0"
 makedepends="cmake doxygen swig libusb-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 install="$pkgname.pre-install $pkgname.post-upgrade"
diff --git a/community/libhdhomerun/APKBUILD b/community/libhdhomerun/APKBUILD
index 04ce69823b76555c66d2d3c088a6c0463517c8ca..c683f7259f1e8a0e88aafd13350c2f1af3728380 100644
--- a/community/libhdhomerun/APKBUILD
+++ b/community/libhdhomerun/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Library for Silicon Dust HD HomeRun"
 url="http://www.silicondust.com/support/downloads/linux/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="$pkgname-libs"
 depends_dev="$pkgname-libs"
 install=""
diff --git a/community/libindicator/APKBUILD b/community/libindicator/APKBUILD
index 4ec404ffcfcff88fdb3d31017a4eff2fe1a150d3..4e86c9b228f9d36493b13ce37bc083afdca30062 100644
--- a/community/libindicator/APKBUILD
+++ b/community/libindicator/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Set of symbols and convenience functions for Ayatana indicators (GTK+ 3 library)"
 url="https://launchpad.net/libindicator"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="gtk+3.0-dev"
 subpackages="$pkgname-dev"
 source="https://launchpad.net/$pkgname/${pkgver%.*}/${pkgver}/+download/$pkgname-$pkgver.tar.gz"
diff --git a/community/libixion/APKBUILD b/community/libixion/APKBUILD
index eb05c2cbafd8908f673ec7bf29eccb155d07cc49..00e0e936a2358594ff8ee1e497261fe42d178115 100644
--- a/community/libixion/APKBUILD
+++ b/community/libixion/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="a general purpose formula parser & interpreter"
 url="https://gitlab.com/ixion/ixion"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev boost-dev mdds-dev"
diff --git a/community/liblangtag/APKBUILD b/community/liblangtag/APKBUILD
index 48e8cd3ca59e43c868c55b9ac5f342e483f15bd4..65d1a9c4304cf363dec54ef2a78181ca975dcc9a 100644
--- a/community/liblangtag/APKBUILD
+++ b/community/liblangtag/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Interface library to access/deal with tags for identifying languages"
 url="http://tagoh.bitbucket.org/liblangtag/index.html"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 depends=""
 depends_dev="glib-dev"
 makedepends="$depends_dev gobject-introspection libtool libxml2-dev"
diff --git a/community/libmatekbd/APKBUILD b/community/libmatekbd/APKBUILD
index 840e0d0fe4be7c1d2149c365a9e276f102f635cd..34cba86632b3dded1b119a27e31edd762ae0b502 100644
--- a/community/libmatekbd/APKBUILD
+++ b/community/libmatekbd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="MATE keyboard library"
 url="https://github.com/mate-desktop/libmatekbd"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common freetype"
 makedepends="libxklavier-dev libtool intltool gtk+3.0-dev"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/libmateweather/APKBUILD b/community/libmateweather/APKBUILD
index f4712c21ad7c510278c8f9b9dbe62356c0ef6d25..83c312447f19d0b291e11f8479a82671fa0b524c 100644
--- a/community/libmateweather/APKBUILD
+++ b/community/libmateweather/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A library to access weather information from online services for numerous locations"
 url="https://github.com/mate-desktop/libmateweather"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="libsoup-dev libtool intltool gtk+3.0-dev libxml2-utils tzdata"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/community/libmbim/APKBUILD b/community/libmbim/APKBUILD
index 1a182d900055244ba07eb4e25bf3882c98e289b1..6b5bfe61e6ecdff8cd9303d964c42f0985b99c4f 100644
--- a/community/libmbim/APKBUILD
+++ b/community/libmbim/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="MBIM modem protocol helper library"
 url="http://www.freedesktop.org/wiki/Software/libmbim"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="$depends_dev gtk-doc python2 glib-dev py-gobject libgudev-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/community/libmpdclient/APKBUILD b/community/libmpdclient/APKBUILD
index bb64963b1f7f72d1452e91663ddff5e0a324e208..7d466e43cf3ed9bb66376a6cb3fb42b22a75fa16 100644
--- a/community/libmpdclient/APKBUILD
+++ b/community/libmpdclient/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages"
 url="https://www.musicpd.org/libs/libmpdclient"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="meson"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/community/libmspub/APKBUILD b/community/libmspub/APKBUILD
index 660abfda9a8ff0199d59417e5d7fbd3f7431b980..2386d70acf7dc3c2046f4c94bb6925b86f10ba91 100644
--- a/community/libmspub/APKBUILD
+++ b/community/libmspub/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="Import filter and tools for MS Publisher files"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="boost-dev librevenge-dev zlib-dev icu-dev libwpd-dev libwpg-dev"
 makedepends="$depends_dev doxygen"
diff --git a/community/libmwaw/APKBUILD b/community/libmwaw/APKBUILD
index b10df3ad0ccf0e149c4b2ac7b9c04647d0cc8660..7c9f9ca453fbc2cb22e3e010710963638252dc4e 100644
--- a/community/libmwaw/APKBUILD
+++ b/community/libmwaw/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for old Mac documents"
 url="https://sourceforge.net/projects/libmwaw/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="boost-dev attr-dev zlib-dev"
 makedepends="$depends_dev librevenge-dev doxygen"
diff --git a/community/libndp/APKBUILD b/community/libndp/APKBUILD
index 33390cfa7ec1b2cb8855f233215f4b9d0672a09a..52e9d4372e34fca5bb9a2ea120b0615064a13b17 100644
--- a/community/libndp/APKBUILD
+++ b/community/libndp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library for IPv6 Neighbor Discovery Protocol"
 url="http://libndp.org"
 arch="all"
-license="GPL2.1"
+license="GPL-2.1"
 makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/jpirko/libndp/archive/v$pkgver.tar.gz
diff --git a/community/libnsl/APKBUILD b/community/libnsl/APKBUILD
index 167934883c61a9ea1aab71be007a79560ea1c813..9e4c52952f78190005e3d261fd9bd595885ce5cc 100644
--- a/community/libnsl/APKBUILD
+++ b/community/libnsl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
 url="https://github.com/thkukuk/libnsl"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="autoconf automake libtool libc-dev gettext-dev libtirpc-dev file"
 subpackages="$pkgname-dev"
 source="https://github.com/thkukuk/$pkgname/archive/$pkgname-$pkgver.tar.gz
diff --git a/community/libodfgen/APKBUILD b/community/libodfgen/APKBUILD
index 5b8de86483424a70d02af462163eef056fb5fdab..f0c8787fd1a42045e16107297a1c92fa2321b510 100644
--- a/community/libodfgen/APKBUILD
+++ b/community/libodfgen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for Open Document Format"
 url="https://sourceforge.net/projects/libwpd/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="boost-dev librevenge-dev"
 makedepends="$depends_dev pkgconfig doxygen"
diff --git a/community/liborcus/APKBUILD b/community/liborcus/APKBUILD
index b1cf9f43f7d1f17b10f31c98b5a7953cfce3ee18..e4b29202c65840c9b9bd42a30dd99cc980ddff38 100644
--- a/community/liborcus/APKBUILD
+++ b/community/liborcus/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Library for processing spreadsheet documents"
 url="https://gitlab.com/orcus/orcus"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev boost-dev mdds-dev libixion-dev zlib-dev"
diff --git a/community/libosinfo/APKBUILD b/community/libosinfo/APKBUILD
index 287f97b8a25c408b2bfb2ac491df7113e6a430d8..2fe2e03af1c710f9ec547239d9ad22a529326e2b 100644
--- a/community/libosinfo/APKBUILD
+++ b/community/libosinfo/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A library for managing OS information for virtualization"
 url="http://libosinfo.org/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends="hwdata osinfo-db"
 makedepends="glib-dev libsoup-dev libxml2-dev libxslt-dev vala intltool
 	gobject-introspection-dev check-dev perl-dev"
diff --git a/community/libpagemaker/APKBUILD b/community/libpagemaker/APKBUILD
index 0d89638f5e0b15de39a35fdce78490862ec252b9..b3f207070420f7017ec7f02c78cad19f3521d433 100644
--- a/community/libpagemaker/APKBUILD
+++ b/community/libpagemaker/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for PageMaker"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="boost-dev librevenge-dev"
 makedepends="$depends_dev doxygen"
diff --git a/community/libplist/APKBUILD b/community/libplist/APKBUILD
index 2833adde267f3d9e3dcff68a8f7c517d5b29f928..73c424f2a45347ce30ab9aef8100743a1f53856f 100644
--- a/community/libplist/APKBUILD
+++ b/community/libplist/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
 url="http://libimobiledevice.org/"
 arch="all"
-license="GPL2 LGPL2.1"
+license="GPL-2.0 LGPL-2.1"
 depends=""
 depends_dev="libxml2-dev glib-dev"
 makedepends="swig python2-dev $depends_dev cython-dev python2 cython"
diff --git a/community/libqmi/APKBUILD b/community/libqmi/APKBUILD
index 68a4073b2def4872bc2a34f2b5c33a20c4efee77..309c018957a5890d34dfe581d74f3b876b55fe0d 100644
--- a/community/libqmi/APKBUILD
+++ b/community/libqmi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="QMI modem protocol helper library"
 url="http://www.freedesktop.org/wiki/Software/libqmi"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="gtk-doc python2 glib-dev libgudev-dev linux-headers"
 options="!check" #FIXME
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index 8be8e8eb12b66bd41345109a8037f5b279c60e32..0d89c58558996d71027e8ce5becfbf8a38ae52f4 100644
--- a/community/libreoffice/APKBUILD
+++ b/community/libreoffice/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="LibreOffice - Meta package for the full office suite"
 url="http://www.libreoffice.org/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends_dev="cups-dev libjpeg-turbo-dev boost-dev clucene-dev libe-book-dev icu-dev icu
 	libetonyek-dev libwpd-dev libwpg-dev libmspub-dev libmwaw-dev libpagemaker-dev
 	libvisio-dev libcmis-dev lcms2-dev cppunit-dev freetype-dev libabw-dev libwps-dev
diff --git a/community/libreswan/APKBUILD b/community/libreswan/APKBUILD
index 5f134090d2dccf6aedcc3663bede1f3123fb8555..1795776f659ae75add7d0c33edc444d4df700a40 100644
--- a/community/libreswan/APKBUILD
+++ b/community/libreswan/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="IPsec implementation for Linux"
 url="https://libreswan.org"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="nss-tools iproute2"
 provides="openswan"
 makedepends="bison flex coreutils bash xmlto
diff --git a/community/libspectre/APKBUILD b/community/libspectre/APKBUILD
index c2f073de96c62c49e11bc81db84156ddf416ee02..b8f5c9124a3b598643bbd716e650502bce137d61 100644
--- a/community/libspectre/APKBUILD
+++ b/community/libspectre/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A small library for rendering Postscript documents"
 url="http://www.freedesktop.org/wiki/Software/libspectre"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 # file, cairo-dev for tests only
 makedepends="ghostscript-dev doxygen graphviz cairo-dev file"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/community/libstaroffice/APKBUILD b/community/libstaroffice/APKBUILD
index 974d46ba51b643db8ff26088e68f96a693157505..cda0f8fac03003600717e3df38b6c634a3597eb9 100644
--- a/community/libstaroffice/APKBUILD
+++ b/community/libstaroffice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter for StarOffice documents"
 url="https://github.com/fosnola/libstaroffice"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="zlib-dev boost-dev"
 makedepends="$depends_dev librevenge-dev doxygen"
diff --git a/community/libteam/APKBUILD b/community/libteam/APKBUILD
index 0ec30f3a3e2453b79ead23150ba03cd4f4f7478c..d172f642fcf27b209dce0eeba0fc0e2827cf2482 100644
--- a/community/libteam/APKBUILD
+++ b/community/libteam/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library for controlling team network device"
 url="http://libteam.org"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 makedepends="autoconf automake libtool libnl3-dev libdaemon-dev jansson-dev
 	dbus-dev linux-headers bsd-compat-headers doxygen swig
 	python2-dev python3-dev"
diff --git a/community/libvirt-glib/APKBUILD b/community/libvirt-glib/APKBUILD
index 4262f469e025ae9325843626fca981bab44e1017..db96fc7308fa84e752f031583b4514292e3867e3 100644
--- a/community/libvirt-glib/APKBUILD
+++ b/community/libvirt-glib/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="libvirt glib integration for events"
 url="http://libvirt.org/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="gobject-introspection-dev libvirt-dev
 libxml2-dev vala sed intltool"
diff --git a/community/libvisio/APKBUILD b/community/libvisio/APKBUILD
index 795e8c37c11db8534e0268f5ebab9b42985371ec..70ee04884ad91e4a77725ecc6897f9f08ad21ce3 100644
--- a/community/libvisio/APKBUILD
+++ b/community/libvisio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Import filter and tools for MS Visio Diagrams"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
 arch="all"
-license="MPL2.0"
+license="MPL-2.0"
 depends_dev="boost-dev librevenge-dev icu-dev libwpd-dev libwpg-dev libxml2-dev zlib-dev"
 makedepends="$depends_dev doxygen gperf perl"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
diff --git a/community/libwpd/APKBUILD b/community/libwpd/APKBUILD
index be6c4d9e50664750b350ab1bf876007a44f52c29..9bc45cc4dad9e2b19850fc967a58bf7a769f320c 100644
--- a/community/libwpd/APKBUILD
+++ b/community/libwpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for WordPerfect Documents"
 url="https://sourceforge.net/p/libwpd/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="librevenge-dev"
 makedepends="$depends_dev doxygen"
diff --git a/community/libwpg/APKBUILD b/community/libwpg/APKBUILD
index bd97d382dc15d7ba49b7aa79aa7b2e2399fa9a8a..3ac19d5b591efd0c9179ad52ac3383a9993ebfe5 100644
--- a/community/libwpg/APKBUILD
+++ b/community/libwpg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for WordPerfect Graphics"
 url="https://sourceforge.net/projects/libwpg/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="librevenge-dev libwpd-dev"
 makedepends="$depends_dev doxygen"
diff --git a/community/libwps/APKBUILD b/community/libwps/APKBUILD
index e0a8162974889eb2c89d03213bff7926b7deb4a7..a337d2c908a0cede952d2eafae5cd0cb0f88a257 100644
--- a/community/libwps/APKBUILD
+++ b/community/libwps/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Import filter and tools for Microsoft Works files"
 url="https://sourceforge.net/projects/libwps/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="librevenge-dev"
 makedepends="$depends_dev doxygen"
diff --git a/community/libzmf/APKBUILD b/community/libzmf/APKBUILD
index e97e982d4480a163e8a670fa4b51f8216e57c32d..33f6b10d808b5791cad921cd5f4e21031b911b8e 100644
--- a/community/libzmf/APKBUILD
+++ b/community/libzmf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Import filter and tools for Zoner Callisto/Draw documents"
 url="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="boost-dev icu-dev libpng-dev zlib-dev"
 makedepends="$depends_dev librevenge-dev doxygen"
diff --git a/community/lshw/APKBUILD b/community/lshw/APKBUILD
index 08345be68bf839df3f086071e09136b2475e1c3e..6ae2b7b29dfc154b532b291891dfd96eb4300996 100644
--- a/community/lshw/APKBUILD
+++ b/community/lshw/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Hardware Lister"
 url="https://ezix.org/project/wiki/HardwareLiSter"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="sqlite-dev linux-headers"
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://ezix.org/software/files/lshw-B.$pkgver.tar.gz
diff --git a/community/lua-cqueues-pushy/APKBUILD b/community/lua-cqueues-pushy/APKBUILD
index 1043f6bf6a234055a7696b7be88c33baebe85405..5a7b9869a8b95e83741a0a02db0633b4d9596ea6 100644
--- a/community/lua-cqueues-pushy/APKBUILD
+++ b/community/lua-cqueues-pushy/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Framework for logic control (based on cqueues)"
 url="https://github.com/rameplayerorg/lua-cqueues-pushy"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 install=""
 depends=""
 makedepends="linux-headers"
diff --git a/community/lua-dromozoa-utf8/APKBUILD b/community/lua-dromozoa-utf8/APKBUILD
index 346bb9faafd7a96ff50d8314138462fe4205acf6..1f0931b2e1d6d4e500ed736b16bdcca254f822f4 100644
--- a/community/lua-dromozoa-utf8/APKBUILD
+++ b/community/lua-dromozoa-utf8/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Lua 5.3 compatible pure-Lua UTF-8 implementation"
 url="https://github.com/dromozoa/dromozoa-utf8/"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 checkdepends=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/dromozoa/$_pkgname/archive/v$pkgver.tar.gz"
diff --git a/community/lua-resty-http/APKBUILD b/community/lua-resty-http/APKBUILD
index 6a43cb2da67a4dfd984698ec7da56b35dafb2607..fb1cd8980257899b0d9d83d7218be060c775ef81 100644
--- a/community/lua-resty-http/APKBUILD
+++ b/community/lua-resty-http/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Lua HTTP client cosocket driver for OpenResty / ngx_lua"
 url="https://github.com/pintsized/lua-resty-http"
 arch="noarch"
-license="BSD2"
+license="BSD-2-Clause"
 subpackages=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/pintsized/lua-resty-http/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/community/lua-sleep/APKBUILD b/community/lua-sleep/APKBUILD
index f83d8bfb05def15eb161cc6fc1aeeb8cd226db6e..9a871914cd57cf9a1177c9982d39e8db710aebe6 100644
--- a/community/lua-sleep/APKBUILD
+++ b/community/lua-sleep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Sleep functions for Lua"
 url=http://projects.plentyfact.org/projects/lua-sleep
 arch=all
-license=public-domain
+license="Public-Domain"
 depends=
 makedepends=lua-dev
 source="http://dev.alpinelinux.org/archive/lua-sleep/lua-sleep_$pkgver.tar.gz"
diff --git a/community/lxcfs/APKBUILD b/community/lxcfs/APKBUILD
index f269f1dd2f074ce61625fe15118d78e8d1d1fb61..b7987b1c324957871056f8659543c3aaab8db947 100644
--- a/community/lxcfs/APKBUILD
+++ b/community/lxcfs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="FUSE filesystem for LXC"
 url="https://linuxcontainers.org/lxcfs"
 arch="all"
-license="Apache 2.0"
+license="Apache-2.0"
 depends="cgmanager shadow-uidmap uidmapshift"
 makedepends="fuse-dev linux-pam-dev linux-headers help2man"
 subpackages="$pkgname-pam $pkgname-doc"
diff --git a/community/macchanger/APKBUILD b/community/macchanger/APKBUILD
index efe19246f0ca4387ad752184aef15e4b62039b7d..ea06b123909e37f22a63c0dc7579418c7b841f50 100644
--- a/community/macchanger/APKBUILD
+++ b/community/macchanger/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="An utility for viewing/manipulating the MAC address of network interfaces"
 url="https://github.com/alobbs/macchanger"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
 source="https://github.com/alobbs/macchanger/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
diff --git a/community/makepasswd/APKBUILD b/community/makepasswd/APKBUILD
index 3935f156341b234fe010b607ce6f21dd7bf760e2..1f3bf7ee9d78d55c9b41e35dcc7d1bef3cdd2b7c 100644
--- a/community/makepasswd/APKBUILD
+++ b/community/makepasswd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Generates (pseudo-)random passwords of a desired length"
 url="http://people.defora.org/~khorben/projects/makepasswd/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="libxslt docbook-xsl libressl-dev"
 install=""
diff --git a/community/marco/APKBUILD b/community/marco/APKBUILD
index cbd9c421d43f7b8c6026071a991c956194695728..77c0a5a50ee31646ffa380a81a0f15cf1623c50e 100644
--- a/community/marco/APKBUILD
+++ b/community/marco/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="MATE window manager"
 url="https://github.com/mate-desktop/marco"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common yelp-tools libxml2-utils"
 makedepends="libtool itstool zenity intltool glib-dev gtk+3.0-dev
 	libxcomposite-dev libcanberra-dev"
diff --git a/community/mate-applets/APKBUILD b/community/mate-applets/APKBUILD
index 48803d8d076210c8e020b6c43c43ef4878b6b8d4..262ae099a3e46c137cd3b7457b9c30f3897a0110 100644
--- a/community/mate-applets/APKBUILD
+++ b/community/mate-applets/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Applets for use with the MATE panel"
 url="https://github.com/mate-desktop/mate-applets"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="mate-icon-theme"
 makedepends="intltool gtk+3.0-dev mate-panel-dev libwnck3-dev
 	mate-desktop-dev dconf-dev itstool linux-headers libxml2-dev
diff --git a/community/mate-backgrounds/APKBUILD b/community/mate-backgrounds/APKBUILD
index 83ca5963e23eb825af7cc6654331fd96bb3e4abe..438bf01aad59b6cfbfb8e716f37cc08d5ed72cef 100644
--- a/community/mate-backgrounds/APKBUILD
+++ b/community/mate-backgrounds/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Background images and data for MATE"
 url="https://github.com/mate-desktop/mate-backgrounds"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="intltool"
 subpackages="$pkgname-lang"
diff --git a/community/mate-calc/APKBUILD b/community/mate-calc/APKBUILD
index eda353c97d043db7aa076f28d47f37f5fc962331..2463111f4f40f9c68f65e8d40c1365b5c3d1571d 100644
--- a/community/mate-calc/APKBUILD
+++ b/community/mate-calc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Calculator for MATE"
 url="https://github.com/mate-desktop/mate-calc"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="itstool libtool intltool gtk+3.0-dev 
 	libxml2-utils libxml2-dev"
diff --git a/community/mate-common/APKBUILD b/community/mate-common/APKBUILD
index 7e4a9cd4e1d36183417a4eda7379bcf83587490a..b974257292f3521ac86828bef12786cd3eb441fb 100644
--- a/community/mate-common/APKBUILD
+++ b/community/mate-common/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Common scripts and macros"
 url="http://mate-desktop.org/"
 arch="noarch"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 subpackages="$pkgname-doc"
 source="http://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/community/mate-control-center/APKBUILD b/community/mate-control-center/APKBUILD
index f5ba3b37e56ab01a2cf039d9d7a5890202c3a5ec..7b02004033da5ff95143536e8584f741669e7133 100644
--- a/community/mate-control-center/APKBUILD
+++ b/community/mate-control-center/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="MATE's main interface for configuration of various aspects of your desktop"
 url="https://github.com/mate-desktop/mate-control-center"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common mate-menus mate-desktop mate-icon-theme desktop-file-utils"
 makedepends="dbus-glib-dev libtool intltool itstool gtk+3.0-dev
 	dconf-dev mate-menus-dev libunique-dev marco-dev mate-settings-daemon-dev
diff --git a/community/mate-desktop/APKBUILD b/community/mate-desktop/APKBUILD
index 5f415f76027f54736d6f089cb02068d3033ab76a..4621c78ab14bd1ff532e695a9b0c7571d7bc5751 100644
--- a/community/mate-desktop/APKBUILD
+++ b/community/mate-desktop/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The MATE Desktop Environment"
 url="http://wiki.mate-desktop.org/mate-desktop"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common yelp-tools"
 depends_dev="startup-notification"
 makedepends="$depends_dev itstool intltool dconf-dev gtk+3.0-dev
diff --git a/community/mate-icon-theme-faenza/APKBUILD b/community/mate-icon-theme-faenza/APKBUILD
index 7fba479c75dfc8e24ef959e968229c12e2c57e7e..3eea52f621a84ef7a51f39c8f85d9f0a4cb06d7b 100644
--- a/community/mate-icon-theme-faenza/APKBUILD
+++ b/community/mate-icon-theme-faenza/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Faenza desktop icons customized for MATE"
 url="https://github.com/mate-desktop/mate-icon-theme"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="icon-naming-utils intltool autoconf automake coreutils"
 source="http://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
diff --git a/community/mate-icon-theme/APKBUILD b/community/mate-icon-theme/APKBUILD
index badd4d8778d34c9b0df280ce82ffaa030aa58073..2b1f3610f74bd9a1c10a48c910544874b8540791 100644
--- a/community/mate-icon-theme/APKBUILD
+++ b/community/mate-icon-theme/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="MATE desktop icons"
 url="https://github.com/mate-desktop/mate-icon-theme"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="icon-naming-utils intltool"
 subpackages="$pkgname-lang"
diff --git a/community/mate-indicator-applet/APKBUILD b/community/mate-indicator-applet/APKBUILD
index 210eeb6b58950c34da07eddd121c6a32249bb231..d220a1ad3ecfcba2b48b2de37dbefa5ca4360cbf 100644
--- a/community/mate-indicator-applet/APKBUILD
+++ b/community/mate-indicator-applet/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A small applet to display information from various applications consistently in the panel"
 url="https://github.com/mate-desktop/mate-indicator-applet"
 arch="all"
-license="GPL3 LGPL2.1"
+license="GPL-3.0 LGPL-2.1"
 makedepends="autoconf automake libtool mate-common glib-dev 
 	gtk+3.0-dev mate-panel-dev intltool libindicator-dev"
 subpackages="$pkgname-lang"
diff --git a/community/mate-media/APKBUILD b/community/mate-media/APKBUILD
index 3c30387ed7593dec046d9325a28b1eada6ba978c..47a6b3dedef2357e72563b4d488d40fc2041f9c0 100644
--- a/community/mate-media/APKBUILD
+++ b/community/mate-media/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="media tools for MATE"
 url="https://github.com/mate-desktop/mate-media"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="intltool gobject-introspection-dev gtk+3.0-dev
 	libcanberra-dev libunique-dev libmatemixer-dev mate-desktop-dev
 	dconf-dev libxml2-dev startup-notification-dev"
diff --git a/community/mate-menus/APKBUILD b/community/mate-menus/APKBUILD
index 64a5a214243b3bd06b7f1ad4bff359b339a5d826..933452445e663bdc23d65f657dccdaa5f8c7f1ab 100644
--- a/community/mate-menus/APKBUILD
+++ b/community/mate-menus/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="The libmate-menu library, the layout configuration files for the MATE menu, as well as a simple menu editor"
 url="https://github.com/mate-desktop/mate-menus"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="libtool intltool glib-dev"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/mate-notification-daemon/APKBUILD b/community/mate-notification-daemon/APKBUILD
index d15a53473e68f1da008e1b065f9279fcf0cd35dc..6bd6b4456e47275d308a306ae109aa0c244e3fb1 100644
--- a/community/mate-notification-daemon/APKBUILD
+++ b/community/mate-notification-daemon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Small, passive popup dialogs that notify the user of particular events"
 url="https://github.com/mate-desktop/mate-notification-daemon"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="libwnck3-dev libnotify-dev libtool intltool dbus-glib-dev
 	libcanberra-dev gtk+3.0-dev"
diff --git a/community/mate-panel/APKBUILD b/community/mate-panel/APKBUILD
index 97d02cc5be4c4b91deb61da6fc5e760143f1287f..66099dacf8b4062de57011d0f35a7955fa8cd071 100644
--- a/community/mate-panel/APKBUILD
+++ b/community/mate-panel/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The MATE panel is the area on your desktop from which you can run applications"
 url="https://github.com/mate-desktop/mate-panel"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common mate-desktop"
 makedepends="librsvg-dev libmateweather-dev libtool intltool itstool
 	mate-menus-dev dconf-dev libice-dev libsm-dev libcanberra-dev dbus-glib-dev
diff --git a/community/mate-polkit/APKBUILD b/community/mate-polkit/APKBUILD
index 7232bd2906611a5209142c62f5491607e99fc2ba..f01806e9b7e6aeef683cfc292ca65bea1dfbca15 100644
--- a/community/mate-polkit/APKBUILD
+++ b/community/mate-polkit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="MATE Authentication Agent for PolicyKit"
 url="https://github.com/mate-desktop/mate-polkit"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common"
 makedepends="polkit-dev libtool intltool gtk+3.0-dev
 	gobject-introspection-dev"
diff --git a/community/mate-power-manager/APKBUILD b/community/mate-power-manager/APKBUILD
index eb4e54dfd04bf9cdc2b6e7bd1244d5fe9b95557b..d4b56aa28dcc906ea5785c1108e502f6b799cee4 100644
--- a/community/mate-power-manager/APKBUILD
+++ b/community/mate-power-manager/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A Power Manager for MATE"
 url="https://github.com/mate-desktop/mate-power-manager"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="$depends_dev intltool gettext-dev itstool glib-dev libcanberra-dev
 	dbus-glib-dev mate-desktop-dev dconf-dev libnotify-dev libunique-dev
 	upower-dev libgnome-keyring-dev mate-panel-dev libcanberra-dev harfbuzz-dev"
diff --git a/community/mate-screensaver/APKBUILD b/community/mate-screensaver/APKBUILD
index 1c159699751730c0cb094a17bac47b0196e3af65..7041df9ca65c7ad14ee020c670409e92b8f1deaa 100644
--- a/community/mate-screensaver/APKBUILD
+++ b/community/mate-screensaver/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A screen saver and locker for MATE"
 url="https://github.com/mate-desktop/mate-screensaver"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="intltool glib-dev libxscrnsaver-dev gtk+3.0-dev
 	mate-desktop-dev dbus-glib-dev mate-menus-dev dconf-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/community/mate-sensors-applet/APKBUILD b/community/mate-sensors-applet/APKBUILD
index a758835ab2567083b8e431cc28a74b72e07ca4ef..d07d34d0483798c2995dc5a1b3d2418794cf6610 100644
--- a/community/mate-sensors-applet/APKBUILD
+++ b/community/mate-sensors-applet/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An applet for the MATE Panel to display readings from hardware sensors"
 url="https://github.com/mate-desktop/mate-sensors-applet"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="perl-xml-parser"
 makedepends="intltool glib-dev gtk+3.0-dev mate-panel-dev libxslt-dev
 	itstool libxml2-utils mdocml-dev"
diff --git a/community/mate-session-manager/APKBUILD b/community/mate-session-manager/APKBUILD
index 17d92e5687de52757522156e57d5c6bea78dd9e6..5a6582a7aa3c36f6ae4a5f42b0fb5f9059d3230a 100644
--- a/community/mate-session-manager/APKBUILD
+++ b/community/mate-session-manager/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The MATE session manager"
 url="https://github.com/mate-desktop/mate-session-manager"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common mate-desktop"
 makedepends="intltool libtool dconf-dev dbus-glib-dev gtk+3.0-dev
 	libsm-dev mate-desktop-dev"
diff --git a/community/mate-settings-daemon/APKBUILD b/community/mate-settings-daemon/APKBUILD
index 3c7396038ebff933afd7192d721c03e02b645a09..78d271ae9e127f8fadd0ab6cb7384655c8362f65 100644
--- a/community/mate-settings-daemon/APKBUILD
+++ b/community/mate-settings-daemon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="MATE Settings daemon"
 url="https://github.com/mate-desktop/mate-settings-daemon"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common mate-desktop"
 makedepends="libtool intltool libmatekbd-dev freeglut-dev
 	glib-dev gtk+3.0-dev dbus-glib-dev dconf-dev libxklavier-dev libsm-dev
diff --git a/community/mate-system-monitor/APKBUILD b/community/mate-system-monitor/APKBUILD
index 2585e24e7686c1075b29966e4d6e6caa8bd839b5..72c58a01edd21fbf588abb15f781979c4af02f0a 100644
--- a/community/mate-system-monitor/APKBUILD
+++ b/community/mate-system-monitor/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A system monitor for MATE"
 url="https://github.com/mate-desktop/mate-system-monitor"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="mate-icon-theme"
 makedepends="gtk+3.0-dev libwnck3-dev gtkmm3-dev libgtop-dev
 	librsvg-dev glibmm-dev itstool linux-headers libxml2-utils"
diff --git a/community/mate-terminal/APKBUILD b/community/mate-terminal/APKBUILD
index 087d122c05ea63a412ad2087ab0c8607d3998585..596b7edd6179d0f1ecfee7b1b1488ca4d750e0d3 100644
--- a/community/mate-terminal/APKBUILD
+++ b/community/mate-terminal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="MATE terminal emulator"
 url="https://github.com/mate-desktop/mate-terminal"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mate-common yelp-tools mate-desktop"
 makedepends="libtool intltool dconf-dev libsm-dev itstool vte3-dev
 	mate-desktop-dev libxml2-utils gtk+3.0-dev"
diff --git a/community/mate-themes/APKBUILD b/community/mate-themes/APKBUILD
index d6af8b8007b1f94a4d0c7c7b2135c6724660a8eb..7ba13fe66b9775a33eafb091df08345d1186916c 100644
--- a/community/mate-themes/APKBUILD
+++ b/community/mate-themes/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="MATE themes"
 url="https://github.com/mate-desktop/mate-themes"
 arch="noarch"
-license="LGPL2"
+license="LGPL-2.0"
 depends="mate-common"
 makedepends="intltool gdk-pixbuf-dev gtk+2.0-dev icon-naming-utils gtk+3.0-dev"
 subpackages="$pkgname-lang"
diff --git a/community/mate-utils/APKBUILD b/community/mate-utils/APKBUILD
index b1115d95f34be6a9df6c7d4fd292f2f080c52ba4..223e2e25af07a4d88495155cc8cac08254d4ce91 100644
--- a/community/mate-utils/APKBUILD
+++ b/community/mate-utils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Utilities for the MATE Desktop"
 url="https://github.com/mate-desktop/mate-utils"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="intltool glib-dev gtk+3.0-dev mate-panel-dev
 	libgtop-dev libcanberra-dev itstool libsm-dev libxml2-utils"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/community/maven/APKBUILD b/community/maven/APKBUILD
index 57c7935df71bd0c24a2b02d305f262e1a3516e85..79ad567b9b976086050ec8b9aa0d4ae787562b18 100644
--- a/community/maven/APKBUILD
+++ b/community/maven/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A Java project management and project comprehension tool."
 url="http://maven.apache.org"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre"
 source="http://mirror.hosting90.cz/apache/$pkgname/$_pkgname/$pkgver/binaries/apache-$pkgname-$pkgver-bin.tar.gz"
 builddir="$srcdir/apache-$pkgname-$pkgver"
diff --git a/community/mbedtls/APKBUILD b/community/mbedtls/APKBUILD
index 2f20ae92453ec9ae884bc82da095d2ebc74474a6..42270fc2018421c0d2e580139319447c36b7ea22 100644
--- a/community/mbedtls/APKBUILD
+++ b/community/mbedtls/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Light-weight cryptographic and SSL/TLS library"
 url="https://tls.mbed.org/"
 arch="all"
-license="GPL2+ ASL 2.0"
+license="GPL-2.0-or-later Apache-2.0"
 makedepends="cmake perl"
 subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ARMmbed/$pkgname/archive/$pkgname-$pkgver.tar.gz
diff --git a/community/midori/APKBUILD b/community/midori/APKBUILD
index 63aa3706779c55afada0dc357726d1737a452909..27180f110ad5028e00dae2d4e3852f6ff38a1f13 100644
--- a/community/midori/APKBUILD
+++ b/community/midori/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.midori-browser.org"
 arch="x86 x86_64"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=
 makedepends="cmake librsvg-dev paxmark python2 vala gtk+3.0-dev gcr-dev libunique-dev webkit2gtk-dev"
 subpackages="$pkgname-lang"
diff --git a/community/minetest/APKBUILD b/community/minetest/APKBUILD
index 2125b372c0305ce486f36aa5bad371db60846b6d..bae9227a03d4b57a8529559ddb8554e1d923c3ac 100644
--- a/community/minetest/APKBUILD
+++ b/community/minetest/APKBUILD
@@ -8,7 +8,7 @@ url="http://minetest.net/"
 # luajit is not available for disabled arches
 arch="all !s390x"
 install="$pkgname-server.pre-install"
-license="LGPL2.1 CCBY-SA3.0"
+license="LGPL-2.1 CC-BY-SA-3.0"
 depends="$pkgname-common"
 pkgusers="minetest"
 pkggroups="minetest"
diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD
index b4b724c8f39162c2e716e2157ec5a20508a90abf..67feef203562ce2187110e57655c400687fa8863 100644
--- a/community/modemmanager/APKBUILD
+++ b/community/modemmanager/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ModemManager library"
 url="http://www.freedesktop.org/wiki/Software/ModemManager"
 arch="all"
-license="GPL2, LGPL2.1"
+license="GPL-2.0 LGPL-2.1"
 depends_dev="libmm-glib"
 makedepends="$depends_dev gobject-introspection-dev gtk-doc intltool vala
 	libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers"
diff --git a/community/mongodb-tools/APKBUILD b/community/mongodb-tools/APKBUILD
index 3d173a044fb5ebcebfb8c451edebaa6dcf4b2200..4f264aff30135553455138c64e0aee7338524fc9 100644
--- a/community/mongodb-tools/APKBUILD
+++ b/community/mongodb-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The MongoDB tools provide import, export, and diagnostic capabilities."
 url="https://github.com/mongodb/mongo-tools"
 arch="all !s390x !aarch64"
-license="apache"
+license="Apache"
 makedepends="$depends_dev go cyrus-sasl-dev libressl-dev libpcap-dev"
 options="!check"
 source="$pkgname-$pkgver.tar.gz::https://github.com/mongodb/mongo-tools/archive/r$pkgver.tar.gz
diff --git a/community/monitoring-plugins/APKBUILD b/community/monitoring-plugins/APKBUILD
index 8913003c638afc3ff4834d3fb67b7aed2b0263b7..a05ca1a8b5d88c5edbeae2d41c113eb4a4fb8ece 100644
--- a/community/monitoring-plugins/APKBUILD
+++ b/community/monitoring-plugins/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="Plugins for Icinga, Naemon, Nagios, Shinken, Sensu and other monitoring applications"
 url="http://www.monitoring-plugins.org"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 options="suid"
 depends="iputils"
 makedepends="linux-headers libdbi-dev libressl-dev 
diff --git a/community/monkey/APKBUILD b/community/monkey/APKBUILD
index 9c775281fd6369a03fc0b855bb95c0815e18e0ea..4599053246b314304204b869e822ff505b5122f0 100644
--- a/community/monkey/APKBUILD
+++ b/community/monkey/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Monkey is a lightweight and powerful web server"
 url="http://monkey-project.com/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 makedepends="cmake jemalloc-dev bash mbedtls-dev findutils"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://monkey-project.com/releases/1.6/$pkgname-$pkgver.tar.gz"
diff --git a/community/mozo/APKBUILD b/community/mozo/APKBUILD
index e3d454f5dc40b8f189450b84e8dbd09593cbfe13..298b2d9c55fcb5153406d2276a8376bffe8558cd 100644
--- a/community/mozo/APKBUILD
+++ b/community/mozo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A menu editor for MATE"
 url="https://github.com/mate-desktop/mozo"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="intltool mate-menus-dev glib-dev py-gobject3-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
diff --git a/community/mpc/APKBUILD b/community/mpc/APKBUILD
index cc81a8fc9e8232b0bdf4c21b9ed9284f2401e4a0..6cd425f0425357274a2418d23e0d8fbfa6bd739d 100644
--- a/community/mpc/APKBUILD
+++ b/community/mpc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Minimalist command line interface to MPD"
 url="https://www.musicpd.org/clients/mpc/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libmpdclient-dev"
 subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc"
 source="http://www.musicpd.org/download/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
diff --git a/community/mpd/APKBUILD b/community/mpd/APKBUILD
index ce45ff012695cb9e053a7702c540b9ec83ef2b41..642ded3ac5e6eb45e52cc26ab79406c095d89bda 100644
--- a/community/mpd/APKBUILD
+++ b/community/mpd/APKBUILD
@@ -14,7 +14,7 @@ url="https://musicpd.org"
 pkgusers="mpd"
 pkggroups="mpd audio"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="lame-dev glib-dev curl-dev libao-dev libmad-dev flac-dev
 	libogg-dev faad2-dev libid3tag-dev libvorbis-dev alsa-lib-dev
diff --git a/community/mpv/APKBUILD b/community/mpv/APKBUILD
index 81f8f8e99087f3e407c12472236bfeebd285b954..765b09cf3e486c05811dc6a61871d922ca0ccf6c 100644
--- a/community/mpv/APKBUILD
+++ b/community/mpv/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc="Video player based on MPlayer/mplayer2"
 url="https://mpv.io/"
 arch="all"
-license="GPL2+ LGPL2+"
+license="GPL-2.0-or-later LGPL-2.0-or-later"
 depends=""
 makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
 	libtheora-dev xvidcore-dev zlib-dev sdl-dev freetype-dev
diff --git a/community/msgpack-c/APKBUILD b/community/msgpack-c/APKBUILD
index 5a5fa4d874894ac931e7221ffa4a10d11b5cd191..3ec30c8abb74fa1387a86670027b0832109252e2 100644
--- a/community/msgpack-c/APKBUILD
+++ b/community/msgpack-c/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="An efficient object serialization library"
 url="https://msgpack.org"
 arch="all"
-license="Boost"
+license="BSL-1.0"
 depends=""
 makedepends="cmake"
 subpackages="$pkgname-dev"
diff --git a/community/mtex2mml/APKBUILD b/community/mtex2mml/APKBUILD
index c2fe141182a813fc469646bf8c82e36a9af8f3d1..0d0dad17557f8213f56576605d303921e0bead59 100644
--- a/community/mtex2mml/APKBUILD
+++ b/community/mtex2mml/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Bison grammar to convert TeX math into MathML"
 url="https://github.com/gjtorikian/mtex2MML"
 arch="all"
-license="GPL2 MPL2 LGPL2.1"
+license="GPL-2.0 MPL-2.0 LGPL-2.1"
 makedepends="cmake bison flex-dev python3"
 subpackages="$pkgname-dev $pkgname-libs $pkgname-fixtures::noarch"
 source="$pkgname-$pkgver.tar.gz::https://github.com/gjtorikian/$pkgname/archive/v$pkgver.tar.gz
diff --git a/community/multitail/APKBUILD b/community/multitail/APKBUILD
index b82f962ebb94e1c9a0e3a9643bd8967f818bbb6b..f7b5a99d38e72bb3d11876aad617d83d34ec5f09 100644
--- a/community/multitail/APKBUILD
+++ b/community/multitail/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="MultiTail lets you view one or multiple files like the original tail program"
 arch="all"
 url="http://www.vanheusden.com/multitail"
-license="GPL2"
+license="GPL-2.0"
 depends_dev=""
 depends="ncurses coreutils"
 makedepends="ncurses-dev"
diff --git a/community/mumudvb/APKBUILD b/community/mumudvb/APKBUILD
index f58c60cd9b7f1734f58982c6cc6ddbdf901cab01..fd649301eb304c0130558fd644388a6f51610629 100644
--- a/community/mumudvb/APKBUILD
+++ b/community/mumudvb/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A DVB IPTV streaming software"
 url="http://mumudvb.braice.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="automake autoconf libtool linux-headers m4 libdvbcsa-dev asciidoc gettext-dev"
 install="$pkgname.pre-install"
diff --git a/community/mutagen/APKBUILD b/community/mutagen/APKBUILD
index e6251f2e534a7d65ab9b96faff11f7a9378e04bc..a44fe4a41e43f263bfe99212d8378eabe7064d4e 100644
--- a/community/mutagen/APKBUILD
+++ b/community/mutagen/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="An audio metadata tag reader and writer implemented in pure python"
 url="https://github.com/quodlibet/mutagen"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2 py-mutagen"
 makedepends="python2-dev"
 checkdepends="py2-pytest py-setuptools py2-hypothesis"
diff --git a/community/mysecureshell/APKBUILD b/community/mysecureshell/APKBUILD
index 2c8b62d9047d9edf66e6562c407bae2f2e1ed691..19a346fcdce094748d2230a6af9bcda7c809f62b 100644
--- a/community/mysecureshell/APKBUILD
+++ b/community/mysecureshell/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A solution which has been made to bring more features to sftp/scp protocol given by OpenSSH."
 url="https://github.com/mysecureshell/mysecureshell"
 arch="all"
-license="GNU"
+license="GPL"
 depends="openssh"
 makedepends="musl-dev"
 install="$pkgname.post-install $pkgname.post-deinstall"
diff --git a/community/mythes/APKBUILD b/community/mythes/APKBUILD
index 6dc45d2a492208461a784be378af342434897e41..6de9d3428c64e215e4cc685691e3109062da1d2f 100644
--- a/community/mythes/APKBUILD
+++ b/community/mythes/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A simple thesaurus"
 url="http://hunspell.sourceforge.net/"
 arch="all"
-license="GPL2+ LGPL2+ MPL 1.1"
+license="GPL-2.0-or-later LGPL-2.0-or-later MPL-1.1"
 subpackages="$pkgname-dev"
 depends_dev="perl hunspell-dev"
 makedepends="$depends_dev"
diff --git a/community/nbd/APKBUILD b/community/nbd/APKBUILD
index d30012b9e9e115b0356e9da5361b8b1f17cf70f7..99cc715fe2e202f3804a543a5349cba639a32ab1 100644
--- a/community/nbd/APKBUILD
+++ b/community/nbd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Tools for network block devices"
 url="http://nbd.sourceforge.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="glib-dev linux-headers zlib-dev"
 subpackages="$pkgname-doc $pkgname-client"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/community/ncmpc/APKBUILD b/community/ncmpc/APKBUILD
index 88c80e2b3a34d7491ac32c0ed832af5312188f33..cd56554d209ed1d7e183dccc0dfa67c192031962 100644
--- a/community/ncmpc/APKBUILD
+++ b/community/ncmpc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Fully featured MPD client using ncurses"
 url="https://www.musicpd.org/clients/ncmpc/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="ncurses-dev glib-dev libmpdclient-dev meson"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-dbg"
 source="http://www.musicpd.org/download/$pkgname/0/$pkgname-$pkgver.tar.xz"
diff --git a/community/nedit/APKBUILD b/community/nedit/APKBUILD
index e5bdf28afbedd181982a541c4142866b9ee08e7e..5923a75ab8847b50260ee2fd120c9d7d0a65d204 100644
--- a/community/nedit/APKBUILD
+++ b/community/nedit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The Nirvana Editor, a multi-purpose X11 editor that's easy to use"
 url="https://sourceforge.net/projects/nedit/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 # perl for docs, bison and flex are used but may be optional
 makedepends="$depends_dev motif-dev bison flex perl"
 subpackages="$pkgname-doc"
diff --git a/community/neovim/APKBUILD b/community/neovim/APKBUILD
index 7cceb5fea33108cb27f7f346f0a0fc77bdd57a25..13c98d761cbd112b9efc327c9afbde1639572bb4 100644
--- a/community/neovim/APKBUILD
+++ b/community/neovim/APKBUILD
@@ -16,7 +16,7 @@ pkgrel=0
 pkgdesc="Vim-fork focused on extensibility and agility"
 url="https://neovim.io"
 arch="all !s390x" # needs luajit
-license="ASL-2.0 custom"
+license="Apache-2.0 custom"
 depends=""
 makedepends="cmake gettext-dev gperf libtermkey-dev libuv-dev libvterm-dev
 	lua5.1-lpeg lua5.1-mpack luajit-dev msgpack-c-dev unibilium-dev"
diff --git a/community/netatalk/APKBUILD b/community/netatalk/APKBUILD
index 86258bf48be8eccbb14dac250ef0e4a703806f94..0a7a6ba9102fff917fac91e5a820fb40b5783985 100644
--- a/community/netatalk/APKBUILD
+++ b/community/netatalk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Netatalk is a freely-available Open Source AFP fileserver"
 url="http://netatalk.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="acl-dev attr-dev db-dev libevent-dev libgcrypt-dev tdb-dev file"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/community/nextcloud-client/APKBUILD b/community/nextcloud-client/APKBUILD
index 0399b53081a124184d428cc50eb995cb31128a47..32e157fabed984be93279fac238c08732ce84c48 100644
--- a/community/nextcloud-client/APKBUILD
+++ b/community/nextcloud-client/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Nextcloud Desktop Client"
 url="https://github.com/nextcloud/client_theming"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="$depends_dev cmake qt5-qttools-dev qt5-qtwebkit-dev
 	qt5-qtkeychain-dev"
 subpackages="$pkgname-dev"
diff --git a/community/notmuch/APKBUILD b/community/notmuch/APKBUILD
index d516ec2d1336bddece41f7869a063188b8eaed98..52a445258a2da4506544399bc584e7184f97074e 100644
--- a/community/notmuch/APKBUILD
+++ b/community/notmuch/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="E-Mail index, search and tagging"
 url="https://notmuchmail.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="gzip xapian-core-dev gmime-dev talloc-dev py-sphinx
 	py-requests python2-dev python3-dev bash-completion"
 checkdepends="sed coreutils diffutils bash tar mdocml grep"
diff --git a/community/numix-themes/APKBUILD b/community/numix-themes/APKBUILD
index 9a807a3fc3e1483dc7f205db7a6006061e94ebbb..e91a512898bac13318f8dbbf31109be5ef64291c 100644
--- a/community/numix-themes/APKBUILD
+++ b/community/numix-themes/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A modern flat theme with a combination of light and dark elements, GTK 2 and 3"
 url="http://shimmerproject.org/project/Numix/"
 arch="noarch"
-license="GPLv3"
+license="GPL-3.0"
 subpackages="$pkgname-gtk2 $pkgname-gtk3 $pkgname-metacity $pkgname-xfwm4 $pkgname-xfce4-notifyd:_notify
 		$pkgname-openbox:_openbox"
 source="numix-$pkgver.tar.gz::https://github.com/numixproject/$_pkgname/archive/$pkgver.tar.gz"
diff --git a/community/nuttcp/APKBUILD b/community/nuttcp/APKBUILD
index 742f646ccdc2997d0533c2b197d15a2dfca726bb..4a47a39936d2106a9423393e24e8a7bc237c4c6f 100644
--- a/community/nuttcp/APKBUILD
+++ b/community/nuttcp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A network performance measurement tool"
 url="http://www.nuttcp.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="linux-headers"
 source="http://nuttcp.net/nuttcp/nuttcp-$pkgver/nuttcp-$pkgver.c"
 builddir="$srcdir"
diff --git a/community/nx-libs/APKBUILD b/community/nx-libs/APKBUILD
index 029cf7af805c86337280504aef4a319fc45e1216..98c0c100bcbd794684d73aef5cf45a4daf7d4c67 100644
--- a/community/nx-libs/APKBUILD
+++ b/community/nx-libs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="NoMachine libraries (redistributed by x2go)"
 url="http://x2go.org"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="font-cursor-misc font-misc-misc"
 makedepends="libx11-dev zlib-dev libjpeg-turbo-dev
 	libpng-dev libfontenc-dev linux-headers
diff --git a/community/nxapi/APKBUILD b/community/nxapi/APKBUILD
index 9b8bc4bebe3a1806d0dae2e05c3352c50b424ec9..50038103febf5db6db335e177356c14abe65f131 100644
--- a/community/nxapi/APKBUILD
+++ b/community/nxapi/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="nginx/naxsi log parser, whitelist and report generator."
 url="http://www.nginx.org | https://github.com/nbs-system/naxsi"
 arch="noarch"
-license="GPL v2"
+license="GPL-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev"
diff --git a/community/obnam/APKBUILD b/community/obnam/APKBUILD
index 8965b1f8fe44109920e193dcce1558f6d55e21aa..33ae7c2669c9ab6496058fc2f10d65e4a93cf5aa 100644
--- a/community/obnam/APKBUILD
+++ b/community/obnam/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A backup program that supports encryption and deduplication"
 url="http://obnam.org/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2 py-larch py-paramiko py-fuse py-enum34 py-six py-asn1-modules py-packaging"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/community/ocaml/APKBUILD b/community/ocaml/APKBUILD
index f7feb14473dfda1d420c999f4b20b77aa05bce1f..62f26c7d5b53a863690102f99b8e849e0c8b22ff 100644
--- a/community/ocaml/APKBUILD
+++ b/community/ocaml/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Main implementation of the Caml programming language"
 url="http://ocaml.org/"
 arch="all !x86 !armhf !s390x"
-license="LGPLv2"
+license="LGPL-2.0"
 makedepends="ncurses-dev zlib-dev gdbm-dev"
 depends="ncurses-dev"
 options="textrels"
diff --git a/community/ocamlbuild/APKBUILD b/community/ocamlbuild/APKBUILD
index e114335c82ee1d6d73bbfc3cd46e98291207d664..434f160be3d0e6e02fe911f8eb5bc66936c1115b 100644
--- a/community/ocamlbuild/APKBUILD
+++ b/community/ocamlbuild/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Generic build tool with built-in rules for building OCaml library and programs."
 url="https://github.com/ocaml/ocamlbuild"
 arch="all !x86 !armhf !s390x" #ocaml not avail on excluded platforms
-license="LGPL2"
+license="LGPL-2.0"
 depends=""
 makedepends="ocaml"
 options=""
diff --git a/community/offlineimap/APKBUILD b/community/offlineimap/APKBUILD
index 7123209d0085ccb0126553307a23770a14c0cc31..e9ca404e7e59fd8d3d948589894f46df4f4edd8b 100644
--- a/community/offlineimap/APKBUILD
+++ b/community/offlineimap/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Synchronizes emails between two repositories"
 url="http://www.offlineimap.org"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2 py2-six"
 makedepends="python2-dev asciidoc"
 install=""
diff --git a/community/opam/APKBUILD b/community/opam/APKBUILD
index 32dfaed6b0f5b7890f4b562360ee3a164b0cb2fe..a8a30e5065345b001e6a1493ca28330c7a57dd2c 100644
--- a/community/opam/APKBUILD
+++ b/community/opam/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="OCaml Package Manager"
 url="https://opam.ocaml.org"
 arch="all !x86 !armhf !s390x"  # ocaml not avail on excluded platforms
-license="LGPL3"
+license="LGPL-3.0"
 depends="ocaml camlp4 curl tar unzip rsync aspcud"
 makedepends="$depends_dev"
 install=""
diff --git a/community/opencpn/APKBUILD b/community/opencpn/APKBUILD
index 30ff3df0c8d6e9aab2d027daf59db55bb0423a26..1dd2834c326812b443178273f1a878e195aacd8c 100644
--- a/community/opencpn/APKBUILD
+++ b/community/opencpn/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="OpenCPN is a cross platform electronic navigation system"
 url="http://opencpn.org"
 arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="wxgtk-dev libexecinfo-dev linux-headers curl-dev cmake gpsd portaudio-dev tinyxml-dev"
 install=""
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index 4f72787a9a24d2d123d8a4553a4c0c976e378051..2b86618041cdec9e4eb6e5f4b246984dd8c6702b 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="OpenJDK 7 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="all"
-license="GPL2 with Classpath"
+license="GPL-2.0 with Classpath"
 depends="$pkgname-jre java-cacerts"
 options="sover-namecheck"
 makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt
diff --git a/community/openlibm/APKBUILD b/community/openlibm/APKBUILD
index 96b82f6795a16593087c744dbf1eb5c2e3c74151..929ba245cb537b024523b9d572927919b6c72708 100644
--- a/community/openlibm/APKBUILD
+++ b/community/openlibm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="High quality system independent, portable, open source libm implementation"
 url="http://www.openlibm.org"
 arch="all !s390x"
-license="MIT BSD public-domain"
+license="MIT BSD Public-Domain"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev"
diff --git a/community/openspecfun/APKBUILD b/community/openspecfun/APKBUILD
index 6f32502b5e4c130b7beef9b09471abfa2d53cca3..67d21ef2868d27e270f19a2b4ed5136e6f18b45f 100644
--- a/community/openspecfun/APKBUILD
+++ b/community/openspecfun/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A collection of special mathematical functions."
 url="https://github.com/JuliaLang/openspecfun"
 arch="all !s390x"
-license="MIT public-domain"
+license="MIT Public-Domain"
 depends=""
 makedepends="openlibm-dev gfortran"
 subpackages="$pkgname-dev"
diff --git a/community/optipng/APKBUILD b/community/optipng/APKBUILD
index ed17fe8c58d0b3d55dc3752c8c3c5e85b7c87c6e..fcc36ad87aec00ad5e955a21939fe02308b03e87 100644
--- a/community/optipng/APKBUILD
+++ b/community/optipng/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Compresses PNG files to a smaller size, without losing any information."
 url="http://optipng.sourceforge.net/"
 arch="all"
-license="ZLIB"
+license="zlib"
 makedepends="libpng-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/community/osinfo-db-tools/APKBUILD b/community/osinfo-db-tools/APKBUILD
index 5b9a7b1f97c9bbbf523019233c3649d77b9df492..3af4a9c65ea64cc12ecfe2b482600bb8426892d2 100644
--- a/community/osinfo-db-tools/APKBUILD
+++ b/community/osinfo-db-tools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Tools for managing the osinfo database"
 url="http://libosinfo.org/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev intltool glib-dev libxml2-dev libarchive-dev
diff --git a/community/osinfo-db/APKBUILD b/community/osinfo-db/APKBUILD
index ddd485ddfed899a22cb7528952e8fcc45970a628..bf3eef09e3b7dab8e6b66279361cfa89b4da21fa 100644
--- a/community/osinfo-db/APKBUILD
+++ b/community/osinfo-db/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="osinfo database files"
 url="http://libosinfo.org/"
 arch="noarch"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="osinfo-db-tools"
 install=""
diff --git a/community/ospd-ancor/APKBUILD b/community/ospd-ancor/APKBUILD
index da2c80aaa5dd7b2f87aedc0964a6de807041ba8c..37a859dc2223a6f6c3294cdf70db60e3fe8b246e 100644
--- a/community/ospd-ancor/APKBUILD
+++ b/community/ospd-ancor/APKBUILD
@@ -7,7 +7,7 @@ _pkgid=2005
 pkgdesc="OSP server implementation to allow OpenVAS to get scan results from an Ancor server"
 url="http://openvas.org/"
 arch="noarch"
-license="GPLV2+"
+license="GPL-2.0-or-later"
 depends="python3 py3-requests ospd"
 makedepends="python3-dev"
 source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz"
diff --git a/community/ospd-ovaldi/APKBUILD b/community/ospd-ovaldi/APKBUILD
index f483f7bc0218eae1413325f6f0ab4c0662a2f993..71f4b9bb1c635d1e8067805adc86017ce30ad264 100644
--- a/community/ospd-ovaldi/APKBUILD
+++ b/community/ospd-ovaldi/APKBUILD
@@ -7,7 +7,7 @@ _pkgid=2003
 pkgdesc="OSP server implementation to allow OpenVAS to remotely control ovaldi scanners"
 url="http://openvas.org/"
 arch="noarch"
-license="GPLV2+"
+license="GPL-2.0-or-later"
 depends="python3 ospd"
 makedepends="python3-dev py3-paramiko"
 source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz"
diff --git a/community/ospd-ssh-keyscan/APKBUILD b/community/ospd-ssh-keyscan/APKBUILD
index 8037d27f9579a7b6536cba6213cde82ad9cf7428..5e6ea089fcaef3a14946192e8a1d1649165a2906 100644
--- a/community/ospd-ssh-keyscan/APKBUILD
+++ b/community/ospd-ssh-keyscan/APKBUILD
@@ -7,7 +7,7 @@ _pkgid=2213
 pkgdesc="OSP server implementation to allow OpenVAS to scan ssh keys"
 url="http://openvas.org/"
 arch="noarch"
-license="GPLV2+"
+license="GPL-2.0-or-later"
 depends="python3 ospd"
 makedepends="python3-dev py3-paramiko"
 source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz"
diff --git a/community/ospd-w3af/APKBUILD b/community/ospd-w3af/APKBUILD
index 5043735103c86bdc743aff421cad12b128a7a3e9..60db84b74fb3e10ab6f706ae950d9a0d3a7863b9 100644
--- a/community/ospd-w3af/APKBUILD
+++ b/community/ospd-w3af/APKBUILD
@@ -7,7 +7,7 @@ _pkgid=2004
 pkgdesc="OSP server implementation to allow OpenVAS to remotely control a w3af scanner"
 url="http://openvas.org/"
 arch="noarch"
-license="GPLV2+"
+license="GPL-2.0-or-later"
 depends="python3 ospd"
 makedepends="python3-dev py3-paramiko"
 source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz"
diff --git a/community/patchelf/APKBUILD b/community/patchelf/APKBUILD
index cd9814b47e5f146efc419ec8d80810283418da85..9b79187d0188511848f8504d17a63ded23c13ca7 100644
--- a/community/patchelf/APKBUILD
+++ b/community/patchelf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Small utility to modify the dynamic linker and RPATH of ELF executables"
 url="https://nixos.org/patchelf.html"
 arch="all !aarch64"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="autoconf automake libtool"
 install=""
diff --git a/community/pdsh/APKBUILD b/community/pdsh/APKBUILD
index 6e1068de8e3e1cf31f0368563757cc38a15b180d..8f89dcdb4ba9afbe4bbfd68ab2143d16f8a8775a 100644
--- a/community/pdsh/APKBUILD
+++ b/community/pdsh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A high performance, parallel remote shell utility"
 url="https://github.com/chaos/pdsh"
 arch="all"
-license="GPL-2"
+license="GPL-2.0"
 depends="perl"
 makedepends="autoconf automake libtool readline-dev ncurses-dev"
 subpackages="$pkgname-doc $pkgname-rcmd-ssh:_rcmd_ssh"
diff --git a/community/perl-class-load-xs/APKBUILD b/community/perl-class-load-xs/APKBUILD
index 003ba3230017de8d1fc9a902adb61a622fb5eeb8..1c0a6365dc786f646e96e4782cd7ac9d5ed283b7 100644
--- a/community/perl-class-load-xs/APKBUILD
+++ b/community/perl-class-load-xs/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="XS implementation of parts of Class::Load"
 url="http://search.cpan.org/dist/Class-Load-XS/"
 arch="all"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-class-load"
 cpanmakedepends="perl-test-requires perl-test-fatal perl-module-implementation perl-test-needs"
 depends="$cpandepends"
diff --git a/community/perl-datetime-format-builder/APKBUILD b/community/perl-datetime-format-builder/APKBUILD
index 4978793c7897a265177ccb382dbb6a935f685898..389198ef0d9358a80eff632cc7f427cbcbe30a30 100644
--- a/community/perl-datetime-format-builder/APKBUILD
+++ b/community/perl-datetime-format-builder/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Create DateTime parser classes and objects."
 url="http://search.cpan.org/dist/DateTime-Format-Builder/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-datetime-format-strptime perl-datetime perl-class-factory-util perl-params-validate"
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/community/perl-datetime-format-strptime/APKBUILD b/community/perl-datetime-format-strptime/APKBUILD
index 441234194ab2a255f8868d5592c51cf5801ed4df..8152ff30b83ed2a7e09fbf3c3cb4a187275cb583 100644
--- a/community/perl-datetime-format-strptime/APKBUILD
+++ b/community/perl-datetime-format-strptime/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Parse and format strp and strf time patterns"
 url="http://search.cpan.org/dist/DateTime-Format-Strptime/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-params-validate perl-datetime perl-try-tiny
 		perl-package-deprecationmanager perl-datetime-timezone
 		perl-datetime-locale"
diff --git a/community/perl-io-prompt-tiny/APKBUILD b/community/perl-io-prompt-tiny/APKBUILD
index 273aae7c5da1b5a4a4d97cb9250d4a0f46d3260b..5836f7966fa3b10414e5ff79a6be922361bc4154 100644
--- a/community/perl-io-prompt-tiny/APKBUILD
+++ b/community/perl-io-prompt-tiny/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Prompt for user input with a default option"
 url="http://search.cpan.org/dist/IO-Prompt-Tiny/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends=""
 cpancheckdepends="perl-capture-tiny"
diff --git a/community/perl-iptables-chainmgr/APKBUILD b/community/perl-iptables-chainmgr/APKBUILD
index 6ab2fdc3b04f4febb72986b7477f12ce5ff6033c..9d0f3a063c6783023b5dc1cf5445423f79553b8c 100644
--- a/community/perl-iptables-chainmgr/APKBUILD
+++ b/community/perl-iptables-chainmgr/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Perl extension for manipulating iptables and ip6tables policies"
 url="http://search.cpan.org/dist/IPTables-ChainMgr/"
 arch="noarch"
-license="artistic_1"
+license="Artistic-1.0"
 cpandepends="perl-netaddr-ip perl-iptables-parse"
 cpanmakedepends=""
 depends="$cpandepends"
diff --git a/community/perl-iptables-parse/APKBUILD b/community/perl-iptables-parse/APKBUILD
index 81d1ef74b283610a7cc43b7aa97431099d844ecf..6600454fb2bd6821af6a5beb3811599c5a323325 100644
--- a/community/perl-iptables-parse/APKBUILD
+++ b/community/perl-iptables-parse/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Perl extension for parsing iptables and ip6tables firewall rulesets"
 url="http://search.cpan.org/dist/IPTables-Parse/"
 arch="noarch"
-license="artistic_1"
+license="Artistic-1.0"
 cpandepends=""
 cpanmakedepends=""
 depends="$cpandepends"
diff --git a/community/perl-list-moreutils-xs/APKBUILD b/community/perl-list-moreutils-xs/APKBUILD
index 34231165fedaa5389b987be35b5e472ee13ad4b8..02c6e3611cdd7b656d0958c38022621abc772124 100644
--- a/community/perl-list-moreutils-xs/APKBUILD
+++ b/community/perl-list-moreutils-xs/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Provide the stuff missing in List::Util in XS"
 url="http://search.cpan.org/dist/List-MoreUtils-XS/"
 arch="all"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends=""
 cpancheckdepends=""
diff --git a/community/perl-module-implementation/APKBUILD b/community/perl-module-implementation/APKBUILD
index bc697ccde2fd292aaabb836f4a2b7132de68962b..21ea82a255cb9c5dbb09b0538e102a58329329f9 100644
--- a/community/perl-module-implementation/APKBUILD
+++ b/community/perl-module-implementation/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Loads one of several alternate underlying implementations for a module"
 url="http://search.cpan.org/dist/Module-Implementation/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-module-runtime perl-try-tiny perl-test-taint"
 cpanmakedepends="perl-test-fatal perl-test-requires "
 depends="$cpandepends"
diff --git a/community/perl-mojolicious/APKBUILD b/community/perl-mojolicious/APKBUILD
index db67082d806db706a114d213e051cb516e60cf51..6e306922ee0e7556b742c0e17da8f3310ab8d910 100644
--- a/community/perl-mojolicious/APKBUILD
+++ b/community/perl-mojolicious/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Real-time web framework"
 url="http://search.cpan.org/dist/Mojolicious/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/community/perl-net-dns-sec/APKBUILD b/community/perl-net-dns-sec/APKBUILD
index e3f3cc398531c8ac81f6cfb2a824f43618ec1e93..30683b598266e7e2abad93f36fb8879e50f42729 100644
--- a/community/perl-net-dns-sec/APKBUILD
+++ b/community/perl-net-dns-sec/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="DNSSEC extensions to Net::DNS"
 url="http://search.cpan.org/dist/Net-DNS-SEC/"
 arch="noarch"
-license="mit"
+license="MIT"
 cpandepends="perl-crypt-openssl-dsa perl-net-dns perl-crypt-openssl-rsa
 	perl-crypt-openssl-random perl-digest-bubblebabble perl-mime-base32
 	perl-crypt-openssl-bignum"
diff --git a/community/perl-test-postgresql/APKBUILD b/community/perl-test-postgresql/APKBUILD
index c304088ba589b8de00a72a3bd18c85361fc921ec..f2aba4be93d19dc081246f9f6adedd5d80f6a858 100644
--- a/community/perl-test-postgresql/APKBUILD
+++ b/community/perl-test-postgresql/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="PostgreSQL runner for tests"
 url="http://search.cpan.org/dist/Test-PostgreSQL/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-class-accessor-lite"
 cpanmakedepends="perl-test-sharedfork perl-dbd-pg perl-dbi
 	perl-test-pod perl-moo perl-type-tiny perl-function-parameters
diff --git a/community/perl-text-quoted/APKBUILD b/community/perl-text-quoted/APKBUILD
index 2ab9daf4c5f7f6f4467333ce0848420729643c67..e35f47633c4a8b29049a78f232840877609ea348 100644
--- a/community/perl-text-quoted/APKBUILD
+++ b/community/perl-text-quoted/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Text::Quoted perl module"
 url="http://search.cpan.org/dist/Text-Quoted/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-text-autoformat"
 makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
diff --git a/community/perl-try-tiny/APKBUILD b/community/perl-try-tiny/APKBUILD
index 023a3e7f6f660b0ddaefc0dbc18dae3a42e386b9..c29bd72298782ded32650d050d91713a7aae3918 100644
--- a/community/perl-try-tiny/APKBUILD
+++ b/community/perl-try-tiny/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="minimal try/catch with proper preservation of $@"
 url="http://search.cpan.org/dist/Try-Tiny/"
 arch="noarch"
-license="mit"
+license="MIT"
 cpandepends="perl-capture-tiny perl-pod-coverage"
 cpanmakedepends="grep perl-sub-name"
 depends="$cpandepends"
diff --git a/community/pflogsumm/APKBUILD b/community/pflogsumm/APKBUILD
index 2e2bd7d01be0d744d466485a8afc61d989475b45..a80e8302b06eaabe08add5319bd62be68f989363 100644
--- a/community/pflogsumm/APKBUILD
+++ b/community/pflogsumm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Pflogsumm is a log analyzer for Postfix logs"
 url="http://jimsun.linxnet.com/postfix_contrib.html"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl perl-date-calc sysklogd"
 makedepends=""
 subpackages="$pkgname-doc"
diff --git a/community/php5-suhosin/APKBUILD b/community/php5-suhosin/APKBUILD
index ec69865c6218975e1872bd133ed29b290e19c3c5..3239804dbbe54d2cda29757ccbb54203190f94ea 100644
--- a/community/php5-suhosin/APKBUILD
+++ b/community/php5-suhosin/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="SUHOSIN - 수호ì‹  - The PHP security extension."
 url="https://www.suhosin.org"
 arch="all"
-license="PHP 3"
+license="PHP-3.0"
 depends=""
 makedepends="${_php}-dev autoconf linux-headers"
 source="https://download.suhosin.org/suhosin-$pkgver.tar.gz
diff --git a/community/php5/APKBUILD b/community/php5/APKBUILD
index d0b07c57c6606c2b1b252265a78d7e58805ed760..bc6536321befb109cf1fb05564ff5af7b6d41e8e 100644
--- a/community/php5/APKBUILD
+++ b/community/php5/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 arch="all"
-license="PHP-3"
+license="PHP-3.0"
 depends="$pkgname-cli"
 depends_dev="$pkgname-cli pcre-dev"
 install="$pkgname.post-upgrade"
diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD
index 084cfe172e08d3d34b0b7f71be48d4971c6bc5aa..a784bb01160d4e9230a18a64e77eaef5e5dbfa03 100644
--- a/community/php7/APKBUILD
+++ b/community/php7/APKBUILD
@@ -34,7 +34,7 @@ _default_php="yes"
 pkgdesc="The PHP$_suffix language runtime engine"
 url="http://www.php.net/"
 arch="all"
-license="PHP-3 BSD LGPL2 MIT Zend"
+license="PHP-3.0 BSD LGPL-2.0 MIT Zend"
 depends="$pkgname-common"
 depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre-dev"
 # Most dependencies between extensions is auto-discovered (see _extension()).
diff --git a/community/phpldapadmin/APKBUILD b/community/phpldapadmin/APKBUILD
index 87e6bb4ef661e96db496c889ede9d42c3bd906e8..b6f17a26c49210381fd91fb0c5684ac95769c4fd 100644
--- a/community/phpldapadmin/APKBUILD
+++ b/community/phpldapadmin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Web front-end for managing OpenLDAP"
 url="http://phpldapadmin.sourceforge.net"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="${_php} ${_php}-ldap ${_php}-gettext ${_php}-xml"
 depends_dev=
 makedepends="$depends_dev"
diff --git a/community/phpmyadmin/APKBUILD b/community/phpmyadmin/APKBUILD
index 22fb343372830113501548c50e056a1accddc8f5..ed70a35a51a8beca3a7791c5e6c543f54540d69e 100644
--- a/community/phpmyadmin/APKBUILD
+++ b/community/phpmyadmin/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A Web-based PHP tool for administering MySQL"
 url="https://www.phpmyadmin.net/"
 arch="noarch"
-license="GPL2 MIT BSD"
+license="GPL-2.0 MIT BSD"
 depends="${_php} ${_php}-mysqli ${_php}-zip ${_php}-zlib ${_php}-bz2
 	${_php}-ctype ${_php}-gd ${_php}-mcrypt ${_php}-json"
 depends_dev=
diff --git a/community/picocom/APKBUILD b/community/picocom/APKBUILD
index 9d04cca36fc42bbfcecf16b27fbd3ec076c02da4..374d3615f005440363d556b8266e47c31f867b77 100644
--- a/community/picocom/APKBUILD
+++ b/community/picocom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Minimal dumb-terminal emulation program"
 url="https://github.com/npat-efault/picocom"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/community/pluma/APKBUILD b/community/pluma/APKBUILD
index 47cccb1817c879f7c226a736bd5dca8434685e46..70757b2dbe09a5bc763b2f5cfe98ae62c2cae678 100644
--- a/community/pluma/APKBUILD
+++ b/community/pluma/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A small and lightweight UTF-8 text editor for the MATE"
 url="https://github.com/mate-desktop/pluma"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 # check fails as tracked in https://github.com/mate-desktop/pluma/issues/33
 options="!check"
 makedepends="intltool enchant-dev iso-codes-dev gtk+3.0-dev
diff --git a/community/portablexdr/APKBUILD b/community/portablexdr/APKBUILD
index e011685125bbc4092ae6cd55576d9e7c33c3db75..3d0c46eca7d2d7aaf1c36d9a5590e55236c57ab7 100644
--- a/community/portablexdr/APKBUILD
+++ b/community/portablexdr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="external data representation (XDR) library"
 url="http://people.redhat.com/~rjones/portablexdr/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libtool"
diff --git a/community/postsrsd/APKBUILD b/community/postsrsd/APKBUILD
index 1eb19cfc3920febefba77612308444dfcd04c048..f6ea52c7de52f35a10f445dc6a667a854e0c1ebe 100644
--- a/community/postsrsd/APKBUILD
+++ b/community/postsrsd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Postfix Sender Rewriting Scheme daemon"
 url="https://github.com/roehling/postsrsd"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="cmake help2man"
 pkgusers="postsrsd"
diff --git a/community/py-argh/APKBUILD b/community/py-argh/APKBUILD
index 13aaa1580ee217b437f597b0fac08a64925785d1..90a42df69774529c30686964a3219dd41c837d3f 100644
--- a/community/py-argh/APKBUILD
+++ b/community/py-argh/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python argparse wrapper"
 url="https://github.com/neithere/argh/"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/community/py-batinfo/APKBUILD b/community/py-batinfo/APKBUILD
index 6f9caabf45cd48f61becda136e275c69cfe44178..224bd0dd1ca6130c516ebf56e65d310799c41bc5 100644
--- a/community/py-batinfo/APKBUILD
+++ b/community/py-batinfo/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A simple Python lib to retreive battery information"
 url="https://github.com/nicolargo/batinfo"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends=""
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py3-${pkgname#py-}:_py3 py2-${pkgname#py-}:_py2"
diff --git a/community/py-dicttoxml/APKBUILD b/community/py-dicttoxml/APKBUILD
index d26a5aa1763ccd5f39b7d591fef09ebbc1b7bb9b..3a85cced69e80bc3a7574ec7517d8f53b87cb5eb 100644
--- a/community/py-dicttoxml/APKBUILD
+++ b/community/py-dicttoxml/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Converts a Python dictionary or other native data type into a valid XML string"
 url="https://github.com/quandyfactory/dicttoxml"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="python2-dev python3-dev"
 install=""
diff --git a/community/py-django-compressor/APKBUILD b/community/py-django-compressor/APKBUILD
index 0f58eec2a0efcea3388cc3fabe0e024682d6266c..8721501ea832ef1ac559d7336e9139f421fec96d 100644
--- a/community/py-django-compressor/APKBUILD
+++ b/community/py-django-compressor/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="JavaScript and CSS compressor for Django"
 url=https://github.com/django-compressor/django-compressor
 arch=noarch
-license="MIT and ASL 2.0 and BSD"
+license="MIT and Apache-2.0 and BSD"
 depends="py-django py-django-appconf"
 makedepends=py-setuptools
 source="https://files.pythonhosted.org/packages/source/d/django_compressor/django_compressor-$pkgver.tar.gz"
diff --git a/community/py-ethtool/APKBUILD b/community/py-ethtool/APKBUILD
index d7cf8f4538d1a06dd73df88de892f5dea123ec5c..c923defa5af8e9ae63ce4ccbede07f3c25d2f0b6 100644
--- a/community/py-ethtool/APKBUILD
+++ b/community/py-ethtool/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Python library for the ethtool kernel interface"
 url="http://www.ohloh.net/p/python-ethtool"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 depends_dev="libnl-dev pkgconfig python2-dev"
 makedepends="linux-headers $depends_dev"
diff --git a/community/py-evtx/APKBUILD b/community/py-evtx/APKBUILD
index 4080a6cb94d99a03e1116b51de0ed7c4ec2df58b..06801da70bcce7be0e4cd4f41d6fb8918638a0d4 100644
--- a/community/py-evtx/APKBUILD
+++ b/community/py-evtx/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Pure Python parser for recent Windows Event Log files (.evtx)"
 url="http://www.williballenthin.com/evtx/index.html"
 arch="noarch"
-license="APACHE2"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev py-setuptools python3-dev"
 install=""
diff --git a/community/py-geoip/APKBUILD b/community/py-geoip/APKBUILD
index 97d92954bc4e74f362ed4652d1a6563509424f12..e27350818330f7c9467a4d6fe399d625f23fe4ba 100644
--- a/community/py-geoip/APKBUILD
+++ b/community/py-geoip/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Pure Python GeoIP API"
 url="https://github.com/appliedsec/pygeoip"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/community/py-gpiozero/APKBUILD b/community/py-gpiozero/APKBUILD
index 15a37b5f2c70876f7292371d7ebd1714523f85ac..5d9103ae63bda2d892a1d2492498faea5f0ed951 100644
--- a/community/py-gpiozero/APKBUILD
+++ b/community/py-gpiozero/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A simple interface to everyday GPIO components used with Raspberry Pi"
 url="http://gpiozero.readthedocs.org"
 arch="armhf"
-license="BSD-3"
+license="BSD-3-Clause"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/community/py-gtkglext/APKBUILD b/community/py-gtkglext/APKBUILD
index 098ce3ce6391610300b7357abb9ef6a11b8ecd86..a24fdf17f8bbfa0a305690e533464e53e440fa20 100644
--- a/community/py-gtkglext/APKBUILD
+++ b/community/py-gtkglext/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="GtkGLExt is an OpenGL extension to GTK+. Python bindings"
 url="https://projects.gnome.org/gtkglext/download.html#pygtkglext"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=""
 depends_dev=""
 makedepends="$depends_dev python2-dev py-setuptools
diff --git a/community/py-impacket/APKBUILD b/community/py-impacket/APKBUILD
index ac7331e38e7b1a09fecd6b0be9e777ee9e964e5a..59a3b6a9362491cc8e23d92861c78e900c17816d 100644
--- a/community/py-impacket/APKBUILD
+++ b/community/py-impacket/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A collection of Python classes providing access to network packets"
 url="http://code.google.com/p/impacket/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev py-setuptools"
 install=""
diff --git a/community/py-ipaddr/APKBUILD b/community/py-ipaddr/APKBUILD
index 3f2f765101760702b82f295df43a1ab5b1180c0f..4526de27ee2b305010b44930ce7ff07275015d1f 100644
--- a/community/py-ipaddr/APKBUILD
+++ b/community/py-ipaddr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Python IP address manipulation library"
 url="http://code.google.com/p/ipaddr-py"
 arch="noarch"
-license="ASL 2.0 PSF"
+license="Apache-2.0 PSF"
 depends="python2"
 depends_dev=
 makedepends="$depends_dev"
diff --git a/community/py-jsonrpclib/APKBUILD b/community/py-jsonrpclib/APKBUILD
index ef3321aa4032042b5d4525323bebe3f48adf20ac..34f4495c7bd145f2de3131ba16fb7350cfa55ffa 100644
--- a/community/py-jsonrpclib/APKBUILD
+++ b/community/py-jsonrpclib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="A Python JSON-RPC over HTTP that mirrors xmlrpclib syntax"
 url="https://github.com/joshmarshall/jsonrpclib"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py3-${pkgname#py-}:_py3 py2-${pkgname#py-}:_py2"
diff --git a/community/py-ldap3/APKBUILD b/community/py-ldap3/APKBUILD
index b5be3bc4daaf6b2af68eb00b3ed7070ca04d4ef9..34318636f9eb43a168bd5f272f647ff4a5e60384 100644
--- a/community/py-ldap3/APKBUILD
+++ b/community/py-ldap3/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A strictly RFC 4510 conforming LDAP V3 pure Python client"
 url="https://github.com/cannatag/ldap3"
 arch="noarch"
-license="LGPL3"
+license="LGPL-3.0"
 depends="py-asn1"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-$_pkgname:_subpackage py3-$_pkgname:_subpackage"
diff --git a/community/py-libcloud/APKBUILD b/community/py-libcloud/APKBUILD
index 43d9c96fc581cbdb448533737202c7c0b62488ec..cd157fa8c2dbaa36f268e1e905ea287b2a5bc8d2 100644
--- a/community/py-libcloud/APKBUILD
+++ b/community/py-libcloud/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python library for interacting with many of the popular cloud service providers using a unified API."
 url="http://libcloud.apache.org/"
 arch="noarch"
-license="APACHE2"
+license="Apache-2.0"
 makedepends="py-setuptools python2-dev python3-dev"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
 source="$pkgname-$pkgver.tar.gz::https://github.com/apache/${pkgname/py-/}/archive/v$pkgver.tar.gz"
diff --git a/community/py-logilab-common/APKBUILD b/community/py-logilab-common/APKBUILD
index 2272c923df392091923e8cd291b4dedc41a93d20..e055ea265fe39e92faaab268965b719187a95e27 100644
--- a/community/py-logilab-common/APKBUILD
+++ b/community/py-logilab-common/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A collection of Python packages and modules used by Logilab projects"
 url="https://www.logilab.org/project/logilab-common"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/community/py-msgpack/APKBUILD b/community/py-msgpack/APKBUILD
index b954637ce84e4c60f4707aae14a6437f0dcb78fb..54a8a31431ea528a58d831df541c38dc4897ae53 100644
--- a/community/py-msgpack/APKBUILD
+++ b/community/py-msgpack/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A Python module for MessagePack serialization/deserialization"
 url="https://pypi.python.org/pypi/msgpack-python/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
diff --git a/community/py-packaging/APKBUILD b/community/py-packaging/APKBUILD
index edeaadbe6f1a01ba0d6fe4bb7a58edf5490d96dd..c70ed4c8acdf7eef1b0976f67256f50625c3cbed 100644
--- a/community/py-packaging/APKBUILD
+++ b/community/py-packaging/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Core utilities for Python packages"
 url="https://pypi.python.org/pypi/packaging"
 arch="noarch"
-license="ASL-2.0 BSD"
+license="Apache-2.0 BSD"
 depends="py-parsing py-six"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 makedepends="python3-dev python2-dev py-setuptools"
diff --git a/community/py-pygit2/APKBUILD b/community/py-pygit2/APKBUILD
index fd4b0dae822f90b2ca32c2027e53938ec53b7c4b..d59a8b5c82bc049b10fc94c74aebf9dfe6e9526c 100644
--- a/community/py-pygit2/APKBUILD
+++ b/community/py-pygit2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Python bindings for libgit2"
 url="https://github.com/libgit2/pygit2"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 _pydepends="py-cffi py-six"
 makedepends="$_pydepends python2-dev python3-dev py-setuptools
 	libgit2-dev libssh2-dev libressl-dev"
diff --git a/community/py-rencode/APKBUILD b/community/py-rencode/APKBUILD
index c3c2bbaa8a2543cc49ed83557b0688ff6023e85d..09d5dfbeedc157f894e7aa78750518fbf7024a15 100644
--- a/community/py-rencode/APKBUILD
+++ b/community/py-rencode/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="The rencode module is similar to bencode from the BitTorrent project."
 url="https://pypi.python.org/pypi/rencode"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="python2 cython"
 depends_dev=""
 makedepends="$depends_dev py-setuptools cython-dev python2-dev"
diff --git a/community/py-rtslib/APKBUILD b/community/py-rtslib/APKBUILD
index 512d63ab3777be3a534613d7a1d676d6d5f4bc0c..e6ecfc7b9fd3c779d1b92d0b0ff941be240b7958 100644
--- a/community/py-rtslib/APKBUILD
+++ b/community/py-rtslib/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="Python library that provides an object API to RisingTide Systems generic SCSI Target"
 url="https://github.com/open-iscsi/rtslib-fb"
 arch="noarch"
-license="AGPLv3"
+license="AGPL-3.0"
 depends="python2"
 makedepends="$depends_dev py-setuptools py-configobj py-ethtool py-ipaddr"
 source="https://github.com/open-iscsi/rtslib-fb/archive/v${_ver}.tar.gz"
diff --git a/community/py-sensehat/APKBUILD b/community/py-sensehat/APKBUILD
index f4871c9f1bd87355175471852af8b1d043aa30b6..86f9d2f84a158d183167c89d16d9c3dad4597edf 100644
--- a/community/py-sensehat/APKBUILD
+++ b/community/py-sensehat/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python module to control the Raspberry Pi Sense HAT"
 url="https://www.raspberrypi.org/products/sense-hat/"
 arch="armhf"
-license="BSD-3"
+license="BSD-3-Clause"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/community/py-slowaes/APKBUILD b/community/py-slowaes/APKBUILD
index 5479dfa326ad9ccf06ac292306c01efd3d4ad404..97d296ebc198efa6a1004e72c837bf20eecf188e 100644
--- a/community/py-slowaes/APKBUILD
+++ b/community/py-slowaes/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Implementation of AES in Python"
 url="http://code.google.com/p/slowaes/"
 arch="noarch"
-license="APACHE2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev py-setuptools"
 install=""
diff --git a/community/py-udev/APKBUILD b/community/py-udev/APKBUILD
index aa3bbdb91b1f6edf21366bef2daa8ae61cf347ab..e069114cd9c87a0468808a9c478d080082fbb8e9 100644
--- a/community/py-udev/APKBUILD
+++ b/community/py-udev/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Python bindings to libudev"
 url="http://pyudev.readthedocs.org"
 arch="noarch"
-license="LGPLv2.1"
+license="LGPL-2.1"
 depends="eudev py-six"
 makedepends="python2-dev python3-dev py-setuptools"
 install=""
diff --git a/community/py-watchdog/APKBUILD b/community/py-watchdog/APKBUILD
index 1debd73985c9a3da2aa10c8ddb9c2a5abcc0f13c..59d401887443583bdc1ede1ec90572106d17c303 100644
--- a/community/py-watchdog/APKBUILD
+++ b/community/py-watchdog/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Python API and shell utilities to monitor file system events."
 url="https://github.com/gorakhargosh/watchdog"
 arch="noarch"
-license="Apache 2.0"
+license="Apache-2.0"
 depends="py-pathtools py-yaml py-argh"
 depends_dev=""
 makedepends="$depends_dev py-setuptools python2-dev"
diff --git a/community/py-zipstream/APKBUILD b/community/py-zipstream/APKBUILD
index 5ae883a827be23d4c900d7838c0256728490a432..a9adbe6b7cfc5cb8a9f924686ef682cb19a46ef8 100644
--- a/community/py-zipstream/APKBUILD
+++ b/community/py-zipstream/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Like Python's ZipFile module, except it works as a generator that provides the file in many small chunks."
 url="https://github.com/allanlei/python-zipstream"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
 source="$pkgname-$pkgver.tar.gz::https://github.com/allanlei/$_pkgname/archive/v$pkgver.tar.gz"
diff --git a/community/py-zmq/APKBUILD b/community/py-zmq/APKBUILD
index 998e3ee55c2a86644153a5ee87ffccfb05818ddb..0b0ccea1172e522085250d89ed425632d8ed4a11 100644
--- a/community/py-zmq/APKBUILD
+++ b/community/py-zmq/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Python bindings for ZeroMQ"
 url="https://pypi.python.org/pypi/pyzmq"
 arch="all"
-license="LGPL3+ BSD"
+license="LGPL-3.0-or-later BSD"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools zeromq-dev"
 install=""
diff --git a/community/py-zope-component/APKBUILD b/community/py-zope-component/APKBUILD
index 186f149a26dcd63e563175dd3bc3cd1f6e599b77..3129b41bdbe65bce7f569d9d6284486171b055fc 100644
--- a/community/py-zope-component/APKBUILD
+++ b/community/py-zope-component/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Zope Component Architecture"
 url="https://pypi.python.org/pypi/zope.component"
 arch="noarch"
-license="ZPL2+"
+license="ZPL-2.1"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/community/py3-aiohttp-cors/APKBUILD b/community/py3-aiohttp-cors/APKBUILD
index c47d80b1b7a0ae5fd753cb2e27086cf45b304d5a..b4919df740bef10de09dd8ab4d6ad74e90eaf4e6 100644
--- a/community/py3-aiohttp-cors/APKBUILD
+++ b/community/py3-aiohttp-cors/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="CORS support for aiohttp"
 url="https://github.com/aio-libs/aiohttp-cors"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py3-aiohttp"
 makedepends="python3-dev"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/aio-libs/aiohttp-cors/archive/v$pkgver.tar.gz"
diff --git a/community/py3-aiohttp/APKBUILD b/community/py3-aiohttp/APKBUILD
index 536a575acf6a33fb86e1e97def12b3ed69c1adea..8915a3408ff4d39f9339c99bd8ef8a6ad8d7c552 100644
--- a/community/py3-aiohttp/APKBUILD
+++ b/community/py3-aiohttp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="HTTP client/server for asyncio"
 url="https://pypi.python.org/pypi/aiohttp"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python3 py3-async-timeout py3-chardet py3-multidict py3-yarl"
 makedepends="python3-dev"
 subpackages="$pkgname-dev"
diff --git a/community/py3-aiohttp1-cors/APKBUILD b/community/py3-aiohttp1-cors/APKBUILD
index dcd26aca1aaf436ade5e621d45d06812078e3232..6cb5af58c48090780cf0901d82fe9a08c28e079e 100644
--- a/community/py3-aiohttp1-cors/APKBUILD
+++ b/community/py3-aiohttp1-cors/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="CORS support for aiohttp - 1.x version"
 url="https://github.com/aio-libs/aiohttp-cors"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py3-aiohttp1 !py3-aiohttp-cors"
 makedepends="python3-dev"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/aio-libs/aiohttp-cors/archive/v$pkgver.tar.gz"
diff --git a/community/py3-aiohttp1/APKBUILD b/community/py3-aiohttp1/APKBUILD
index 36bea1d41928fc9e51be42303e5b83ea82440170..7c19371661109dd39fb528f94e12ad2c51e4647b 100644
--- a/community/py3-aiohttp1/APKBUILD
+++ b/community/py3-aiohttp1/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="HTTP client/server for asyncio - 1.x version"
 url="https://pypi.python.org/pypi/aiohttp"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python3 py3-async-timeout py3-chardet py3-multidict py3-yarl !py3-aiohttp"
 makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/aio-libs/aiohttp/archive/$pkgver.tar.gz
diff --git a/community/py3-async-timeout/APKBUILD b/community/py3-async-timeout/APKBUILD
index a6ccded3db3e4609ee39da3741cacc4339e22c01..d38c7dc60cceb8fb96e96affdb4b67785806a0c2 100644
--- a/community/py3-async-timeout/APKBUILD
+++ b/community/py3-async-timeout/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Timeout context manager for asyncio programs"
 url="https://pypi.python.org/pypi/async_timeout"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python3"
 makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/community/py3-multidict/APKBUILD b/community/py3-multidict/APKBUILD
index e058723bf7e5f9915f537cf9db964528834ed16e..4faa48cb44134c49b36301100a95064ef9f526c3 100644
--- a/community/py3-multidict/APKBUILD
+++ b/community/py3-multidict/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A multidict implementation"
 url="https://github.com/aio-libs/multidict/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python3"
 makedepends="python3-dev py-setuptools"
 subpackages="$pkgname-dev"
diff --git a/community/py3-qt5/APKBUILD b/community/py3-qt5/APKBUILD
index b43567d84047e78dd5883f0b4f34b468daf05763..494cdf70d64b1c0d57ced0d1c15bc8297cb05b1c 100644
--- a/community/py3-qt5/APKBUILD
+++ b/community/py3-qt5/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A set of Python 3 bindings for the Qt toolkit"
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="py3-sip"
 makedepends="python3-dev py-dbus-dev py3-sip-dev
 	qt5-qtbase-dev libx11-dev qt5-qtsvg-dev qt5-websockets-dev"
diff --git a/community/py3-yarl/APKBUILD b/community/py3-yarl/APKBUILD
index b8a497b97424de64e5a378447dd2829b494293b9..cbf89e6902d564738fcf9acc32749bc9e84534cd 100644
--- a/community/py3-yarl/APKBUILD
+++ b/community/py3-yarl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="An URL library"
 url="http://yarl.readthedocs.io/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py3-multidict py3-pytest"
 makedepends="python3-dev"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/community/qt5-qtbase/APKBUILD b/community/qt5-qtbase/APKBUILD
index d77ed81a61a9b7bfacb01b9cd4e112a6365819f0..9dd8ba274aeaa33f6f6aa626f1c8ab3009dce157 100644
--- a/community/qt5-qtbase/APKBUILD
+++ b/community/qt5-qtbase/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtBase components"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-mysql
 	$pkgname-tds $pkgname-x11"
 depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev
diff --git a/community/qt5-qtdeclarative/APKBUILD b/community/qt5-qtdeclarative/APKBUILD
index bb49ff09102fffebcf3ddb148fa9c6dac36c091f..4761cdbb5a275b7ec94873f2dd86c6eb414fa48f 100644
--- a/community/qt5-qtdeclarative/APKBUILD
+++ b/community/qt5-qtdeclarative/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtDeclarative component"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
 
diff --git a/community/qt5-qtgraphicaleffects/APKBUILD b/community/qt5-qtgraphicaleffects/APKBUILD
index ad5569eab2c041a6087c41f48242233246a87a32..20679e272062bd091fdff2d9e143a3e6e62f08a2 100644
--- a/community/qt5-qtgraphicaleffects/APKBUILD
+++ b/community/qt5-qtgraphicaleffects/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtGraphicalEffects component"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
 
 case $pkgver in
diff --git a/community/qt5-qtimageformats/APKBUILD b/community/qt5-qtimageformats/APKBUILD
index bcf63a5a652c97a69e40399d04f521bb39504d6b..988a896bfd5a3bad92ba283b0e539e7753abef0c 100644
--- a/community/qt5-qtimageformats/APKBUILD
+++ b/community/qt5-qtimageformats/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtImageFormats component"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev libmng-dev tiff-dev jasper-dev libwebp-dev"
 
 case $pkgver in
diff --git a/community/qt5-qtmultimedia/APKBUILD b/community/qt5-qtmultimedia/APKBUILD
index 6f2a74460f0f92f11ca5f6e1fd99f09f9a5b60f4..8592f57954c98ec8bfd339964428620620642cb7 100644
--- a/community/qt5-qtmultimedia/APKBUILD
+++ b/community/qt5-qtmultimedia/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Qt5 - Multimedia support"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev
 	alsa-lib-dev libxv-dev gstreamer0.10-dev gst-plugins-base0.10-dev"
 subpackages="$pkgname-dev"
diff --git a/community/qt5-qtquickcontrols/APKBUILD b/community/qt5-qtquickcontrols/APKBUILD
index e1e02c8db50a5fc44d89ae5c59aa61f363ec63c8..d85b3fbc0a00105b3279f1b2256cca02a208be51 100644
--- a/community/qt5-qtquickcontrols/APKBUILD
+++ b/community/qt5-qtquickcontrols/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Qt5 - module with set of QtQuick controls"
 url="http://qt-project.org/"
 arch="all"
-license="BSD and (LGPLv2 with exceptions or GPLv3 with exceptions) and GFDL"
+license="BSD and (LGPL-2.0 with exceptions or GPL-3.0 with exceptions) and GFDL"
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
 
 case $pkgver in
diff --git a/community/qt5-qtscript/APKBUILD b/community/qt5-qtscript/APKBUILD
index 51203042121fc2dfc404f19f8a246b666b42f499..4499077ebb61ab5c911cec3cf9edd30058fdda5b 100644
--- a/community/qt5-qtscript/APKBUILD
+++ b/community/qt5-qtscript/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtScript component"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
 
diff --git a/community/qt5-qtserialport/APKBUILD b/community/qt5-qtserialport/APKBUILD
index 73018ea90067b0c20007291cea07f96046efc83d..de4b06ff9d4370136176fe44fc221c1b7f053340 100644
--- a/community/qt5-qtserialport/APKBUILD
+++ b/community/qt5-qtserialport/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtSerialPort module"
 url="http://wiki.qt.io/QtSerialPort"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev eudev-dev"
 subpackages="$pkgname-dev"
 
diff --git a/community/qt5-qtsvg/APKBUILD b/community/qt5-qtsvg/APKBUILD
index 4247fba80ec4c7ccba2c5619527fcd241ad8c5ad..6c6147e692fc33f02c99da6f370744ce1b684c68 100644
--- a/community/qt5-qtsvg/APKBUILD
+++ b/community/qt5-qtsvg/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Qt5 - Support for rendering and displaying SVG"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev zlib-dev"
 subpackages="$pkgname-dev"
 
diff --git a/community/qt5-qttools/APKBUILD b/community/qt5-qttools/APKBUILD
index cf5433699c6083d1b28679ca7d886f57ca8a6448..e449795ba23b43ccf91f234b638e5ae22e056b91 100644
--- a/community/qt5-qttools/APKBUILD
+++ b/community/qt5-qttools/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtTool components"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev qt5-assistant:_assistant qt5-qdbusviewer:_dbusviewer"
 
diff --git a/community/qt5-qttranslations/APKBUILD b/community/qt5-qttranslations/APKBUILD
index 2ad852e266b55763429cc71b40446812f8d268cd..791ce0c0e0ff79cde23697723e226b14018bc7f2 100644
--- a/community/qt5-qttranslations/APKBUILD
+++ b/community/qt5-qttranslations/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtTranslations module"
 url="http://qt-project.org/"
 arch="noarch"
-license="LGPLv2 with exceptions or GPLv3 with exceptions and GFDL"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions and GFDL"
 makedepends="qt5-qttools-dev"
 
 case $pkgver in
diff --git a/community/qt5-qtwebkit/APKBUILD b/community/qt5-qtwebkit/APKBUILD
index 765e09053e981079d9c69dff6a36f00648f7b6a4..6c6324f8cfb197cae7909de29a8347aeba56a54f 100644
--- a/community/qt5-qtwebkit/APKBUILD
+++ b/community/qt5-qtwebkit/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Qt5 - QtWebKit components"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 depends=""
 depends_dev="qt5-qtdeclarative-dev gstreamer-dev gst-plugins-base-dev
 	libxslt-dev mesa-dev icu-dev libxext-dev glib-dev libxcomposite-dev
diff --git a/community/qt5-qtxmlpatterns/APKBUILD b/community/qt5-qtxmlpatterns/APKBUILD
index 74952a34cc5b37ae1635c546c1b16b6f840029b9..5d2b96f870f39acd425226b9bc92cc339b313ea9 100644
--- a/community/qt5-qtxmlpatterns/APKBUILD
+++ b/community/qt5-qtxmlpatterns/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Qt5 - QtXmlPatterns component"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
 
diff --git a/community/qt5-websockets/APKBUILD b/community/qt5-websockets/APKBUILD
index 91588433cde7eee801518df9f4af10da6d672dd3..3e470a55da5aace5c1fa7ac6c772455d769972b8 100644
--- a/community/qt5-websockets/APKBUILD
+++ b/community/qt5-websockets/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Provides WebSocket communication compliant with RFC 6455"
 url="http://qt-project.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
 
diff --git a/community/qt5-x11extras/APKBUILD b/community/qt5-x11extras/APKBUILD
index ab0b6aa120359b23667cba82cbcd5377b836bd16..9b930125ad1deeb81c83a4f121af17e60298fb44 100644
--- a/community/qt5-x11extras/APKBUILD
+++ b/community/qt5-x11extras/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Provides platform-specific APIs for X11"
 url="http://qt-project.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
 
diff --git a/community/racktables/APKBUILD b/community/racktables/APKBUILD
index b39541308ee345b7c8cae96f40173c500f56151c..63d06e0e9ebd001e7795ac8619e219d453e80bdc 100644
--- a/community/racktables/APKBUILD
+++ b/community/racktables/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Server room asset management"
 url="http://racktables.org"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 _php=php5
 depends="$_php ${_php}-bcmath ${_php}-gd ${_php}-mysql ${_php}-pdo_mysql
 	${_php}-json"
diff --git a/community/rawtherapee/APKBUILD b/community/rawtherapee/APKBUILD
index 9fac4937bd345da1f216ec9afec4c3548d9c6aa2..88ac4b59f449cb522e02ec7c6466e1de069a3129 100644
--- a/community/rawtherapee/APKBUILD
+++ b/community/rawtherapee/APKBUILD
@@ -7,7 +7,7 @@ _gtkver=2
 pkgdesc="RawTherapee is image processing software simular to Lightroom or Aperture"
 url="http://rawtherapee.com"
 arch="x86 x86_64 ppc64le"
-license="GPL3"
+license="GPL-3.0"
 makedepends="bzip2-dev exiv2-dev expat-dev fftw-dev glib-dev gtk+2.0-dev \
              gtk-engines-dev gtkmm-dev lcms2-dev libcanberra-dev \
              libpng-dev libsigc++-dev tiff-dev zlib-dev cmake mercurial \
diff --git a/community/rdfind/APKBUILD b/community/rdfind/APKBUILD
index f6b0e6c85362332a0c8471427a6d5f5d48ad4592..cb2024352d79193518e811ef0d926ef881ec25d9 100644
--- a/community/rdfind/APKBUILD
+++ b/community/rdfind/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Redundant data find - a program that finds duplicate files"
 url="http://rdfind.pauldreik.se"
 arch="all"
-license="GPL2 "
+license="GPL-2.0 "
 makedepends="nettle-dev"
 subpackages="$pkgname-doc"
 source="https://rdfind.pauldreik.se/$pkgname-$pkgver.tar.gz"
diff --git a/community/recon-ng/APKBUILD b/community/recon-ng/APKBUILD
index 95f08f8868dbbef171fe9b43dc255c2d859e834b..5b867ebc123dc942eb540621f82cbc7e93aee0af 100644
--- a/community/recon-ng/APKBUILD
+++ b/community/recon-ng/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Full-featured Web Reconnaissance framework written in Python"
 url="https://bitbucket.org/LaNMaSteR53/recon-ng"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="python2 py-dicttoxml py-dnspython py-jsonrpclib py-lxml
 py-mechanize py-slowaes py-xlsxwriter py-olefile py-pypdf2"
 depends_dev=""
diff --git a/community/redshift/APKBUILD b/community/redshift/APKBUILD
index c8fbdf089cb751613a705da0f42228ba2f3441eb..65dde4f57c90dd6edd6aad643039b67eee3c2872 100644
--- a/community/redshift/APKBUILD
+++ b/community/redshift/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Adjusts the color temperature of your screen according to your surroundings"
 url="http://jonls.dk/redshift/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="libxcb-dev libxxf86vm-dev libdrm-dev intltool"
diff --git a/community/remind/APKBUILD b/community/remind/APKBUILD
index 969985b3e264aac3c4b5a7c1e06edb5e89be6269..c9f45927a1f98cd8a3e9a290352fef4338693854 100644
--- a/community/remind/APKBUILD
+++ b/community/remind/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sophisticated calendar and alarm program"
 url="https://www.roaringpenguin.com/products/remind"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 subpackages="$pkgname-doc tkremind::noarch"
 source="https://www.roaringpenguin.com/files/download/$pkgname-$_pkgver.tar.gz"
diff --git a/community/repmgr/APKBUILD b/community/repmgr/APKBUILD
index 703486254d9683c1b323e951fa8b83bc735b233d..3a5e139a1015a360e76b5c62b572543324fe0931 100644
--- a/community/repmgr/APKBUILD
+++ b/community/repmgr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Replication Manager for PostgreSQL"
 url="http://www.repmgr.org/"
 arch="all"
-license="GPL-3"
+license="GPL-3.0"
 depends="postgresql-client"
 makedepends="postgresql-dev"
 pkgusers="postgres"
diff --git a/community/retawq/APKBUILD b/community/retawq/APKBUILD
index 200c4424abe5bb8a34e77ab1f268ac08effc905f..3d91fcb3a68c405a8d334e0c4eea4bf2f38bf2b9 100644
--- a/community/retawq/APKBUILD
+++ b/community/retawq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="retawq is an interactive, multi-threaded network client for text terminals"
 url="http://retawq.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev ncurses-dev libressl-dev"
diff --git a/community/rethinkdb/APKBUILD b/community/rethinkdb/APKBUILD
index b175afcc6fe06cc178bdc2c1ad60996dfead39a4..4c5ec3a9aa5a68eea57ac092151d4373244ceea5 100644
--- a/community/rethinkdb/APKBUILD
+++ b/community/rethinkdb/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="Distributed powerful and scalable NoSQL database"
 url="http://www.rethinkdb.com"
 arch="x86_64 ppc64le s390x"
-license="ASL 2.0"
+license="Apache-2.0"
 options="!check" # needs coffeescript
 makedepends="bash python2 linux-headers bsd-compat-headers m4 paxmark
 	protobuf-dev icu-dev libressl-dev curl-dev boost-dev libexecinfo-dev
diff --git a/community/rng-tools/APKBUILD b/community/rng-tools/APKBUILD
index 42f9153266c9ae92aef686e39d9ee1d0fb78fa88..3a4c75a18d8d0f6e7cc6a1429e6620189eafc865 100644
--- a/community/rng-tools/APKBUILD
+++ b/community/rng-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="a random number generator daemon"
 url="https://sourceforge.net/projects/gkernel/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="argp-standalone linux-headers"
diff --git a/community/roundcubemail/APKBUILD b/community/roundcubemail/APKBUILD
index 1e3e064e896e0dcbffef9ec67a983c6d7f81b821..ce9ce96f5f9e7dcd16e870484bcb31a220f5d84a 100644
--- a/community/roundcubemail/APKBUILD
+++ b/community/roundcubemail/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A PHP web-based mail client"
 url="http://www.roundcube.net"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 install="$pkgname.post-upgrade"
 depends="${_php} ${_php}-imap ${_php}-xml ${_php}-json ${_php}-dom
 	${_php}-exif ${_php}-pear-net_idna2 ${_php}-pear-mail_mime
diff --git a/community/rover/APKBUILD b/community/rover/APKBUILD
index 5f47c8c29836396c1f3b655bd9353995136640c5..4c1ad1c57b0e7ca1e12392945a45a75b9b4b81f0 100644
--- a/community/rover/APKBUILD
+++ b/community/rover/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Rover is a small file browser that aims to be simple, fast and portable"
 url="http://lecram.github.io/p/rover/"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 makedepends="ncurses-dev ncurses5-widec-libs"
 subpackages="$pkgname-doc"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/lecram/rover/archive/v${pkgver}.tar.gz"
diff --git a/community/rpm/APKBUILD b/community/rpm/APKBUILD
index 376208a6b2c37be4de4562fad00780e0ddd8ad6f..ced97ddaa3b59e9c2113d289572d8de43443477f 100644
--- a/community/rpm/APKBUILD
+++ b/community/rpm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The RPM package manager"
 url="http://www.rpm.org/"
 arch="all"
-license="GPL2 LGPL2+"
+license="GPL-2.0 LGPL-2.0-or-later"
 depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev
 		libelf-dev file-dev popt-dev libcap-dev acl-dev libarchive-dev
 		binutils-dev"
diff --git a/community/rsound/APKBUILD b/community/rsound/APKBUILD
index 38caffdab6d5fbd4b9392c49793175f0d66346d1..1d4b7086b6d24d90aa3b7ede2018fbe3d31f7fcc 100644
--- a/community/rsound/APKBUILD
+++ b/community/rsound/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=4
 pkgdesc="A multi-platform, simple PCM audio server and client"
 url="https://github.com/Themaister/RSound"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 depends=""
 depends_dev="alsa-lib-dev libsamplerate-dev portaudio-dev libao-dev jack-dev"
 makedepends="$depends_dev"
diff --git a/community/rt4/APKBUILD b/community/rt4/APKBUILD
index d7111adf63e5c317b6b38f784ae4383ce10ed9c7..b464dfa4cb16b9fd675f1b4e431697e11f35c70e 100644
--- a/community/rt4/APKBUILD
+++ b/community/rt4/APKBUILD
@@ -9,7 +9,7 @@ pkgusers="rt4"
 pkggroups="rt4"
 url="https://bestpractical.squarespace.com/request-tracker"
 arch="noarch"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="perl
 	perl-term-readkey
 	perl-cache-simple-timedexpiry
diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD
index 0cab13579e78009c1f5361d86257c731b01264a9..6c4f8717f5b7a87c223254da90f9e4a4bd2d6a4e 100644
--- a/community/rust/APKBUILD
+++ b/community/rust/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="The Rust Programming Language (compiler)"
 url="http://www.rust-lang.org"
 arch="x86_64"
-license="ASL-2.0 BSD ISC MIT"
+license="Apache-2.0 BSD ISC MIT"
 
 # gcc is needed at runtime just for linking. Someday rustc might invoke
 # the linker directly, and then we'll only need binutils.
diff --git a/community/safekeep/APKBUILD b/community/safekeep/APKBUILD
index 9fa85b5b8a37162d1a14b44b41b1a7d6f3644788..daa629d61cfbe483e3cb622eff54e1de68c4811d 100644
--- a/community/safekeep/APKBUILD
+++ b/community/safekeep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="SafeKeep backup system"
 url="https://github.com/dimipaun/safekeep"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="openssh-client python2 rdiff-backup util-linux"
 makedepends="asciidoc libxml2-utils xmlto"
 install="$pkgname-server.post-install"
diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD
index 0a835586219f41f59be838b973a9180cfac8a892..4600282083b3838518c87c64f2ff9f7c6a1b0d25 100644
--- a/community/salt/APKBUILD
+++ b/community/salt/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A parallel remote execution system"
 url="https://github.com/saltstack/salt"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="py2-tornado py2-yaml py2-jinja2 py2-markupsafe py2-msgpack py2-crypto py2-zmq
 	py2-six py2-requests py2-futures py2-pygit2 py2-dateutil procps"
 makedepends="python2-dev py2-libcloud"
diff --git a/community/scapy/APKBUILD b/community/scapy/APKBUILD
index 5959adf626b3ede2d08f60f60eeb58f19719a326..1eb9b46c12c3535ba51103a6e9c56323bd94ccaf 100644
--- a/community/scapy/APKBUILD
+++ b/community/scapy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Powerful interactive packet manipulation"
 url="http://www.secdev.org/projects/scapy/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 makedepends="python2-dev"
 install="$pkgname.post-install"
diff --git a/community/setconf/APKBUILD b/community/setconf/APKBUILD
index b8907920fc21016c42d5653ee7cd6f56fea22e42..86299b51cbea839e62523848559bd7f680d41a4b 100644
--- a/community/setconf/APKBUILD
+++ b/community/setconf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Utility for easily changing settings in configuration files"
 url="http://setconf.roboticoverlords.org/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python3"
 subpackages="$pkgname-doc"
 source="http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz"
diff --git a/community/shotwell/APKBUILD b/community/shotwell/APKBUILD
index 8267441ca619a41333c04d4dc0f02a67c4c3ff7a..dce3a65050aa52ba463ecd8227be78f606b209a0 100644
--- a/community/shotwell/APKBUILD
+++ b/community/shotwell/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 url="https://wiki.gnome.org/Apps/Shotwell"
 arch="x86 x86_64 ppc64le"
-license="LGPL2.1"
+license="LGPL-2.1"
 install="shotwell.post-upgrade shotwell.post-install shotwell.pre-deinstall"
 subpackages="$pkgname-lang $pkgname-doc"
 makedepends="intltool vala libgee-dev libunique3-dev webkit2gtk-dev libexif-dev
diff --git a/community/sigar/APKBUILD b/community/sigar/APKBUILD
index 207d793b8b584c0c7839f60bf3f773bc011a8468..2fd6d57f867135af9b5c7072f76282a0d0a6a17d 100644
--- a/community/sigar/APKBUILD
+++ b/community/sigar/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="System Information Gatherer And Reporter"
 url="http://sigar.hyperic.com/"
 arch="x86_64 x86 ppc64le"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libtirpc-dev perl apache-ant openjdk8"
diff --git a/community/soundtouch/APKBUILD b/community/soundtouch/APKBUILD
index b581fd57af4b61ed9fd3d59c4814691ddbbb26af..ebc83aa8017de3b5e7ece6b6cd75a398de9aabeb 100644
--- a/community/soundtouch/APKBUILD
+++ b/community/soundtouch/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Audio Processing library for changing Tempo, Pitch and Playback Rates"
 url="http://www.surina.net/soundtouch/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev autoconf automake libtool"
diff --git a/community/spacefm/APKBUILD b/community/spacefm/APKBUILD
index 8318313565a2a644acde41fd5254770ea2b954ef..7aff63dbb009600ae5972b2c23ae99045bf6ee64 100644
--- a/community/spacefm/APKBUILD
+++ b/community/spacefm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Multi-panel tabbed file manager (GTK2 version)"
 arch=all
 url="http://ignorantguru.github.com/spacefm/"
-license="GPL3"
+license="GPL-3.0"
 depends="bash"
 makedepends="intltool gettext-dev gtk+2.0-dev gtk+3.0-dev eudev-dev ffmpegthumbnailer-dev linux-headers"
 subpackages="$pkgname-lang $pkgname-doc $pkgname-gtk3 $pkgname-gtk3-lang:lang3:noarch $pkgname-gtk3-doc:doc3:noarch"
diff --git a/community/sphinx/APKBUILD b/community/sphinx/APKBUILD
index b09022d0c88f38472bd254c6b814bee8914670c9..b50732aab5fa4bae737ae52939ffd14a324ba2af 100644
--- a/community/sphinx/APKBUILD
+++ b/community/sphinx/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Free open-source SQL full-text search engine"
 url="http://www.sphinxsearch.com"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev postgresql-dev mariadb-dev unixodbc-dev expat-dev
diff --git a/community/sslstrip/APKBUILD b/community/sslstrip/APKBUILD
index 9ebe0a59265ed1067a671e0aab295054f2f34807..cbfafc1c94dcf206dfdc4907719710a6c877aed9 100644
--- a/community/sslstrip/APKBUILD
+++ b/community/sslstrip/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Python tool to hijack HTTPS connections during a MITM attack"
 url="http://www.thoughtcrime.org/software/sslstrip/"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="py2-openssl py-twisted py2-six py-enum34 py2-cffi
 	py2-service_identity py2-cryptography"
 makedepends="python2-dev"
diff --git a/community/stow/APKBUILD b/community/stow/APKBUILD
index 289a1c78e35b703584d386def382cbd2a9468c2c..58fb84cb7f3e5b7c0dafd49e4bce1cfc6588220c 100644
--- a/community/stow/APKBUILD
+++ b/community/stow/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Manage installation of multiple softwares in the same directory tree"
 url="https://www.gnu.org/software/stow/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl"
 makedepends="perl-test-output"
 subpackages="$pkgname-doc"
diff --git a/community/stunnel/APKBUILD b/community/stunnel/APKBUILD
index 5420501ccf2ee9a40d94c8dc6d440d0fa3e19dfb..e04752630d12c8c88e69dd18fc0fd7808774b1b4 100644
--- a/community/stunnel/APKBUILD
+++ b/community/stunnel/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="SSL encryption wrapper between network client and server."
 url="http://www.stunnel.org/"
 arch="all"
-license="GPL2+ with OpenSSL exception"
+license="GPL-2.0-or-later with OpenSSL exception"
 makedepends="libressl-dev"
 subpackages="$pkgname-doc"
 install="$pkgname.pre-install"
diff --git a/community/suricata/APKBUILD b/community/suricata/APKBUILD
index 75bf57b06115ee4572cb6307d71afcb88f7e1561..382b7b2ee5c0d84436614d75319f9805d2891a82 100644
--- a/community/suricata/APKBUILD
+++ b/community/suricata/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="High performance Network IDS, IPS and Network Security Monitoring engin
 url="https://suricata-ids.org/"
 # luajit is not available for disabled arches
 arch="all !s390x"
-license="GPL-2"
+license="GPL-2.0"
 makedepends="automake autoconf libtool libhtp-dev>=0.5.25 libcap-ng-dev
 	file-dev luajit-dev geoip-dev pcre-dev yaml-dev libpcap-dev hiredis-dev
 	libnet-dev libnetfilter_queue-dev libnfnetlink-dev jansson-dev python2
diff --git a/community/sxiv/APKBUILD b/community/sxiv/APKBUILD
index 1d1756a735d6e7fffc6f1ba37c12560a0d0aac1f..eaf059700ce7c104d607179ca327211014177993 100644
--- a/community/sxiv/APKBUILD
+++ b/community/sxiv/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Simple X Image Viewer"
 url="https://github.com/muennich/sxiv"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="imlib2-dev giflib-dev libexif-dev libxft-dev"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
diff --git a/community/syncthing/APKBUILD b/community/syncthing/APKBUILD
index 7f98dcda0fd2424eb33e2160c3b4130ef6e60436..625bbf82fcd8c51067a511bf94580564715b477d 100644
--- a/community/syncthing/APKBUILD
+++ b/community/syncthing/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Open Source Continuous File Synchronization"
 url="https://syncthing.net/"
 arch="all !armhf"
-license="MPLv2"
+license="MPL-2.0"
 pkgusers="$pkgname"
 pkggroups="$pkgname"
 makedepends="go"
diff --git a/community/syncthing13/APKBUILD b/community/syncthing13/APKBUILD
index fb32c5dd1601f3ba6b3b2a4417e1655a8560d344..3e7c7a10800fa3b91a5c75bce302c62e4d506a52 100644
--- a/community/syncthing13/APKBUILD
+++ b/community/syncthing13/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc="Open Source Continuous File Synchronization"
 url="https://syncthing.net/"
 arch="all"
-license="MPLv2"
+license="MPL-2.0"
 pkgusers="$_realname"
 pkggroups="$_realname"
 makedepends="go"
diff --git a/community/syslog-summary/APKBUILD b/community/syslog-summary/APKBUILD
index 46057cfae6d12049f56b53f2df3acec1bf1a8338..e36bd645ce2329ac9b096466dcc4a30a4b97e139 100644
--- a/community/syslog-summary/APKBUILD
+++ b/community/syslog-summary/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Summarize the contents of a syslog log file / useful with logcheck"
 url="https://github.com/dpaleino/syslog-summary"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="py2-magic"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/dpaleino/$pkgname/archive/$pkgver.tar.gz
diff --git a/community/targetcli/APKBUILD b/community/targetcli/APKBUILD
index f0882b88a5ee12008f7850e02b42995ebd514baf..f1ef89b378e8bb46f24b4f1b598a5d0423bcabe9 100644
--- a/community/targetcli/APKBUILD
+++ b/community/targetcli/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="An administration shell for storage targets"
 url="https://github.com/open-iscsi/targetcli-fb"
 arch="noarch"
-license="AGPLv3"
+license="AGPL-3.0"
 depends="python2 py-configobj py-configshell py-ethtool py-ipaddr py-parsing
 	py-rtslib py-simpleparse py-six py-udev py-dbus dbus py-urwid"
 makedepends="$depends_dev py-setuptools"
diff --git a/community/terminator/APKBUILD b/community/terminator/APKBUILD
index 9cbed9e26411a98c6c45a80955117aba0a6796f2..708e3db14e900c1b0b43b77a51df8557ba1d8497 100644
--- a/community/terminator/APKBUILD
+++ b/community/terminator/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Terminal emulator that supports tabs and grids"
 url="https://gnometerminator.blogspot.fr/p/introduction.html"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2 py-gtk xdg-utils vte3 dbus-glib gettext intltool keybinder3
 	gconf gsettings-desktop-schemas py2-gobject3 py2-cairo py-dbus py-psutil"
 makedepends="python2-dev"
diff --git a/community/terraform/APKBUILD b/community/terraform/APKBUILD
index b143c2ffa5950fb309e16afb04ab030323ccd72c..ecb185c0b05dba95a5270d3d2da80bfb681ab398 100644
--- a/community/terraform/APKBUILD
+++ b/community/terraform/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Building, changing, and combining infrastructure safely and efficiently"
 url="https://www.terraform.io/"
 arch="all !armhf"
-license="MPL 2.0"
+license="MPL-2.0"
 makedepends="go"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/hashicorp/terraform/archive/v$pkgver.tar.gz"
 builddir="$srcdir/src/github.com/hashicorp/$pkgname"
diff --git a/community/tg/APKBUILD b/community/tg/APKBUILD
index 4589655b9d978f2ffdc65fd5351fc1764a4def01..4a3c6fb4fc11dfc8c3179571493fefb56b1d45c7 100644
--- a/community/tg/APKBUILD
+++ b/community/tg/APKBUILD
@@ -8,7 +8,7 @@ tlparserver=0_git20151118
 pkgdesc="Command line Telegram client"
 url="https://github.com/vysheng/tg"
 arch="all !s390x"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev="readline-dev libressl-dev libconfig-dev libevent-dev jansson-dev lua5.2-dev"
 makedepends="$depends_dev zlib-dev grep"
diff --git a/community/tinc-pre/APKBUILD b/community/tinc-pre/APKBUILD
index 858531fa1f0f8d6a0209a4ae31f35728f4217664..9a2585a74e1f279d7e6c3015f3cc25a22a176de8 100644
--- a/community/tinc-pre/APKBUILD
+++ b/community/tinc-pre/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Virtual Private Network (VPN) daemon (pre-release)"
 url="http://tinc-vpn.org/"
 # tests hangs on s390x and fails in lxc on ppc64le
 arch="all !s390x !ppc64le"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers ncurses-dev readline-dev
 	zlib-dev lzo-dev libressl-dev texinfo
diff --git a/community/tint2/APKBUILD b/community/tint2/APKBUILD
index 4b83c582ab82e4124dc8864756b0e310dfde09a0..b5624d89350842af2e86b61f47d93f1295bf82f8 100644
--- a/community/tint2/APKBUILD
+++ b/community/tint2/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="tint2 is a simple unintrusive panel/taskbar"
 url="https://gitlab.com/o9000/tint2"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 depends="imlib2 glib pango cairo libxcomposite libxdamage
 	libxinerama libxrandr gtk+"
diff --git a/community/tinyssh/APKBUILD b/community/tinyssh/APKBUILD
index 12432672de1f51f31fd770b3eba8d76f188d64a9..3d3fe045b0ec1b3f17c4351c59e8187297fd943b 100644
--- a/community/tinyssh/APKBUILD
+++ b/community/tinyssh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Small SSH server using NaCl / TweetNaCl (no dependency on OpenSSL)"
 url="https://tinyssh.org/"
 arch="all"
-license="CC0 1.0"
+license="CC0-1.0"
 makedepends="libsodium-dev"
 options="!check"
 subpackages="$pkgname-doc"
diff --git a/community/tomahawk/APKBUILD b/community/tomahawk/APKBUILD
index 027390ff5d6ea77c4b678df8520c5708eab17b52..402593470602f450837a93145848fe9fb29fc06d 100644
--- a/community/tomahawk/APKBUILD
+++ b/community/tomahawk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=8
 pkgdesc="A Music Player App written in C++/Qt"
 url="http://tomahawk-player.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 options="!check" #upstream does not provide check
 depends="phonon-backend-gstreamer qt-sqlite"
 makedepends="cmake sparsehash websocket++ automoc4 
diff --git a/community/tomcat-native/APKBUILD b/community/tomcat-native/APKBUILD
index 5824ca700bbded182ccbaef1dc5a30e91a69cabb..7f14711824be38672950272b860976ab0bed12db 100644
--- a/community/tomcat-native/APKBUILD
+++ b/community/tomcat-native/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Native resources optional component for Apache Tomcat"
 url="http://tomcat.apache.org/native-doc/"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 makedepends="apr-dev chrpath openjdk8 openssl-dev"
 subpackages="$pkgname-dev"
diff --git a/community/torsocks/APKBUILD b/community/torsocks/APKBUILD
index 941a61a0a4a30d8e8f5e9215c241562ec6ab31b2..16222bd3069ec3379411943b4c8c0b282958c353 100644
--- a/community/torsocks/APKBUILD
+++ b/community/torsocks/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Wrapper to safely torify applications"
 url="https://gitweb.torproject.org/torsocks.git"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="tor"
 makedepends="$depends_dev autoconf automake libtool"
 subpackages="$pkgname-doc"
diff --git a/community/tpm/APKBUILD b/community/tpm/APKBUILD
index 4f02e9a9e7e1cbd7f0989d9a7942df9cc80a3a93..c3bdb4d0f9e1bef8ef4ea05164450f6323170013 100644
--- a/community/tpm/APKBUILD
+++ b/community/tpm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A tiny password manager"
 url="https://github.com/nmeum/$pkgname"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="gnupg"
 makedepends="perl"
 install=""
diff --git a/community/tvheadend/APKBUILD b/community/tvheadend/APKBUILD
index e57cf467e58f057b6bc51ad6ee5efae398114033..d04c36e56a11d4f9768123f9aa78fdfcc155e038 100644
--- a/community/tvheadend/APKBUILD
+++ b/community/tvheadend/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="TV Streaming server for linux"
 url="http://tvheadend.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev findutils bash git python2 linux-headers
diff --git a/community/ubridge/APKBUILD b/community/ubridge/APKBUILD
index c2c69ccd641ee4c89b070fe4b876a99fdea1c165..5a878d63a7df9fe7a6ed43e61030c3525e61c043 100644
--- a/community/ubridge/APKBUILD
+++ b/community/ubridge/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces."
 url="https://github.com/GNS3/ubridge"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="libpcap-dev linux-headers"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/GNS3/$pkgname/archive/v$pkgver.tar.gz
diff --git a/community/ucl/APKBUILD b/community/ucl/APKBUILD
index b9e73b9ae0a01207ccd856821991829c3f9fdbbe..cb7374889a61fc32989818699c88633753ebd566 100644
--- a/community/ucl/APKBUILD
+++ b/community/ucl/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Portable lossless data compression library written in ANSI C"
 url="http://www.oberhumer.com/opensource/ucl/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="file"
 subpackages="$pkgname-dev"
 source="http://www.oberhumer.com/opensource/$pkgname/download/$pkgname-$pkgver.tar.gz
diff --git a/community/ucspi-tcp6/APKBUILD b/community/ucspi-tcp6/APKBUILD
index 817ba15fa3e588b6f9a4dad2c8c3a4f0494721cf..6faa5e21d20f95e8a2b1974186db1580976d7c6a 100644
--- a/community/ucspi-tcp6/APKBUILD
+++ b/community/ucspi-tcp6/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="IPv6 enabled ucspi-tcp superserver"
 url="http://www.fehcom.de/ipnet/ucspi-tcp6.html"
 arch="all"
-license="public-domain"
+license="Public-Domain"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/community/udevil/APKBUILD b/community/udevil/APKBUILD
index 159b0d7a3e759a3629fd2d320b2e63c94b3c410a..6bf1fd4572245cf30916e644029bae259c402e5c 100644
--- a/community/udevil/APKBUILD
+++ b/community/udevil/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Mount / unmount removable devices without a password (udisks alternative)"
 url="http://ignorantguru.github.io/udevil"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="$depends_dev glib-dev eudev-dev intltool"
 install="$pkgname.pre-install"
 subpackages="$pkgname-lang $pkgname-doc"
diff --git a/community/uhttpmock/APKBUILD b/community/uhttpmock/APKBUILD
index 2137ab735893c5c1c60fadd36272dacb9a134fe1..84c306dc08acc98468b13233b1c36bf69dca4a1a 100644
--- a/community/uhttpmock/APKBUILD
+++ b/community/uhttpmock/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="HTTP web service mocking library"
 url="http://gitorious.org/uhttpmock/"
 arch="all"
-license="LGPLv2"
+license="LGPL-2.0"
 depends=""
 makedepends="glib-dev libsoup-dev"
 install=""
diff --git a/community/uncrustify/APKBUILD b/community/uncrustify/APKBUILD
index f221a6221b474759a59430fafc0d35f16c975934..c64f8cc8f2a42b97d2dacde34113a447086171c2 100644
--- a/community/uncrustify/APKBUILD
+++ b/community/uncrustify/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A source code beautifier"
 url="https://github.com/uncrustify/uncrustify"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="cmake python2"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/community/unibilium/APKBUILD b/community/unibilium/APKBUILD
index 69304e01736d31f9652c8dd3823bb42b9c6a110a..06dbaefe5c4d3b4e1b86a0d494cc670f5abdd6d0 100644
--- a/community/unibilium/APKBUILD
+++ b/community/unibilium/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A terminfo parsing library"
 url="https://github.com/mauke/unibilium/"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 depends_dev="libtool"
 makedepends="$depends_dev"
 checkdepends="perl-dev"
diff --git a/community/upx/APKBUILD b/community/upx/APKBUILD
index 72f44244019711a186850a128f46486e72586c00..c112e2e514b93b6214f69494895a3f79d52b9ef5 100644
--- a/community/upx/APKBUILD
+++ b/community/upx/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The Ultimate Packer for eXecutables"
 url="https://upx.github.io"
 arch="all"
-license="GPL2 public-domain"
+license="GPL-2.0 Public-Domain"
 # perl-dev is used to generate man pages
 makedepends="bash perl-dev ucl-dev zlib-dev"
 subpackages="$pkgname-doc"
diff --git a/community/vino/APKBUILD b/community/vino/APKBUILD
index f24916610e7f59431e0d60e25213d14f8fa658e3..69403cbab3c13f77313f0912bceb1b2387413961 100644
--- a/community/vino/APKBUILD
+++ b/community/vino/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The GNOME desktop sharing server"
 url="https://wiki.gnome.org/Projects/Vino"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 makedepends="$depends_dev libsoup-dev glib-dev gtk+3.0-dev libnotify-dev
 	libsm-dev bsd-compat-headers"
 subpackages="$pkgname-lang"
diff --git a/community/virt-manager/APKBUILD b/community/virt-manager/APKBUILD
index 80f6b8a1f53b6e8c575cc6cbdb34fe749410d876..00132c34803d212a9d9f61dc31346a0055bbff72 100644
--- a/community/virt-manager/APKBUILD
+++ b/community/virt-manager/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="GUI for managing virtual machines"
 url="http://virt-manager.org/"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 _py=py2
 depends="python2 gtk+3.0 vte3 $_py-libxml2 $pkgname-common
 	spice-gtk gtk-vnc>=0.5.2-r2 libosinfo
diff --git a/community/virtualbricks/APKBUILD b/community/virtualbricks/APKBUILD
index 90119e42d521f25ffc8029fdeb779f1029c43b50..19b35b02c26e0f41f4b914ec375906d2b63f3f57 100644
--- a/community/virtualbricks/APKBUILD
+++ b/community/virtualbricks/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A GTK frontend for VDE and QEMU/KVM"
 url="https://launchpad.net/virtualbrick"
 arch="noarch"
-license="GPL v2"
+license="GPL-2.0"
 depends="python2 py-zope-interface py-twisted py-gtk py-imaging py-pygraphviz"
 depends_dev=""
 makedepends="python2-dev gettext"
diff --git a/community/vlc/APKBUILD b/community/vlc/APKBUILD
index 1c71bbc2eb918be398ec5a37aa578905e310144e..11612c8815dfe7d61cb20b80691495dc50867292 100644
--- a/community/vlc/APKBUILD
+++ b/community/vlc/APKBUILD
@@ -12,7 +12,7 @@ pkgusers="vlc"
 pkggroups="vlc"
 url="https://www.videolan.org/vlc/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 options="!checkroot"
 subpackages="$pkgname-dev
 	$pkgname-doc
diff --git a/community/volatility/APKBUILD b/community/volatility/APKBUILD
index d5dfa90b9653d71508f6ab7faf1e6856edecc0d5..a1263b0f0fa385835d7d0a1e6a035a56f911c84e 100644
--- a/community/volatility/APKBUILD
+++ b/community/volatility/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Volatile memory forensics toolkit"
 url="http://volatilityfoundation.org/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="py-crypto"
 makedepends="py-setuptools"
 source="https://github.com/volatilityfoundation/$pkgname/archive/$pkgver.zip"
diff --git a/community/volumeicon/APKBUILD b/community/volumeicon/APKBUILD
index 15163466d2e5198834b7bee3b51fd5c1f1ff18ab..089b5362d8fcd22bafe8818dba1d2b9112516098 100644
--- a/community/volumeicon/APKBUILD
+++ b/community/volumeicon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Volume Icon is a lightweight volume control that sits in your systray"
 url="http://softwarebakery.com/maato/volumeicon.html"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="gtk+3.0-dev intltool alsa-lib-dev libnotify-dev"
diff --git a/community/vorbis-tools/APKBUILD b/community/vorbis-tools/APKBUILD
index 9cd07c5bbcae36773612ffdfc8afa8e034240e66..8a4d4b9ed4d5fdffadb07bd9fe15ee43cf1e1e17 100644
--- a/community/vorbis-tools/APKBUILD
+++ b/community/vorbis-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Extra tools for Ogg-Vorbis"
 url="https://www.xiph.org/vorbis/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="curl-dev flac-dev libvorbis-dev libao-dev speex-dev"
 install=""
diff --git a/community/vte3/APKBUILD b/community/vte3/APKBUILD
index 6e80b30c243eea89dc3075dc25da7b4053b917b0..a9f5693834431b16cceb0ca92f350b79da2a45c0 100644
--- a/community/vte3/APKBUILD
+++ b/community/vte3/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Virtual Terminal Emulator library"
 url="https://developer.gnome.org/vte/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 makedepends="pango-dev gtk+3.0-dev intltool python2-dev 
 	ncurses-dev gobject-introspection-dev vala gnutls-dev 
diff --git a/community/wavemon/APKBUILD b/community/wavemon/APKBUILD
index 2217063772db60a433766d90fcb4b60bbc05b354..0fc58b6ab575c38232000702564a79e4cf8394d8 100644
--- a/community/wavemon/APKBUILD
+++ b/community/wavemon/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Ncurses-based monitoring application for wireless network devices"
 url="https://github.com/uoaerg/wavemon"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="ncurses-dev libcap-dev libnl3-dev autoconf automake"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/uoaerg/$pkgname/archive/v$pkgver.tar.gz"
diff --git a/community/wbar/APKBUILD b/community/wbar/APKBUILD
index aae76821e30848817a00ca9bd919c23fd754ea24..811add8289769a9d6ec2e2c21dbc4bf33e87d4de 100644
--- a/community/wbar/APKBUILD
+++ b/community/wbar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A simple and customizable quick-launch desktop dock"
 url="https://code.google.com/p/wbar/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="libglade-dev intltool imlib2-dev"
diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD
index 31302c8a9841260dd54f11caa10cfd507e9fdcbb..23dc2709d24e0a0fc6b70cfbf1b42d9e376866ce 100644
--- a/community/webkit2gtk/APKBUILD
+++ b/community/webkit2gtk/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="https://webkitgtk.org/"
 arch="x86 x86_64 ppc64le aarch64 armhf"
-license="LGPL2+ BSD"
+license="LGPL-2.0-or-later BSD"
 makedepends="$depends_dev
 	bison
 	cmake
diff --git a/community/whois/APKBUILD b/community/whois/APKBUILD
index ff890fa1de609855f29fd9e13df763fcfe0154ff..8e7c5b79dd7449dac3a613d4f98073f43df4615c 100644
--- a/community/whois/APKBUILD
+++ b/community/whois/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Intelligent WHOIS client by Marco d'Itri"
 url="http://www.linux.it/~md/software/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="perl libidn-dev gettext-dev"
 options="!check"
 subpackages="$pkgname-doc mkpasswd:_mkpasswd mkpasswd-doc"
diff --git a/community/wine/APKBUILD b/community/wine/APKBUILD
index 5fae70cec6b795d5f0c153f67a9e1db68d020e7d..47a3f2ec14abf61554db3902f13798776c6df8a1 100644
--- a/community/wine/APKBUILD
+++ b/community/wine/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 arch="x86 x86_64"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 # As of 2.0.3 most of the tests fails
 options="!check"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
diff --git a/community/wiredtiger/APKBUILD b/community/wiredtiger/APKBUILD
index 58bd25b018b582418c6a97dc8bc7afcf7ea17488..122700ffb339e8339d0f5966728e50be078b5b06 100644
--- a/community/wiredtiger/APKBUILD
+++ b/community/wiredtiger/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="High performance, scalable, production quality, NoSQL, Open Source extensible platform for data management"
 url="http://www.wiredtiger.com"
 arch="x86_64"
-license="(GPLv2 or GPLv3) and MIT and BSD"
+license="(GPL-2.0 or GPL-3.0) and MIT and BSD"
 depends=""
 depends_dev="autoconf automake libtool linux-headers"
 makedepends="$depends_dev lz4-dev zlib-dev snappy-dev libexecinfo-dev"
diff --git a/community/wireshark/APKBUILD b/community/wireshark/APKBUILD
index e336d6106a668e2327ce33213e1597a15efd1b38..7eb7ea9790768d104b726b8b3f33f0601b0e5e9a 100644
--- a/community/wireshark/APKBUILD
+++ b/community/wireshark/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="bison flex perl-dev glib glib-dev libpcap-dev libcap-dev
 	gtk+3.0-dev c-ares-dev pcre-dev gnutls-dev libgcrypt-dev libressl-dev
diff --git a/community/wiringpi/APKBUILD b/community/wiringpi/APKBUILD
index e0187a478c2b5d332ef9bde8ef1526fc75f50288..cede2e76678295d97efbb007b0e0179beff3fbd0 100644
--- a/community/wiringpi/APKBUILD
+++ b/community/wiringpi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="command line interface for Raspberry Pi gpio"
 url="http://wiringpi.com/the-gpio-utility/"
 arch="armhf"
-license="LGPLv3"
+license="LGPL-3.0"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/community/wrk/APKBUILD b/community/wrk/APKBUILD
index 99482645703adf9e3c40633ac890c6bd79c33674..6a757992771f42b727384a39f64a72d4d1cfc9f5 100644
--- a/community/wrk/APKBUILD
+++ b/community/wrk/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="wrk is a modern HTTP benchmarking tool"
 url="https://github.com/wg/wrk"
 # requires -march=i586 to build on x86
 arch="x86_64"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 depends_dev=""
 options="!check" # upstream does not provide tests
diff --git a/community/x2goserver/APKBUILD b/community/x2goserver/APKBUILD
index 25875a31185055affd5369ec9301ae0313a29966..649adc62be4199d03286a5c42d767e229ade6b6a 100644
--- a/community/x2goserver/APKBUILD
+++ b/community/x2goserver/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc=" X2Go enables you to access a graphical desktop of a computer over a low bandwidth (or high bandwidth) connection."
 url="http://x2go.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 options="suid"
 depends="perl perl-config-simple perl-dbi perl-file-readbackwards
 	perl-capture-tiny perl-dbd-sqlite bash iproute2 makepasswd
diff --git a/community/xapian-bindings/APKBUILD b/community/xapian-bindings/APKBUILD
index cf6c8d5d6267527910dcb154579d455da64ff160..f2409cf74ad721902fc42baa86b1f99f12286979 100644
--- a/community/xapian-bindings/APKBUILD
+++ b/community/xapian-bindings/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Binding libraries for xapian"
 url="http://www.xapian.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 # Disabled check for now since ruby smoketest fails
 options="!check"
 _py_makedepends="python-dev
diff --git a/community/xapian-core/APKBUILD b/community/xapian-core/APKBUILD
index d7cd9ff5f20c16602e12b87439c14db91ce16d7a..066ff722d871fe2280e0eb408356be2b3e4a5c7d 100644
--- a/community/xapian-core/APKBUILD
+++ b/community/xapian-core/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Open source search engine library"
 url="http://www.xapian.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev="zlib-dev util-linux-dev"
 makedepends="$depends_dev libtool"
diff --git a/community/xapian-omega/APKBUILD b/community/xapian-omega/APKBUILD
index a6eb1fa0579a495b5009b964653e71c622061bb3..a023fe7c00e4ecbd9829e1ee0a9d1e776bfd6b2e 100644
--- a/community/xapian-omega/APKBUILD
+++ b/community/xapian-omega/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Indexers and CGI search frontend for Xapian"
 url="http://www.xapian.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="$depends_dev xapian-core-dev perl-dev pcre-dev zlib-dev file-dev"
 subpackages="$pkgname-doc"
 source="http://oligarchy.co.uk/xapian/${pkgver}/$pkgname-$pkgver.tar.xz"
diff --git a/community/xbindkeys/APKBUILD b/community/xbindkeys/APKBUILD
index 6f00dd7c676b4075b6be31d5f58c29fcd8f9fef9..394685aa4d9028bff623d8f06b1710ec4c1f0d10 100644
--- a/community/xbindkeys/APKBUILD
+++ b/community/xbindkeys/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Program for launching shell commands via keyboard shortcuts in X"
 url="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libx11-dev"
 subpackages="$pkgname-doc"
 source="http://www.nongnu.org/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/community/xkcdpass/APKBUILD b/community/xkcdpass/APKBUILD
index 1920c2f6e3e2be1d7cabd4d5f1b861627d81549c..2fec8a4844dacc540cf31d7d891a2356b8cbbcbf 100644
--- a/community/xkcdpass/APKBUILD
+++ b/community/xkcdpass/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Generate secure multiword passwords/passphrases"
 url="https://github.com/redacted/XKCD-password-generator"
 arch="noarch"
-license="BSD-3"
+license="BSD-3-Clause"
 depends="py3-xkcdpass"
 makedepends="python3-dev"
 subpackages="py3-$pkgname:py3"
diff --git a/community/xmltv/APKBUILD b/community/xmltv/APKBUILD
index f83d1b569cbe9fcb77d20260baad8949c0ff123d..fcc7103569430b2842b355386b81a8d599cce0fa 100644
--- a/community/xmltv/APKBUILD
+++ b/community/xmltv/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Set of utilities to download tv listings and format them in xml"
 url="http://xmltv.org/wiki"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl-libwww perl-xml-parser perl-xml-twig perl-date-manip perl-xml-writer
 	perl-timedate perl-unicode-string perl-term-readkey perl-file-slurp perl-xml-libxml
 	perl-lingua-en-numbers-ordinate perl-lingua-preferred perl-compress-raw-zlib perl-io-gzip
diff --git a/community/xpdf/APKBUILD b/community/xpdf/APKBUILD
index 6681a1155cd8f21834273cc4417f059633c0bba4..876e1c3ba588ca1961a86c19b90b9738fb1a0933 100644
--- a/community/xpdf/APKBUILD
+++ b/community/xpdf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="The classic X11 PDF viewer"
 url="http://www.xpdfreader.com"
 arch="all"
-license="GPL2/GPL3"
+license="GPL-2.0 GPL-3.0"
 depends="ghostscript-fonts"
 makedepends="motif-dev freetype-dev libpng-dev"
 subpackages="$pkgname-doc"
diff --git a/community/xpra/APKBUILD b/community/xpra/APKBUILD
index 98bccda0536163cb0416d60081f05664dbd58b7b..b0d89abb87acac2e1acd76fb575cba7af33ec3d3 100644
--- a/community/xpra/APKBUILD
+++ b/community/xpra/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Xpra is 'screen for X' & allows you to run X programs, usually on a rem
 url="http://xpra.org"
 # !armhf: fails to build
 arch="all !s390x !armhf"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="py-gobject py-gtk py-imaging xf86-video-dummy xvfb setxkbmap xorg-server
 	py2-numpy py2-pillow py-gtkglext py2-lz4 py-rencode py-opencl py2-xxhash
 	py2-cryptography"
diff --git a/community/xxhash/APKBUILD b/community/xxhash/APKBUILD
index 9225892acb15180bd57f9f720d240e8464ae270c..a25c6d725656b73dd33e2e494c621ca3ffb82cef 100644
--- a/community/xxhash/APKBUILD
+++ b/community/xxhash/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="Extremely fast non-cryptographic hash algorithm"
 url="http://www.xxhash.com"
 arch="all"
-license="BSD/GPL"
+license="BSD GPL"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="$pkgname-dev $pkgname-doc py2-$pkgname:_py2 py3-$pkgname:_py3"
diff --git a/community/yad/APKBUILD b/community/yad/APKBUILD
index 383be904b5267ab831598d0b0a2c3257b2dc947e..4d9a1b65e122a50f8e25b075b7a596980f03e0a7 100644
--- a/community/yad/APKBUILD
+++ b/community/yad/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A fork of zenity - display graphical dialogs from shell scripts or command line"
 url="https://sourceforge.net/projects/yad-dialog"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="hicolor-icon-theme"
 makedepends="gtk+2.0-dev intltool"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/community/yadifa/APKBUILD b/community/yadifa/APKBUILD
index e6d6ee04389b685dcdabba5e9e7db738e4329e06..28a866eaf8f7434bfb2080d71b7a8a70d64b1f94 100644
--- a/community/yadifa/APKBUILD
+++ b/community/yadifa/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Lightweight authoritative Name Server with DNSSEC capabilities"
 url="http://www.yadifa.eu"
 arch="all"
-license="BSD-3"
+license="BSD-3-Clause"
 makedepends="libressl-dev"
 install="$pkgname.post-install"
 options="!libtool"
diff --git a/community/yarn/APKBUILD b/community/yarn/APKBUILD
index 2d04cad815d0f525b98db616c285c897355c996d..3b04bd26d4414aff87dcc9910c95981da9695acb 100644
--- a/community/yarn/APKBUILD
+++ b/community/yarn/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Fast, reliable, and secure dependency management for Node.js"
 url="https://yarnpkg.com/"
 arch="noarch"
-license="BSD-2"
+license="BSD-2-Clause"
 depends="nodejs"
 source="https://yarnpkg.com/downloads/$pkgver/$pkgname-v$pkgver.tar.gz
 	apk-install-method.patch"
diff --git a/community/yelp-tools/APKBUILD b/community/yelp-tools/APKBUILD
index c70437f54a1be5d104ce831667853a5e86da185e..78b9c624b0704042f4de823cce12811504b30b2e 100644
--- a/community/yelp-tools/APKBUILD
+++ b/community/yelp-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"
 url="https://wiki.gnome.org/Apps/Yelp/Tools"
 arch="noarch"
-license="GPL/LGPL"
+license="GPL LGPL"
 makedepends="gawk yelp-xsl itstool libxml2-utils libxslt"
 source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/community/yelp-xsl/APKBUILD b/community/yelp-xsl/APKBUILD
index 88e3efff061cb706bdc4524598214cff498b799e..bab2e6e176af590ae4dfb28be88378c8bdd95ac1 100644
--- a/community/yelp-xsl/APKBUILD
+++ b/community/yelp-xsl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A collection of programs and data files to help you build, maintain and distribute documentation."
 url="https://wiki.gnome.org/Apps/Yelp"
 arch="noarch"
-license="GPL/LGPL/MIT"
+license="GPL LGPL MIT"
 makedepends="intltool libxslt itstool"
 source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/community/ympd/APKBUILD b/community/ympd/APKBUILD
index 2dca462fd7f3def9574b4b5d7d1b6d18322b5620..35fdbbf19a631ca71952bb6f15bbb34f56c03d41 100644
--- a/community/ympd/APKBUILD
+++ b/community/ympd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="A standalone MPD Web GUI"
 url="https://www.ympd.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev cmake libmpdclient-dev libressl-dev"
diff --git a/community/zenity/APKBUILD b/community/zenity/APKBUILD
index e001f33f266aded1243e3a15ac327479780c1d36..7c8ccc38182b256999d171e999b5cc309663039e 100644
--- a/community/zenity/APKBUILD
+++ b/community/zenity/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A GTK+-based xdialog replacement"
 url="https://www.gnome.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="gtk+3.0-dev intltool libxml2-utils libnotify-dev itstool"
 subpackages="$pkgname-lang $pkgname-doc"
 case $pkgver in
diff --git a/community/zoneminder/APKBUILD b/community/zoneminder/APKBUILD
index f317c82f8dc001d3cfcebb077f601fed11f55a04..20cddcdbeea50bfdae5bcc5814bc9a489465e821 100644
--- a/community/zoneminder/APKBUILD
+++ b/community/zoneminder/APKBUILD
@@ -8,7 +8,7 @@ _crud=c3976f1478c681b0bbc132ec3a3e82c3984eeed5
 pkgdesc="Video camera surveillance system"
 url="https://www.zoneminder.com/"
 arch="x86_64"
-license="GPL2+"
+license="GPL-2.0-or-later"
 _php=php5
 depends="ffmpeg perl perl-archive-zip perl-date-manip perl-dbd-mysql
          perl-dbi perl-device-serialport perl-libwww
diff --git a/community/zram-init/APKBUILD b/community/zram-init/APKBUILD
index 5e291e5d330e6ca3560c5161f01db3645324e54a..39b216f64b4793721b21868e0025eaf719518e07 100644
--- a/community/zram-init/APKBUILD
+++ b/community/zram-init/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="wrapper script for the zram kernel module"
 arch="noarch"
 url="https://github.com/vaeth/zram-init"
-license="GPL2"
+license="GPL-2.0"
 depends="e2fsprogs-extra"
 subpackages="$pkgname-zsh-completion:zshcomp"
 source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
diff --git a/community/zsnes/APKBUILD b/community/zsnes/APKBUILD
index a4749fbf9b6d957a675c6feb839c96fabf8b49bb..3cd8b4aa1c0a33bcabbb31b2de56277c6a10bb77 100644
--- a/community/zsnes/APKBUILD
+++ b/community/zsnes/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=10
 pkgdesc="Super Nintendo emulator"
 url="http://www.zsnes.com/"
 arch="x86"
-license="GPL2"
+license="GPL-2.0"
 makedepends="sdl-dev libpng-dev ncurses-dev mesa-dev automake autoconf nasm"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}151src.tar.bz2
diff --git a/community/zziplib/APKBUILD b/community/zziplib/APKBUILD
index d406a43f9253313d3850a5b390cddb706fbf48ae..ed4ca35977d8a299252e39c09e493728c558665f 100644
--- a/community/zziplib/APKBUILD
+++ b/community/zziplib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Lightweight library to easily extract data from zip files"
 url="http://zziplib.sourceforge.net"
 arch="all"
-license="LGPL2+ MPL-1.1"
+license="LGPL-2.0-or-later MPL-1.1"
 makedepends="zlib-dev python2 xmlto"
 checkdepends="zip"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
diff --git a/main/a2ps/APKBUILD b/main/a2ps/APKBUILD
index bb73f6c340de12752e1fb0d9172265c91783afbe..d8960c8e6e111754a07889f9c53d6536e9268b88 100644
--- a/main/a2ps/APKBUILD
+++ b/main/a2ps/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=7
 pkgdesc="a2ps is an Any to PostScript filter"
 url="https://www.gnu.org/software/a2ps/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="ghostscript imagemagick perl"
 makedepends="gperf autoconf automake libtool"
 install=
diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD
index 61aae61a056d69d0b1059cdd2827e818aa6a93af..3da22a3c93b3a36ac6a8db203f31840dbd3dfc50 100644
--- a/main/a52dec/APKBUILD
+++ b/main/a52dec/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=6
 pkgdesc="A free library for decoding ATSC A/52 streams."
 url="http://liba52.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="autoconf automake libtool linux-headers"
 source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz
diff --git a/main/abcde/APKBUILD b/main/abcde/APKBUILD
index 5a713a977f59dfa1283fa4c6f435099e563c6ac0..cfecd253c66e553243e76f7689e9746bcde247bd 100644
--- a/main/abcde/APKBUILD
+++ b/main/abcde/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A command line CD encoder that reads your CD, downloads the track information from a CDDB provider, and rips your CD"
 url="http://abcde.einval.com/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="bash cd-discid py-eyed3"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/abi-compliance-checker/APKBUILD b/main/abi-compliance-checker/APKBUILD
index 5ea3182a68bd36762af796a329d1326568d4409b..64b6a75ad27a9ab2dcf9b5249bab8df607e5377a 100644
--- a/main/abi-compliance-checker/APKBUILD
+++ b/main/abi-compliance-checker/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A tool for checking backward compatibility of a C/C++ library"
 url="https://github.com/lvc/abi-compliance-checker"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="perl build-base"
 depends_dev=""
 makedepends="$depends_dev perl-dev"
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 75a84620aa863f7afa25f3f3e3b4659215591f20..ce052ecbe21e1f57ae9267036c8bff0f296e2a8a 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="fakeroot sudo pax-utils libressl apk-tools>=2.0.7-r1 libc-utils
 	attr tar pkgconf patch lzip"
 if [ "$CBUILD" = "$CHOST" ]; then
diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index 911110230989ff7245a1318c4d80dd6762f09fbb..0f2f294f344b708d6f408ce113da6c8e8c3fa900 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The GNU Accounting Utilities"
 url="https://www.gnu.org/software/acct/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 60ce7af663ea4b82a0c94c8708bbc973f1cba839..61e093917061a10a55362385a4c5de353914cdfc 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="https://git.alpinelinux.org/cgit/acf/acf-alpine-baselayout"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-json4 lua-posix"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index 3064598a85d99fea2a151df8e57dd2b66d0b840a..cbe4fceb66a67cd33acfbfc90904b80d5fc3411f 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A web-based system administration interface for alpine-conf"
 url="https://git.alpinelinux.org/cgit/acf/acf-alpine-conf"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-posix libressl"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 7396da739d45ae018880c6f8ec55e7bd7e1b5bba..0a94ed72d634cb1da91b13448c033c03a7128170 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for amavis"
 url="https://git.alpinelinux.org/cgit/acf/acf-amavisd-new"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core amavisd-new"
 makedepends=""
 install=
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index 6c1a0fdbf2f9e5a56e2711656c89cba69826003c..966093551fe072e6c502decddbf07d95a71ec9ce 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="ACF module for apk"
 url="https://git.alpinelinux.org/cgit/acf/acf-apk-tools"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-posix apk-tools"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index 4a56d2684a72b9615e8647283cf1ebd91140af8f..89715ef5e8e6d24b7715248b2810188c6457741d 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for asterisk"
 url="https://git.alpinelinux.org/cgit/acf/acf-asterisk"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core asterisk"
 makedepends=""
 install=
diff --git a/main/acf-awall/APKBUILD b/main/acf-awall/APKBUILD
index cb0dc354ddd062d4b6c0a8ed588d7a5e3e2e9e8a..97dc81030bc42a7e6909ed402b975e4b4be5773f 100644
--- a/main/acf-awall/APKBUILD
+++ b/main/acf-awall/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF for Alpine Wall"
 url="https://git.alpinelinux.org/cgit/acf/acf-awall"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core awall"
 makedepends=""
 install=
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index 1bb06cb2467c9d8d1cb594ffe5bb829ab4c04833..d382859c72fe3478f5a7f16b2793983d67cc67fb 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for chrony"
 url="https://git.alpinelinux.org/cgit/acf/acf-chrony"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-posix chrony"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index 4eb56b09d9953c003de0dd17132a70a61d63883a..76c55041e70ef90aa0abcdb1fe7bdeccf6c853b6 100644
--- a/main/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for clamav"
 url="https://git.alpinelinux.org/cgit/acf/acf-clamav"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core clamav"
 makedepends=""
 install=
diff --git a/main/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index 861404c6bc9058607c14c84c9563d17be610a84d..8e012d49b7777178181e250d77b9b43a0d3c29ba 100644
--- a/main/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for clamsmtp"
 url="https://git.alpinelinux.org/cgit/acf/acf-clamsmtp"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core clamsmtp"
 makedepends=""
 install=
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index adc3d6a6018a17d1150e27fad9b64f024f51e77a..1f1366e7d57af51ff2f057ba803a4302a70fd79d 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface framework"
 url="https://git.alpinelinux.org/cgit/acf/acf-core"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 install="$pkgname.post-upgrade"
 depends="acf-jquery acf-lib acf-skins haserl-lua$_luaversion lua$_luaversion
 	lua$_luaversion-posix lua$_luaversion-md5 lua$_luaversion-json4
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index 79b6ef7a8ee959bc35d84dcdeebccb008de053d6..c8154844ff173e9ab85d96481c6589a91f47f4d9 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for dansguardian"
 url="https://git.alpinelinux.org/cgit/acf/acf-dansguardian"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core dansguardian"
 makedepends=""
 install=
diff --git a/main/acf-db/APKBUILD b/main/acf-db/APKBUILD
index e30448628bf72ccdeb37f21baad56fe8435299e1..faa515e4ddba22a5a1a02d7600a51a57a569b899 100644
--- a/main/acf-db/APKBUILD
+++ b/main/acf-db/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for databases"
 url="https://git.alpinelinux.org/cgit/acf/acf-db"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core acf-db-lib"
 makedepends=""
 install=
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index f5e5c76dd26e0e1c822bc246d29920456382f420..bea733124fac1f6eedbffd5f884a084d851bf999 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for dhcp"
 url="https://git.alpinelinux.org/cgit/acf/acf-dhcp"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core dhcp"
 makedepends=""
 install=
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 4ebcd14907ca060b825e1489f5359524bb211bd2..5746b25db71bd0b3938a87717c09234905042100 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for dnscache"
 url="https://git.alpinelinux.org/cgit/acf/acf-dnscache"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-posix dnscache"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 5855945c14cb6bf69c4ae34f17980f50fdbb9e49..3e8a7a2639d647ae5300772df4c0f10d8f94c5cf 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for dnsmasq"
 url="https://git.alpinelinux.org/cgit/acf/acf-dnsmasq"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core dnsmasq"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index b7503e13e98672d4e88ff9d47e1c897848434985..14d07004f716e803a06374e0d47fbfce6aceb50c 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for dovecot"
 url="https://git.alpinelinux.org/cgit/acf/acf-dovecot"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core dovecot"
 makedepends=""
 install=
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index 54058d581020fb5e0659459f28030b561d13c4dc..4a970cc17377dabd27ba8580eeaed41cedc5445a 100644
--- a/main/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for fetchmail"
 url="https://git.alpinelinux.org/cgit/acf/acf-fetchmail"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core fetchmail"
 makedepends=""
 install=
diff --git a/main/acf-freeradius3/APKBUILD b/main/acf-freeradius3/APKBUILD
index 1821b2e669adac40f6ad02e597f8e44f5f783f0f..e54f106d1ebf12ca783cea124091044b2cd86f43 100644
--- a/main/acf-freeradius3/APKBUILD
+++ b/main/acf-freeradius3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ACF for freeradius 3"
 url="https://git.alpinelinux.org/cgit/acf/acf-freeradius3"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core freeradius>3"
 makedepends=""
 install=
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index 17686c65998189d6ebe835b065856156912072ef..bfaf7be44f940a136b041c4920dd7f6c625e4e8f 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="ACF for a web interface for freeswitch voicemail"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-sql-sqlite3 lua-socket freeswitch"
 makedepends=""
 install="$pkgname.post-upgrade"
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index 0fbe36c36797bef16de1bde9b2d0f9b8278450cb..ab60abac08ab30ef9d506e049a30cb17004a58a1 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF for freeswitch"
 url="https://git.alpinelinux.org/cgit/acf/acf-freeswitch"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core freeswitch lua-xml"
 makedepends=""
 install=
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index 8da0462f09a7a7b167dfd5a44c4eca7e39c63573..f65925a2322e08f932ef853d80501bc3e20e3b27 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for gross"
 url="https://git.alpinelinux.org/cgit/acf/acf-gross"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core gross"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index fc76c0b63021fd4cd6384fb952dc4efc3ce9b7df..6df113dbe03e37acbd898e4bffc21d903b8d5e5c 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for heimdal"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core heimdal"
 makedepends=""
 install=
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index ae61f1b6e0abb81ca24bde50630a0e52ea1a5b73..9ca105991866d117e66931544071bf5323ed518a 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for iproute2-qos"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core iproute2-qos acf-alpine-baselayout>=0.5.7"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
index 6900a6bf66521289d94b220d4c5d50c5d7d7fd7e..c492379b7fdc74d8d6d1d04b5405d5a6c87e74fe 100644
--- a/main/acf-ipsec-tools/APKBUILD
+++ b/main/acf-ipsec-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for ipsec-tools"
 url="https://git.alpinelinux.org/cgit/acf/acf-ipsec-tools"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core ipsec-tools"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index b40a8ceac520af5cdea5399e90c95e820cc0d98d..d370529c04ff8d5b379bf6480305883156be8d80 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for iptables"
 url="https://git.alpinelinux.org/cgit/acf/acf-iptables"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core iptables"
 makedepends=""
 install=
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index b33578d1aabf8c4d051bcae92b614725e271b2c3..704c5a828d002965e7ab5d1880cc03b64885c179 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="jquery libraries for ACF"
 url="https://git.alpinelinux.org/cgit/acf/acf-jquery"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 replaces="acf-core"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index 7361f3e0b8624704fc1cbda630dbae02e712892f..57f65aa33bceaf0519157b60fcd585b4902e7a2c 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for kamailio"
 url="https://git.alpinelinux.org/cgit/acf/acf-kamailio"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core kamailio acf-db-lib"
 makedepends="acf-db-lib"
 install=
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index 0279472631a29b53273283ab26396f7e4ba46ff6..f5a2845045cde446c97879fa04ea8e891c5d21bd 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Lua libraries for ACF"
 url="https://git.alpinelinux.org/cgit/acf/acf-lib"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="lua-subprocess"
 subpackages=""
 for _i in $_luaversions; do
diff --git a/main/acf-lighttpd/APKBUILD b/main/acf-lighttpd/APKBUILD
index 726aefb2c06b86a1da868c8799364b2b315e2fbb..8370ac52e482480ab5f91ca47780c23e2d9fdf84 100644
--- a/main/acf-lighttpd/APKBUILD
+++ b/main/acf-lighttpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for lighttpd"
 url="https://git.alpinelinux.org/cgit/acf/acf-lighttpd"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lighttpd"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index e37757d35092dffa67eebfb6488b0475b781b90e..37da976dc39e09b3ba860cb573fa1202b4c52c3e 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for lvm2"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lvm2"
 makedepends=""
 install=
diff --git a/main/acf-mariadb/APKBUILD b/main/acf-mariadb/APKBUILD
index 05eaf2645e601dc428c8183ccc856a1955ae6b02..58cfa74ef2125fca4d4b8be3b32bac961bdeb627 100644
--- a/main/acf-mariadb/APKBUILD
+++ b/main/acf-mariadb/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for mariadb"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core mariadb mariadb-client lua-sql-mysql acf-db-lib"
 makedepends="acf-db-lib"
 install=
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 293ac0e27cdfdb3efcaf6835cf54cfcbb5688219..26e92d9a36e264ec528b1fdcd4f342eb9918681e 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for mdadm"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core mdadm"
 makedepends=""
 install=
diff --git a/main/acf-nsd/APKBUILD b/main/acf-nsd/APKBUILD
index 3af0f81256ed2fbd7c9ff49cd804e7b8e2bdfce0..561d995788aa04e37715a535cf339ecdd35455be 100644
--- a/main/acf-nsd/APKBUILD
+++ b/main/acf-nsd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for nsd"
 url="https://git.alpinelinux.org/cgit/acf/acf-nsd"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core nsd"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-openldap/APKBUILD b/main/acf-openldap/APKBUILD
index d85b107728f05b2c4315f05aa9405d668f253254..9397689e0f275f4a866c925faadb202ee85e56fd 100644
--- a/main/acf-openldap/APKBUILD
+++ b/main/acf-openldap/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="ACF module for OpenLDAP"
 url="http://git.alpinelinux.org/cgit/user/alacerda/$pkgname/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core openldap openldap-back-bdb"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index d0f8b66c132804e81a5fc3847c8cdab8193b8b35..ec6a62dfe087d836c9d7e3bd22d725700db5a7b5 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for opennhrp"
 url="https://git.alpinelinux.org/cgit/acf/acf-opennhrp"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-posix opennhrp"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index eec68c4557db9f04271150eb0c4485387c33fa06..9b028d31760fe89a1f8e22657c1af49ee1a2e789 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for openntpd"
 url="https://git.alpinelinux.org/cgit/acf/acf-openntpd"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core openntpd"
 makedepends=""
 install=
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index ece979d985ccf4d82c40cfdfc7b1aeca1aa50c33..8c712fc2eb21c36436bd12ea8cf66017ca290fb7 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A web-based system administration interface for openssh"
 url="https://git.alpinelinux.org/cgit/acf/acf-openssh"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core openssh"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index ba4f54245944812034afab56698407241e9bd011..f111cba7919e8aecd56b00a8678b670cba4e116c 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A web-based system administration interface for open/librelssl"
 url="https://git.alpinelinux.org/cgit/acf/acf-openssl"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core libressl"
 makedepends=""
 install=
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index b74081a3a6843dce29c40aa1f1a5e10a926ef478..35011436d47fc7b246cf4368d4364bbb902411c8 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for openvpn"
 url="https://git.alpinelinux.org/cgit/acf/acf-openvpn"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core openvpn"
 makedepends=""
 install=
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index 770b2630efced3a73da5221cf09df588672940fc..0f248ec2c748d0520eb3956ae023c63f633cb631 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for pingu"
 url="https://git.alpinelinux.org/cgit/acf/acf-pingu"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core pingu"
 makedepends=""
 install=
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index 701379202a17f6eb5357270e73a66f4216d56a52..acc2c4d2976a63b2ea2e9ac6ee7067dd3156cd51 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for postfix"
 url="https://git.alpinelinux.org/cgit/acf/acf-postfix"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core postfix"
 makedepends=""
 install=
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 23f7ce6059a8bf71b61e2149c31dfe92ea5949c0..763c86cf2fb64e2eb5e85ca00110f7fb1053a542 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ACF module for postgresql"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core postgresql acf-db-lib lua-sql-postgres"
 makedepends="acf-db-lib"
 install=
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index c35fb8f516058a8b5121a8138748f1923a5b70f2..547404d850bcbec98bc739adc9648ce7e5f84fba 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for ppp"
 url="https://git.alpinelinux.org/cgit/acf/acf-ppp"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core ppp"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index ab6eb9a114f300eb10e7082b5bf88e394b85937c..12377a1072fbfda4c6491968cab209a62788508c 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="ACF for provisioning templated configs to devices"
 url="https://git.alpinelinux.org/cgit/acf/acf-provisioning"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-sql-postgres postgresql-client lua-posixtz lua-xml"
 makedepends=""
 install=""
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index fd97a88ed35bd7e7098264104bbb621a3f40d2e2..69630051eb3196d16f5edfeaee2b4712d0d44a7f 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A web-based system administration interface for quagga"
 url="https://git.alpinelinux.org/cgit/acf/acf-quagga"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-socket quagga"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index 483cb28183b105fbeb01d3269a39a0c65d9207de..163868619ad1f741611975d9428ff346625bd8e0 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for samba"
 url="https://git.alpinelinux.org/cgit/acf/acf-samba"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core samba"
 makedepends=""
 install=
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 884eb77257443361b2a8b2e82169f6f56b373581..750cb1e4af4723f1bba503c863533056ee9202c1 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Skins for ACF"
 url="https://git.alpinelinux.org/cgit/acf/acf-skins"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index 59047cf68bced439ba24809b01759c726db9f95b..7b133e17f55f9f98397df6fd09a27d00297fad01 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for snort"
 url="https://git.alpinelinux.org/cgit/acf/acf-snort"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core snort"
 makedepends=""
 install=
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index f559a9514a6ffeaa48342a6eaeab8413e41ce83e..86ec548a4e1f68c9444f263e0c40d576425a8ef7 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for squid"
 url="https://git.alpinelinux.org/cgit/acf/acf-squid"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core squid"
 makedepends=""
 install=
diff --git a/main/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index 9479b21bf9675284a71acc2dda06a3f3a839e494..945ba894a13e73bd8cc279b1bd633d41e648395a 100644
--- a/main/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for tcpproxy"
 url="https://git.alpinelinux.org/cgit/acf/acf-tcpproxy"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core tcpproxy"
 makedepends=""
 install=
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index d9d7106daa2fcd336256e937f0801cffcb98c3fb..db1fae8800b97a47e9123bddf3bc330762e51fd7 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for tinydns"
 url="https://git.alpinelinux.org/cgit/acf/acf-tinydns"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core tinydns"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
 
diff --git a/main/acf-unbound/APKBUILD b/main/acf-unbound/APKBUILD
index bb42685a24e05a629a5a28c9c5916a954ae01c28..40911fb449fca8dabbee1daae33a1838cf0cabac 100644
--- a/main/acf-unbound/APKBUILD
+++ b/main/acf-unbound/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web-based system administration interface for unbound"
 url="http://git.alpinelinux.org/cgit/acf/$pkgname"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core unbound"
 replaces=""
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 887586b7ef5e5e0c62ff78435289a5af7e7aa691..75bbe295c94632dad8bdae4cc07f591eb99138ec 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
 url="https://git.alpinelinux.org/cgit/acf/acf-weblog"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="acf-core lua-sql-postgres wget postgresql-client lua-subprocess"
 makedepends=""
 install="$pkgname.post-upgrade"
diff --git a/main/ack/APKBUILD b/main/ack/APKBUILD
index 7db31bb5006484674a6cbcec4d7da935b05fb7ab..0c2172af5befe94423b837a207e8e9b9490719c4 100644
--- a/main/ack/APKBUILD
+++ b/main/ack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Perl-powered replacement for grep"
 url="http://betterthangrep.com/"
 arch="noarch"
-license="Artistic 2.0"
+license="Artistic-2.0"
 depends="perl-file-next perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
diff --git a/main/acl/APKBUILD b/main/acl/APKBUILD
index ff5f535cbd877df17eba60dc03085908e69b9369..e0b2879bf87955996089e6ed7e873cc940aad0eb 100644
--- a/main/acl/APKBUILD
+++ b/main/acl/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="Access control list utilities"
 url="https://savannah.nongnu.org/projects/acl"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends_build="gzip"
 makedepends_host="attr-dev"
diff --git a/main/acpi/APKBUILD b/main/acpi/APKBUILD
index e8eb918b38ecc6980f389c5f3ab94b38d64dcb9d..4c165bb00d0962cfb93bc1d4a87ca21e6e158661 100644
--- a/main/acpi/APKBUILD
+++ b/main/acpi/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="ACPI client for battery, power, and thermal readings"
 url="https://sourceforge.net/projects/acpiclient/files/acpiclient/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/adwaita-icon-theme/APKBUILD b/main/adwaita-icon-theme/APKBUILD
index b032224e9a6e3fd0f763f3e10a0632333dd7e15e..fcaf23887961a2bcc936374792abef79eb31582d 100644
--- a/main/adwaita-icon-theme/APKBUILD
+++ b/main/adwaita-icon-theme/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Adwaita icon theme"
 url="http://www.gnome.org"
 arch="noarch"
-license="LGPLv3+ or CC-BY-SA"
+license="LGPL-3.0-or-later or CC-BY-SA"
 depends=""
 depends_dev=""
 makedepends="$depends_dev intltool gtk+2.0 gtk+3.0 librsvg"
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 48c994705e7c7a3e0b5bdf8659fada9953ef2ea2..183d69aa0325ac060bd61b3196bb8bc9c11ee39b 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Alpine base dir structure and init scripts"
 url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 pkggroups="shadow"
 options="!fhs"
 install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
diff --git a/main/alpine-sdk/APKBUILD b/main/alpine-sdk/APKBUILD
index b1dd13f58eabe2047c4cda2535638f74ba06f031..85972236cec7f4bef581e029b913a5cc1bf9f2b3 100644
--- a/main/alpine-sdk/APKBUILD
+++ b/main/alpine-sdk/APKBUILD
@@ -6,7 +6,7 @@ url=http://dev.alpinelinux.org/cgit
 pkgdesc="Alpine Software Development Kit meta package"
 depends="abuild build-base git squashfs-tools xorriso acct mkinitfs mtools"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 
 build() {
 	# meta package
diff --git a/main/alpine/APKBUILD b/main/alpine/APKBUILD
index e699834295e964cd2f6a52c92dcf68166bf2127f..48672b2425f64dc262970288467c7e27646d9c36 100644
--- a/main/alpine/APKBUILD
+++ b/main/alpine/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Text-based email client, friendly for novices but powerful"
 url="http://www.washington.edu/alpine/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="openldap-dev heimdal-dev ncurses-dev libressl-dev
 	automake autoconf libtool"
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 3f9695ef20d280eb009fe656830140f38e28d240..fa94b9f8f2adc6656f7ab54be0cd10b73121b163 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="An alternative implementation of Linux sound support"
 url="http://www.alsa-project.org"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-dbg"
 makedepends="linux-headers"
 source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2
diff --git a/main/altermime/APKBUILD b/main/altermime/APKBUILD
index e89227f5d4e5c83c2d6fb7211441570678d770a4..6d50a747532c755fda746e27969eef0bb66ff04a 100644
--- a/main/altermime/APKBUILD
+++ b/main/altermime/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="alterMIME - MIME encoded email pack alteration tool"
 url="http://www.pldaniels.com/$pkgname"
 arch="all"
-license="custom:$pkgname"
+license="custom:altermime"
 depends=
 makedepends=
 install=
diff --git a/main/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
index 30e151089ad5d33e66d3d55b359dd778d4e4fdd1..689bed98a4c9f5261f814b4259954f6186505749 100644
--- a/main/amavisd-new/APKBUILD
+++ b/main/amavisd-new/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="High-performance interface between mailer (MTA) and content checkers"
 url="http://www.ijs.si/software/amavisd"
 arch="noarch"
-license="GPL2+ BSD"
+license="GPL-2.0-or-later BSD"
 depends="sed file perl perl-archive-zip perl-carp perl-convert-tnef
 	perl-compress-raw-zlib perl-convert-uulib perl-digest-md5 perl-io
 	perl-exporter perl-io-compress perl-io-stringy perl-mime-tools
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
index 0d88c268f08b18b966ecb87336b86c9f78c37548..744a6fb08f7ce9daa116324b11405b06d984012e 100644
--- a/main/ansible/APKBUILD
+++ b/main/ansible/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
 url="https://ansible.com"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 _py=py2
 depends="python2 $_py-yaml $_py-paramiko $_py-jinja2 $_py-markupsafe $_py-crypto"
 makedepends="python2-dev py-setuptools"
diff --git a/main/antiword/APKBUILD b/main/antiword/APKBUILD
index beaf8880a225e13a6d25905d8effca80ecb9539f..867aeb6bc665643091731f8694f930382f92d8be 100644
--- a/main/antiword/APKBUILD
+++ b/main/antiword/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A free MS Word reader"
 url="http://www.winfield.demon.nl"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/main/aoetools/APKBUILD b/main/aoetools/APKBUILD
index 48bd7fe0c0d6e22249a482e350c63f28de59324a..27914a0c02ef895c5fe5ad1598c17c47b64cc42a 100644
--- a/main/aoetools/APKBUILD
+++ b/main/aoetools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="tools for managing the linux AoE driver"
 url="https://github.com/OpenAoE/aoetools"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/apache-mod-auth-ntlm-winbind/APKBUILD b/main/apache-mod-auth-ntlm-winbind/APKBUILD
index 43faaf6a311ebb5aca17625d2012a85887a110dd..c9acfe906b50d849158a54d190e8c2e412f4b19a 100644
--- a/main/apache-mod-auth-ntlm-winbind/APKBUILD
+++ b/main/apache-mod-auth-ntlm-winbind/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="Authentication module for Apache using NTLM protocol with winbind helper"
 url="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="apache2 samba samba-winbind"
 makedepends="autoconf apache2-dev apr-util-dev apr-dev"
 source="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
diff --git a/main/apache-mod-fcgid/APKBUILD b/main/apache-mod-fcgid/APKBUILD
index 4411b8cd5324b5c73ed4316718fee0b4268b4486..97b41283ed0955f81ca09fae8c94b52cf95c57cd 100644
--- a/main/apache-mod-fcgid/APKBUILD
+++ b/main/apache-mod-fcgid/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="FastCGI module for Apache 2.x"
 url="http://httpd.apache.org/$_pkgreal/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="apache2"
 makedepends="apache2-dev"
 install=""
diff --git a/main/apache2-mod-wsgi/APKBUILD b/main/apache2-mod-wsgi/APKBUILD
index 9fd9600ee7449bc5561ef0e84ca96e44f440e799..01d532f31bc532882e389c3ea5ba84c5f6e25917 100644
--- a/main/apache2-mod-wsgi/APKBUILD
+++ b/main/apache2-mod-wsgi/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python WSGI Module for Apache2"
 url="http://code.google.com/p/modwsgi/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="apache2 python2"
 makedepends=" apache2-dev python2-dev"
 options="!check" # no tests provided
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 5d7c75abb3f093830a31ba06f2697fc6249cacd2..a6783b1764e322a13b3c8129747cd1ff7949e475 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 pkgusers="apache"
diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD
index fcb8971a11f85e934e03dbfaf4e4669d01dc20b9..c0f81bfd7a3178758767bde91c94a91c9f8c959e 100644
--- a/main/apcupsd/APKBUILD
+++ b/main/apcupsd/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="A Daemon to control APC UPSes"
 subpackages="$pkgname-doc $pkgname-webif"
 url="http://www.apcupsd.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="util-linux"
 makedepends="net-snmp-dev man linux-headers gd-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/main/api-sanity-checker/APKBUILD b/main/api-sanity-checker/APKBUILD
index 8479b58e6e837a0b4b0cd63824b904f263b788e4..3b39d17e88922ad1bff479c4bf059519f1a8ec2f 100644
--- a/main/api-sanity-checker/APKBUILD
+++ b/main/api-sanity-checker/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A tool for creating automated test suites from any set of C sources"
 url="http://ispras.linuxbase.org/index.php/API_Sanity_Autotest"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="perl build-base"
 depends_dev=""
 makedepends="$depends_dev perl-dev abi-compliance-checker"
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 626ff9f6b66d380d9a497c9bca786b2698bd9e5d..993ab5a7c6793a8d2655b3776569ccdec86a16cc 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
 url="http://alpinelinux.org"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 depends="abuild>2.20.0 mosquitto-clients alpine-sdk mqtt-exec rsync lua-aports
 	lua5.2-cjson lua5.2-mqtt-publish"
diff --git a/main/appstream-glib/APKBUILD b/main/appstream-glib/APKBUILD
index 74a70bb75e75b1ce864b7f4b90a30ec2dcc6ee84..63cf2f0f2a8cb85b2aa4f006a03433f3dd368e5c 100644
--- a/main/appstream-glib/APKBUILD
+++ b/main/appstream-glib/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Library for AppStream metadata"
 url="https://people.freedesktop.org/~hughsient/appstream-glib/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="glib-dev gdk-pixbuf-dev"
 makedepends="$depends_dev fontconfig-dev freetype-dev pango-dev sqlite-dev
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 24c672b5db39ebb44a3dd994395668fe1cf60edf..7fdc2f82b26bce8af3cf035b018a2eeee1d294c9 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="The Apache Portable Runtime Utility Library"
 url="http://apr.apache.org/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=
 subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql
 	$pkgname-dbd_sqlite3 $pkgname-ldap"
diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index 1186a5133d828fa254f0174d0f720da680638a66..ccf5138b2714de625d628968a9d7154a9c1bec3e 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 depends_dev="util-linux-dev bash"
 makedepends="$depends_dev"
diff --git a/main/argp-standalone/APKBUILD b/main/argp-standalone/APKBUILD
index cac1293f7d404b8460bf27eed1c9ef83cd3254c0..bc27737ebc5b385a88527c7aaede7cd3e2e2b68b 100644
--- a/main/argp-standalone/APKBUILD
+++ b/main/argp-standalone/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Hierarchial argument parsing library broken out from glibc"
 url="http://www.lysator.liu.se/~nisse/misc/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev="libtool automake autoconf"
 makedepends="$depends_dev"
diff --git a/main/aria2/APKBUILD b/main/aria2/APKBUILD
index 67d0ebf4fb0a989bcd495aade7af8c47b16b7289..23f71ca73f8801b829e8a33aa41f80585e6ce217 100644
--- a/main/aria2/APKBUILD
+++ b/main/aria2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Download utility for HTTP(S), (S)FTP, Bittorrent, and Metalink"
 url="https://aria2.github.io/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="ca-certificates"
 makedepends="gnutls-dev expat-dev sqlite-dev c-ares-dev"
 checkdepends="cppunit-dev"
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 83447ddf2c48ee17f94d830d43fbea4b775ab3b7..4113918a8232d5d9b7c34d1f65a62d3862197348 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Text based documentation"
 url="http://asciidoc.org/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2 libxml2-utils docbook-xsl"
 makedepends="autoconf"
 subpackages="$pkgname-doc $pkgname-vim::noarch"
diff --git a/main/aspell-de/APKBUILD b/main/aspell-de/APKBUILD
index 7990c46839cb05aa6f15451a65a288f55ab22bb8..49b83ea8486cd118271bb00a10e67f8a1eab1b25 100644
--- a/main/aspell-de/APKBUILD
+++ b/main/aspell-de/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="German dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="aspell-dev"
 source="ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-$pkgver-1.tar.bz2"
diff --git a/main/aspell-fr/APKBUILD b/main/aspell-fr/APKBUILD
index cbd8aa421731f09cc5bbfd13f4cb385c21d4f535..e7a35f9aecf6ad907d40a7c3650969aec9cc7e7f 100644
--- a/main/aspell-fr/APKBUILD
+++ b/main/aspell-fr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="French dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="aspell-dev"
 source="ftp://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_ver.tar.bz2"
diff --git a/main/aspell-ru/APKBUILD b/main/aspell-ru/APKBUILD
index 3cd54e633c63f366096998a0dc95ac1739b5bc87..1e5691d47839386fc8de45ad3b2e49cdab952433 100644
--- a/main/aspell-ru/APKBUILD
+++ b/main/aspell-ru/APKBUILD
@@ -8,7 +8,7 @@ _pkgname=aspell6-ru
 _pkgver=0.99f7-1
 url="http://aspell.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 depends=""
 makedepends="aspell-dev"
diff --git a/main/aspell-uk/APKBUILD b/main/aspell-uk/APKBUILD
index f7ee7e2a0db75080251a97d804fb36b5ba5c272c..b20ee28d162bb98b48cdd3b191a7ebcedf5b7bb8 100644
--- a/main/aspell-uk/APKBUILD
+++ b/main/aspell-uk/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Ukrainian dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="aspell-dev"
 source="ftp://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$pkgver-0.tar.bz2"
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index e9ce10ab024f29855b9b4d65bd5ec8b436e7944d..7fe214a49507e98a3b7a185c0a41f86783acb5d3 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=12
 pkgdesc="A spell checker designed to eventually replace Ispell"
 url="http://aspell.net/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-compat::noarch $pkgname-utils $pkgname-dev $pkgname-doc
 	$pkgname-lang $pkgname-libs"
 depends=
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 9d7b5ce55d6e73653c893a6f786c074176c52a60..44eb44105a1ea136b381fe59603f0407af504429 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -9,7 +9,7 @@ pkgusers="asterisk"
 pkggroups="asterisk"
 url="http://www.asterisk.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 options="!check"  # Test suite is separate, and require separate build
 makedepends="findutils tar wget bsd-compat-headers
diff --git a/main/at-spi2-atk/APKBUILD b/main/at-spi2-atk/APKBUILD
index 29d29c2b00b749133ba7686951327057f471263b..f199b9753a03f15393b23a2fd9f7cd6f4385f054 100644
--- a/main/at-spi2-atk/APKBUILD
+++ b/main/at-spi2-atk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 url="http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="glib-dev dbus-dev atk-dev at-spi2-core-dev"
 makedepends="$depends_dev intltool"
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index 2b6c0f311523ac5bdc4e5b3075012aa33a7dd183..d6719f073dcf9137bf2b1841e3a2a9749f14d2f2 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 url="http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="dbus-dev glib-dev libxtst-dev"
 makedepends="$depends_dev dbus intltool gobject-introspection-dev"
diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD
index 9e2aab44a743100c72b746601a3000307098ff43..8d56da652f446402f4997366d2f95e44605f5ec7 100644
--- a/main/atk/APKBUILD
+++ b/main/atk/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 url="https://www.gtk.org/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="glib-dev gobject-introspection-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/main/atkmm/APKBUILD b/main/atkmm/APKBUILD
index d8750b5e7eaf357a0f6bbb9b7068f42e193c8027..2f5177be9fdca4e9e55dfcce76edd7116e97da89 100644
--- a/main/atkmm/APKBUILD
+++ b/main/atkmm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="C++ bindings for atk"
 url="http://gtkmm.sourceforge.net/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="atk-dev glibmm-dev libsigc++-dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD
index 0a75b5ebfeda95cba767f397245f6d61de168af6..598eee29199a3bac7c12a7ec6b7ab290477d1109 100644
--- a/main/atop/APKBUILD
+++ b/main/atop/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Resource-specific view of processes"
 url="https://www.atoptool.nl/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="zlib-dev ncurses-dev linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index 6551818fecafd34c4b20b7ab4a38711c1bd2375e..0d208a3c3c9f417212f60e154545f0fdee5e4818 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=6
 pkgdesc="Utilities for managing filesystem extended attributes"
 url="https://savannah.nongnu.org/projects/attr"
 arch="all"
-license="GPL2+ LGPL2+"
+license="GPL-2.0-or-later LGPL-2.0-or-later"
 depends=""
 makedepends="libtool autoconf automake bash gzip"
 subpackages="$pkgname-dev $pkgname-doc libattr"
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index a091a5231f29193a9caca3fda74d8714f166c3de..2944f07fce7d7011917b942a23e1b2d5ae2e300e 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="User space tools for 2.6 kernel auditing"
 url="http://people.redhat.com/sgrubb/audit/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev="linux-headers"
 makedepends="$depends_dev swig libcap-ng-dev python3"
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 634e5fd8a4a0fb96055349a8e5c1b92e052b9b17..540591d7929f936f5cbb04963b6806b9440f35fb 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="A configuration editing tool"
 url="http://augeas.net"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="readline-dev libxml2-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-tests::noarch $pkgname-libs"
diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD
index 32084044a07383f429d037770dad41499237adfe..510a108d23b021e1981203024cfa2b6a1cb294c5 100644
--- a/main/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=6
 pkgdesc="A color text mode sound mixer"
 url="http://www.jpj.net/~trevor/aumix.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="ncurses-dev linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/autoconf/APKBUILD b/main/autoconf/APKBUILD
index e1e557365f5f2dec732d27b39f532523eaa73723..c1e78a21a1a26ca5ce33537cf896c0321ca9f7b0 100644
--- a/main/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
@@ -4,7 +4,7 @@ pkgver=2.69
 pkgrel=0
 pkgdesc="A GNU tool for automatically configuring source code"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 url="https://www.gnu.org/software/autoconf"
 depends="m4 perl"
 subpackages="$pkgname-doc"
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index daca4519753f2cb0c97f001ceece5782aec06d64..4763e1dc5f97733b0e7d37150893e0576f932f12 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A GNU tool for automatically creating Makefiles"
 url="https://www.gnu.org/software/automake"
 arch="noarch"
-license="GPL2+ MIT Public Domain"
+license="GPL-2.0-or-later MIT Public-Domain"
 depends="perl"
 makedepends="autoconf"
 subpackages="$pkgname-doc"
diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD
index 766c1e8a29d1ee3c66c61f36753118e7dd07cdb9..b70ae1add274255ff2635a44c8043a4db8d46d86 100644
--- a/main/avahi-ui/APKBUILD
+++ b/main/avahi-ui/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=7
 pkgdesc="Gtk user interface library for Avahi"
 url="http://www.avahi.org/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="gtk+3.0-dev gtk+2.0-dev gdbm-dev avahi-dev"
 makedepends="$depends_dev py-gobject3-dev py-gtk-dev py-dbus-dev intltool
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 4d76fbc2c8414a7c3f5d0b6041c2c4681a20f1bd..07d0c7a6a17b75c29ce2ef0cc9aeb51b9e41ab69 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="A multicast/unicast DNS-SD framework"
 url="http://www.avahi.org/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="gdbm-dev"
 makedepends="py-dbus-dev intltool gobject-introspection-dev expat-dev
diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
index 255b7b2b09e0393313dc04a595c51afef7a6e1bc..b31d7b669191a8848527ea7732160d3ce1ee09ab 100644
--- a/main/avfs/APKBUILD
+++ b/main/avfs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Virtual File System for looking into archives"
 url="http://avf.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="bash"
 makedepends="zlib-dev bzip2-dev fuse-dev"
 subpackages="$pkgname-dev"
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index b871a984ac24e7730c8926474a14da4be0113f67..f04e02278c96fac963a375b2633d959a7e376cd4 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Alpine Wall"
 url="https://git.alpinelinux.org/cgit/awall/"
 _luaver=5.2
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 replaces="awall-nat"
 depends="bind-tools ip6tables ipset iptables lua$_luaver lua$_luaver-alt-getopt lua$_luaver-cjson
          lua$_luaver-pc lua$_luaver-posix lua$_luaver-stringy xtables-addons"
diff --git a/main/awstats/APKBUILD b/main/awstats/APKBUILD
index 880eb8aaa9bd2f23b4ebbcdce215020218aaad0b..2a41a2068451c3f61f4e9bfabc0e77558e0fca93 100644
--- a/main/awstats/APKBUILD
+++ b/main/awstats/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Free real-time logfile analyzer to get advanced statistics"
 url="http://awstats.sourceforge.net/"
 arch="noarch"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends="perl perl-uri"
 subpackages="$pkgname-doc"
 source="https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 36fe92d7a0e89e3b4349d852204d8d9d5b0e0026..459f3be466a5a2bf9d1a903c1825048c594fe36f 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A multiple-connection concurrent downloader"
 url="http://axel.alioth.debian.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/backuppc/APKBUILD b/main/backuppc/APKBUILD
index 9a90f9d7b31bef5801ce54f20690de3b5f8b1875..502eba166e1b356a8ba8e8aa89654336f3655c32 100644
--- a/main/backuppc/APKBUILD
+++ b/main/backuppc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="High-performance, enterprise-grade backup system"
 url="http://backuppc.sourceforge.net/"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="perl busybox rsync perl-archive-zip perl-io-compress
 	perl-libwww perl-file-rsync samba-client"
 pkgusers="backuppc"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index c0c56dadd1e20494454f3a15023dc01241f19f26..19997bee107805bb562be3f770bda7bd3bf92b95 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Enterprise ready, network based backup program"
 url="http://www.bacula.org"
 arch="all"
-license="AGPL3"
+license="AGPL-3.0"
 depends=""
 makedepends="autoconf mariadb-dev ncurses-dev libressl-dev postgresql-dev
 	sqlite-dev zlib-dev lzo-dev acl-dev"
diff --git a/main/bash-completion/APKBUILD b/main/bash-completion/APKBUILD
index 62150d6d94f5a11480a5cdb488268f67af8ac9e9..d8dc08a14e9e44e18ae1a1478ec5499f4522e051 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="Command-line tab-completion for bash"
 url="https://github.com/scop/bash-completion"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="bash"
 depends_dev=
 makedepends="$depends_dev"
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 2ea7567753f9d233b9b4d1fede9d6a98f413206c..51db7f236b0cac454eaa024f01205b105bac72b0 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=5
 pkgdesc="The GNU Bourne Again shell"
 url="https://www.gnu.org/software/bash/bash.html"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends_build="bison flex"
 makedepends_host="readline-dev ncurses-dev"
 depends=""
diff --git a/main/bbsuid/APKBUILD b/main/bbsuid/APKBUILD
index d5f3d58849891ab826cd341c29e8ac8f5951e154..8c64881490517011672b5a6d2950df21b1f30a1b 100644
--- a/main/bbsuid/APKBUILD
+++ b/main/bbsuid/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Obsolete package that can be removed"
 url="https://git.alpinelinux.org/cgit/bbsuid"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="busybox"
 source=""
 
diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD
index 3fb338a929cec04385b4dab2ecb75cfa1829dad5..207cf38dd5c068e1aa01ffe020979f50aa8e063c 100644
--- a/main/bc/APKBUILD
+++ b/main/bc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An arbitrary precision numeric processing language (calculator)"
 url="https://www.gnu.org/software/bc/bc.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="ed flex bison readline-dev texinfo"
 subpackages="$pkgname-doc"
 source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/main/beep/APKBUILD b/main/beep/APKBUILD
index 7c5cac17376e4d01da9c264b8ac00168e76219c8..aa0195eeea102bbbcdaf528e8bf094d1959e854d 100644
--- a/main/beep/APKBUILD
+++ b/main/beep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A terminal bell"
 url="http://johnath.com/beep"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index e1cfd6df41a77bc5d0e80d60cf41567bfd5d6f57..8f1efb3ebe20cbda71fa035252c4c681da6a4135 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -9,7 +9,7 @@ makedepends_build="bison flex texinfo"
 makedepends_host="zlib-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="all"
-license="GPL2 GPL3+ LGPL2 BSD"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-gold"
 source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
 	binutils-ld-fix-static-linking.patch
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index 6a1485534ba1a942eda83976aceb39d3d9f67d6b..fea2c90b45dc42e9a08e441e0f1d4b80885d8f1e 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -5,7 +5,7 @@ pkgver=3.0.4
 pkgrel=0
 pkgdesc="The GNU general-purpose parser generator"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 url="https://www.gnu.org/software/bison/bison.html"
 makedepends="perl"
 depends="m4"
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index a6e49d035bdf62f3ca7ec4414bdcbcaaf7fc881d..17de0c2f5c8e55265dc81506329b8f38905e73f1 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="An IRC to other chat networks gateway"
 url="https://www.bitlbee.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="glib-dev libressl-dev libotr-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-otr"
 source="http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz
diff --git a/main/bluez-firmware/APKBUILD b/main/bluez-firmware/APKBUILD
index a71a121bc762e239d4ce47f7e98b9df4202ec39b..d0e3d4a272dc4a30b22bde95e4454f12feae05ac 100644
--- a/main/bluez-firmware/APKBUILD
+++ b/main/bluez-firmware/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Firmware for Broadcom BCM203x Blutonium devices"
 url="http://www.bluez.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 source="http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz"
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index d4614715c7ea925766adc55a20a728c628020575..07975e4d1226f99bc1e55b4c3e23e9bf73ad0293 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="Tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="consolekit2 dbus"
 replaces="udev"
 makedepends="dbus-dev libusb-compat-dev eudev-dev json-c-dev
diff --git a/main/bmd-tools/APKBUILD b/main/bmd-tools/APKBUILD
index bac6d6998907e4c18cbd413e7665473c0a63f0b2..0636e6c5f83f22b4a6e790f3e67a0b55efa4052c 100644
--- a/main/bmd-tools/APKBUILD
+++ b/main/bmd-tools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Tools for Blackmagic USB video encoders"
 url="https://github.com/fabled/bmd-tools"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 makedepends="libusb-dev"
 install=""
diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 616733621f52a0979e9cbb02bd89bd6e217ec1bc..890bd41840dbd6a1ceeec4fc70deb94b51456139 100644
--- a/main/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
 url="https://www.kernel.org/pub/linux/utils/net/bridge-utils/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends=""
 makedepends="autoconf linux-headers"
diff --git a/main/brlaser/APKBUILD b/main/brlaser/APKBUILD
index a60ec8247d3766bdbf0f95ceedcb7584b3a1b883..e64c279aac313b0b6913d8dbbb824323b7e7b2a2 100644
--- a/main/brlaser/APKBUILD
+++ b/main/brlaser/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Driver for Brother printers like the DCP 7030 and DCP 7065"
 url="https://github.com/pdewacht/brlaser"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="cups-filters"
 depends_dev=""
 makedepends="$depends_dev cups-dev automake autoconf"
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 4fdc00fb7c1e5cd69d0a36a4b4c8ea79335cf4b0..7e9eb556b7d55f6cbb03ea803d7233d89eda045e 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="BTRFS filesystem utilities"
 url="https://btrfs.wiki.kernel.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="linux-headers"
 makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index c7be784450c3efdb7ac00dbae0d8f4590bf7affa..72e5970737c88c430708e61f27b6a49a4b29b196 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Init scripts for busybox daemons"
 url="https://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="busybox openrc"
 makedepends=""
 install="$pkgname.post-install $pkgname.post-upgrade"
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 412bfa2bc918af42297983e5a09774ca6c70d3e4..2cf97a32d801f9dacb84fb701ccf1174c139840a 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=7
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends_build=""
 makedepends_host="linux-headers"
 makedepends="$makedepends_build $makedepends_host"
diff --git a/main/bwm-ng/APKBUILD b/main/bwm-ng/APKBUILD
index 0457707b1dda75ab423e95b8a8e08444a7ce2529..bcaf7494a349fc39ed07aa3871d7a69c85938ddb 100644
--- a/main/bwm-ng/APKBUILD
+++ b/main/bwm-ng/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="A small and simple console-based live bandwidth monitor"
 url="http://www.gropp.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends=""
 makedepends="ncurses-dev"
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index 6c2f62332fcb8d0ef94b2be49958b4c0b6450271..7bc0c42a727344882b440486b70934097c38ae0e 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="The Berkeley Yacc general-purpose parser generator"
 url="http://invisible-island.net/byacc/byacc.html"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 depends="!bison"
 subpackages="$pkgname-doc"
 source="https://invisible-mirror.net/archives/byacc/byacc-$pkgver.tgz"
diff --git a/main/byobu/APKBUILD b/main/byobu/APKBUILD
index 800bafd8bb545a6610a1b6de615f33ef02b1170a..317a48641024cff2ff53368b9310eda4587f8aba 100644
--- a/main/byobu/APKBUILD
+++ b/main/byobu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An enhancement of the GNU Screen"
 url="https://launchpad.net/byobu"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="python3 tmux"
 subpackages="$pkgname-doc"
 source="http://launchpad.net/byobu/trunk/$pkgver/+download/byobu_$pkgver.orig.tar.gz"
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index 3c0145676e0ddeccd240ef0bf4515237d3ace9b0..a889e7c0cd259b79c5f263cc0e717f40dbb5893c 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Common CA certificates PEM files"
 url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
 arch="all"
-license="MPL 2.0 GPL2+"
+license="MPL-2.0 GPL-2.0-or-later"
 depends=""
 makedepends="python3 libressl-dev"
 subpackages="$pkgname-doc"
diff --git a/main/cabextract/APKBUILD b/main/cabextract/APKBUILD
index 5b98c47e43931ad4de7d33c071540ba15e55cd1e..b954fb03d65204c9f0703ce98dad115d27e6a790 100644
--- a/main/cabextract/APKBUILD
+++ b/main/cabextract/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Tool for extracting Microsoft cabinet files"
 url="https://www.cabextract.org.uk/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 makedepends="libmspack-dev"
 source="https://www.cabextract.org.uk/$pkgname-$pkgver.tar.gz"
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 6fd806e3dd0413128e110fb3ce3a6ba9b352dde2..3c7d1059c2f17bde59735e8bf47ccdf1007ebdf2 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A vector graphics library"
 url="http://cairographics.org/"
 arch="all"
-license="LGPL2+ MPL 1.1"
+license="LGPL-2.0-or-later MPL-1.1"
 depends=
 depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev
 	xcb-util-dev libxext-dev $pkgname-tools"
diff --git a/main/cairomm/APKBUILD b/main/cairomm/APKBUILD
index 2a58ebff9819f9cc7906a00261e50898d5d4ec8e..be59ab6b4b72a7e28a3f434646d23afb672d3d37 100644
--- a/main/cairomm/APKBUILD
+++ b/main/cairomm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="C++ bindings to Cairo vector graphics library"
 url="http://www.cairographics.org"
 arch="all"
-license="LGPL2+ MPL 1.1"
+license="LGPL-2.0-or-later MPL-1.1"
 depends=""
 depends_dev="libsigc++-dev"
 makedepends="$depends_dev cairo-dev perl"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index a19439a332c77707065c44551f5351dc1319fdf2..725a5003162e293c494a601c0bc1daed3d8ae205 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A fast C/C++ compiler cache"
 url="http://ccache.samba.org/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="zlib-dev"
 subpackages="$pkgname-doc"
 source="http://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD
index b39c9f250e81e859a902af9047c7d2090721d34d..71c0e83167edd4f8b2cf446db2483963c9fba6ab 100644
--- a/main/cciss_vol_status/APKBUILD
+++ b/main/cciss_vol_status/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Drivers for the HP (previously Compaq) Smart Array controllers which provide hardware RAID capability"
 url="http://cciss.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/cciss/$pkgname-$pkgver.tar.gz"
diff --git a/main/cd-discid/APKBUILD b/main/cd-discid/APKBUILD
index 755c696a1e85a19d39e3dcd49d1dca8a50d1c2b7..c37688467268105676b42d9e3b7fccf17dd19bcc 100644
--- a/main/cd-discid/APKBUILD
+++ b/main/cd-discid/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="A backend utility to get CDDB discid information from a CD-ROM disc"
 url="http://linukz.org/cd-discid.shtml"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
 source="http://linukz.org/download/${pkgname}-${pkgver}.tar.gz"
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
index f79e822081a6f35c0c6605c32d4012af6af89007..b0fb2caabdaa4bcf119982fbbe4cd790539c1051 100644
--- a/main/cdparanoia/APKBUILD
+++ b/main/cdparanoia/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=7
 pkgdesc="An audio CD extraction application"
 url="http://www.xiph.org/paranoia"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="libtool autoconf automake linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 patches="gcc.patch fix-includes.patch"
diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index 6b099b604def1775edcce46ae0dd42b441f145e2..33479cad5164c0c2122f5f4629bce80550169026 100644
--- a/main/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
 url="http://cdrkit.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="file bzip2"
 makedepends="cmake libcap-dev bzip2-dev zlib-dev"
 subpackages="$pkgname-doc"
diff --git a/main/cdw/APKBUILD b/main/cdw/APKBUILD
index 2f65b15568f4c11b626f9525abc6363816812ab7..54e1797065fcaad22367b7f9099b04fa111ab57a 100644
--- a/main/cdw/APKBUILD
+++ b/main/cdw/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="cdw is a front-end for cd recoding tools"
 url="http://cdw.sf.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="cdrkit"
 depends_dev="ncurses-dev libcdio-dev libburn-dev bison gettext-dev"
 makedepends="$depends_dev linux-headers"
diff --git a/main/cegui06/APKBUILD b/main/cegui06/APKBUILD
index b44b30bd062b32c5747cc41774880dc56be715b2..dd2ab3d44bd4ed0ef34bf22bdd2a3ee7554b1502 100644
--- a/main/cegui06/APKBUILD
+++ b/main/cegui06/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=14
 pkgdesc="CEGUI library 0.6 for apps which need this specific version"
 url="http://www.cegui.org.uk"
 arch="all"
-license="MIT LGPLv2+"
+license="MIT LGPL-2.0-or-later"
 depends=""
 makedepends="freetype-dev pcre-dev expat-dev libice-dev libsm-dev glew-dev
 	mesa-dev glu-dev lua-dev"
diff --git a/main/cgdb/APKBUILD b/main/cgdb/APKBUILD
index 2c56c6151253aac14e3780829c95231a402676bc..ce04e0707ccbbf16d0d8a498e61caae621985620 100644
--- a/main/cgdb/APKBUILD
+++ b/main/cgdb/APKBUILD
@@ -5,7 +5,7 @@ pkgver=0.7.0
 pkgrel=1
 pkgdesc="The Curses Debugger"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 url="http://cgdb.sourceforge.net/"
 depends="gdb"
 makedepends="flex bison texinfo help2man ncurses-dev readline-dev"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index b405837f921507f09d7cb79def30f82ed1e68932..d0e5a7901380d351270a504e689a0a04312728dc 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -7,7 +7,7 @@ _gitver=2.10.2
 pkgdesc="A fast webinterface for git"
 url="https://git.zx2c4.com/cgit/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libressl-dev zlib-dev lua5.3-dev asciidoc"
 subpackages="$pkgname-doc"
 source="http://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index 587d35c692e4bf41a7b9ea0d74aa9507f461e5da..b8e8e40da804416ff020f7d43f1c740cde51f7af 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A highly-scalable IRCv3-compliant IRC daemon"
 url="http://atheme.org/projects/charybdis.html"
 arch="all"
-license="BSD GPL2"
+license="BSD GPL-2.0"
 pkgusers="ircd"
 makedepends="bison flex libressl-dev zlib-dev libtool file"
 install="$pkgname.pre-install"
diff --git a/main/check/APKBUILD b/main/check/APKBUILD
index 1aa9a1271920db26b7f17fe2f6e81adf23b2404f..0a63738da22b68978d1faf6b6914732e88f31a63 100644
--- a/main/check/APKBUILD
+++ b/main/check/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A unit test framework for C"
 url="https://libcheck.github.io/check/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="pkgconfig"
 checkdepends="diffutils gawk"
 subpackages="$pkgname-doc $pkgname-dev"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
index fb65583cb2a3bdb086927f7a31c4dc39cabfaeb8..b0d95b85a32cefb06844b719c4bacee213a18b07 100644
--- a/main/checkbashisms/APKBUILD
+++ b/main/checkbashisms/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=5
 pkgdesc="Basic checks on shell scripts for the presence of non portable syntax"
 url="https://sourceforge.net/projects/checkbaskisms/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl"
 source="http://downloads.sourceforge.net/project/checkbaskisms/$pkgver/checkbashisms
 	checkbashisms-perl-5.26.patch"
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 0cf797dd929465e55fab5613af5e093afb966f5e..937921b5a08a4d278d538d83a9e0b22742da7505 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -10,7 +10,7 @@ url="https://chrony.tuxfamily.org/"
 pkgusers="$pkgname"
 pkggroups="$pkgname"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 depends=""
 makedepends="libcap-dev texinfo asciidoctor"
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index a25f246b6e69098512e63066b4c5f8f936bc7296..3c6fcfaab0a7a2432d243b2baaa8783ad891cf25 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="libcap-dev keyutils-dev krb5-dev talloc-dev
 	autoconf automake"
 subpackages="$pkgname-doc $pkgname-dev"
diff --git a/main/ciwiki/APKBUILD b/main/ciwiki/APKBUILD
index 65878da6366364fb68d7f891845139a038c29664..04d04b296e46187dd906968874201c0aa68796f9 100644
--- a/main/ciwiki/APKBUILD
+++ b/main/ciwiki/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A personal lightweight wiki written in C"
 url="http://ciwiki.sourceforge.net/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 options="!check"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz"
diff --git a/main/cjdns/APKBUILD b/main/cjdns/APKBUILD
index 9c4977465202caceea2ab9010254cf54d86dbdde..ff373e9815b7c899f70e09c31dbbca9342644351 100644
--- a/main/cjdns/APKBUILD
+++ b/main/cjdns/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A routing engine designed for security, scalability, speed and ease of use"
 url="https://github.com/cjdelisle/cjdns"
 arch="all !x86 !s390x"
-license="GPL3"
+license="GPL-3.0"
 makedepends="nodejs python2 linux-headers libseccomp-dev"
 install="$pkgname.post-install"
 subpackages="$pkgname-doc"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 2ede77741c61b062caa0593d698edb151540820c..ee959e3555fc8d1b0dce3a84c81949804abc1f27 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Compile a XKB keyboard description to a keymap"
 url="http://anonscm.debian.org/cgit/d-i/console-setup.git/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl"
 options="!check"
 source="http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_${pkgver}.tar.xz"
diff --git a/main/cksfv/APKBUILD b/main/cksfv/APKBUILD
index 9a4d0b6bd804bf2bc46d3f5ba3abefd2231ee922..35e3bbe29e821d8ad9840830e94714efafba62e5 100644
--- a/main/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Simple File Verification"
 url="http://zakalwe.fi/~shd/foss/cksfv"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.bz2"
 
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index f83012ad34fa8d7ef22de269beea74f8c7b2ea34..be159c5af69bd1ee8c044a6e13c63c552e4cc0e0 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -10,7 +10,7 @@ pkggroups="clamav"
 pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
 url="http://www.clamav.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="$pkgname-scanner $pkgname-daemon"
 depends_dev="libressl-dev"
 install="freshclam.pre-install
diff --git a/main/cloog/APKBUILD b/main/cloog/APKBUILD
index a97cedbb0950e284d4bc6f474b96119764f1f409..d39df3ba4e62a8a834e448168625c3effaccf6bd 100644
--- a/main/cloog/APKBUILD
+++ b/main/cloog/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="The Chunky Loop Generator"
 url="http://www.cloog.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev="gmp-dev isl-dev"
 makedepends_host="$depends_dev"
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index 7dc4cd212938e0e40319eb2d510522008870a023..4d3564916dd461493beeee77ff9f70a2db07ffec 100644
--- a/main/clucene/APKBUILD
+++ b/main/clucene/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="A C++ port of Lucene"
 url="http://www.sourceforge.net/projects/clucene"
 arch="all"
-license="LGPLv2+ or ASL 2.0"
+license="LGPL-2.0-or-later or Apache-2.0"
 depends=""
 depends_dev="zlib-dev boost-dev"
 makedepends="cmake $depends_dev"
diff --git a/main/cmocka/APKBUILD b/main/cmocka/APKBUILD
index e6bed5b8b02d3f3bc833ecae9946b3f6b06b0ada..c1eb47aceca7b71b5575837339e337fceee37057 100644
--- a/main/cmocka/APKBUILD
+++ b/main/cmocka/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="An elegant unit testing framework for C with support for mock objects"
 url="https://cmocka.org/"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends=""
 makedepends="cmake"
 subpackages="$pkgname-dev"
diff --git a/main/cmph/APKBUILD b/main/cmph/APKBUILD
index b1e5bbb3e5a7049e7911d35b831bd8674dade88d..d8efbc27dcc6eaf49ad6d57371f65b83e67c87c6 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A minimal hash C library - utility application"
 url="http://cmph.sourceforge.net/"
 arch="all"
-license="LGPL2+ MPL1.1"
+license="LGPL-2.0-or-later MPL-1.1"
 subpackages="$pkgname-dev $pkgname-doc libcmph:lib"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
diff --git a/main/cogl/APKBUILD b/main/cogl/APKBUILD
index cf8c5b2532721db6c432d12c6911f91cf02392ff..07c7016b1861a954a98a05f270169b6f8bbafaa2 100644
--- a/main/cogl/APKBUILD
+++ b/main/cogl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 url="http://www.clutter-project.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="glib-dev mesa-dev libdrm-dev libxdamage-dev libxcomposite-dev
 	libxrandr-dev gdk-pixbuf-dev
diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD
index 75899f8c1e4a9f808c81659db40334ad5f03dee9..7fa4887962d67d1ac48f992cf0966e56a4b80f4b 100644
--- a/main/collectd/APKBUILD
+++ b/main/collectd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The system statistics collection daemon"
 url="http://collectd.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="curl-dev net-snmp-dev postgresql-dev perl-dev python2-dev
 	libgcrypt-dev mariadb-dev zlib-dev libressl-dev iptables-dev
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 4b3398ef4b01023acf678e350a385326b769bd1f..58c2b11b0eb5142ad0033b15fbfd2e47db7155dc 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Connection tracking userspace tools"
 url="http://conntrack-tools.netfilter.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends=
 makedepends="linux-headers libnfnetlink-dev libnetfilter_conntrack-dev bison flex
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index 1ee2c94b7d34ebdd8057437ba628979ec17fc453..e06a30c79dd451f2f35b340190ceed8350563e10 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="perl libressl-dev autoconf automake libtool curl-dev
 	linux-headers gengetopt-dev"
 install="$pkgname.pre-install"
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 22976d51599a7bb978a28dc0af57860d6cac145f..c439c9908a92dbcf1044681a8becda0118d9f62a 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="The basic file, shell and text manipulation utilities"
 url="https://www.gnu.org/software/coreutils/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="bash acl-dev perl"
 subpackages="$pkgname-doc"
 install="$pkgname.post-deinstall"
diff --git a/main/cppunit/APKBUILD b/main/cppunit/APKBUILD
index cbbf989affa5a7c2fa8c3042992ae4b0baf40589..625a1b53502e6612a5d75a3a1e23c733f7dcf3a1 100644
--- a/main/cppunit/APKBUILD
+++ b/main/cppunit/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="C++ unit testing framework"
 url="http://www.freedesktop.org/wiki/Software/cppunit/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.gz"
 
diff --git a/main/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
index 1fe3792c2f6864815574f1f807300886bfacf9fa..6feacd5b6938a6c64d1a3b6fbea791d8e53426f1 100644
--- a/main/cpufreqd/APKBUILD
+++ b/main/cpufreqd/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="A small daemon to adjust cpu speed (and indeed voltage)"
 url="https://sourceforge.net/projects/cpufreqd"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends=
 makedepends="cpufrequtils-dev sysfsutils-dev"
diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
index 2a2843030c7c23ba2e7ec41e9e94857af0195fb9..f339ff377640d469e93106400de1c135e71c899c 100644
--- a/main/cpufrequtils/APKBUILD
+++ b/main/cpufrequtils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="Userspace tools for the kernel cpufreq subsystem"
 url="https://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc"
 depends="sysfsutils"
 makedepends="sysfsutils-dev libtool"
diff --git a/main/cpulimit/APKBUILD b/main/cpulimit/APKBUILD
index 0973fd3881ead066d04da21957c40e0f052d4d2c..e823d646ac1d68110bd816565d4a602cd1064a09 100644
--- a/main/cpulimit/APKBUILD
+++ b/main/cpulimit/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="CPU usage limiter for Linux"
 url="https://github.com/opsengine/cpulimit"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/cracklib-words/APKBUILD b/main/cracklib-words/APKBUILD
index 76b6858c6c6b5509bdec5e625d4f8ab875af52f3..953c33a7ec010b2e60c3270e0514e2839ecce841 100644
--- a/main/cracklib-words/APKBUILD
+++ b/main/cracklib-words/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Large list of words for crack/craclib"
 url="https://sourceforge.net/projects/cracklib"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends=""
 install=""
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index 5af7e9571ab233293af874c9fb95ef1a81e265e5..f4b5084a8b86af4bb711bee731087651300112d9 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A library used to enforce strong passwords"
 url="https://sourceforge.net/projects/cracklib"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends=""
 install=
diff --git a/main/crconf/APKBUILD b/main/crconf/APKBUILD
index adb861182669f2741d3b6cb0ac3f33148220dfb8..360dda89f2b5826592cc1b32d86bdcf41fd9d5ca 100644
--- a/main/crconf/APKBUILD
+++ b/main/crconf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Linux crypto layer configuration tool"
 url="https://sourceforge.net/projects/crconf/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 source="http://downloads.sourceforge.net/project/crconf/crconf-$_realver.tar.gz"
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 78469efd200e5a1af30024c0025ffe563f3fb93f..3e74139c579e541949af4c21316d6b78239fbdf9 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 url="https://gitlab.com/cryptsetup/cryptsetup"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends_build=""
 makedepends_host="lvm2-dev libressl-dev popt-dev util-linux-dev"
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index bfa03befddd1e351a9c2dd1d0eda427889a57b5f..21d566e544e4098b4155023886fd4a4964bc39bd 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=5
 pkgdesc="Generator of tags for all types of C/C++ languages"
 url="http://ctags.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/main/cunit/APKBUILD b/main/cunit/APKBUILD
index 902129812ebf3b79eb01c5a74aa7ee8c6aac347c..08b9075a67efb0f0fa55ca902a2d95e8128b3031 100644
--- a/main/cunit/APKBUILD
+++ b/main/cunit/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Automated testing framework for C"
 url="http://cunit.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="automake autoconf libtool bash"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/project/$pkgname/$_pkgname/$_pkgver/$_pkgname-$_pkgver.tar.bz2
diff --git a/main/cups-filters/APKBUILD b/main/cups-filters/APKBUILD
index 54c71d462bda46f03145b79e56409f6f37196aa2..394a52f423f8de738f7c846b31aa3bd193ae232d 100644
--- a/main/cups-filters/APKBUILD
+++ b/main/cups-filters/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="OpenPrinting CUPS filters and backends"
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format"
 arch="all"
-license="GPLv2 and GPLv2+ and GPLv3 and MIT"
+license="GPL-2.0 and GPL-2.0-or-later and GPL-3.0 and MIT"
 # while textonly is originally a bash script, it only needs a few changes
 # to work with any shell (dash being the problematic one)
 # foomatic-rip needs "a modern shell" in case the PPD requires some
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index e6ea7c5d10761703369676d55cff453f820bae6f..c57821209fc31b70a66bf3261350603d17e7a0f2 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="The CUPS Printing System"
 url="https://www.cups.org/"
 arch="all"
-license="GPL LGPL2+"
+license="GPL LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
 	$pkgname-lang"
 depends_dev="libgcrypt-dev gnutls-dev zlib-dev"
diff --git a/main/cutter/APKBUILD b/main/cutter/APKBUILD
index 4266acd8bc7f102a2097f1e8ad3160512a9e0b6c..4b29f3be32854d990be3c20316b70a8074902c0b 100644
--- a/main/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A program that allows firewall administrators to abort TCP/IP connections"
 url="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD
index af186f380627cb2bccce7312b794bdc132511db7..e8468cc6e301c3c4be3b3294edb5cd6d3ceb9d1d 100644
--- a/main/cvechecker/APKBUILD
+++ b/main/cvechecker/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A local CVE checker tool"
 url="https://github.com/sjvermeu/cvechecker/wiki"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="gawk wget libxslt"
 makedepends="libconfig-dev sqlite-dev libressl-dev mariadb-dev argp-standalone"
 install="$pkgname.pre-install $pkgname.post-install"
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
index b7fbfcc2b691d4b5523f4ed05fd578736337e8d8..45c2967f9bc8b46fa88213521ba8a9b69d70ef54 100644
--- a/main/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Concurrent Versions System"
 url="http://www.nongnu.org/cvs/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="zlib-dev"
 install=
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index ebeb231370b9e9b61e1e4ec476407cb55c000f75..9b1c4d59a121da2bf0a9e41a8861bfcecdd539fd 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
 url="http://cython.org"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends=""
 depends_dev="python2-dev py-pgen cython"
 makedepends="$depends_dev"
diff --git a/main/d-feet/APKBUILD b/main/d-feet/APKBUILD
index 0d8ae2ca351c7441cc6d50d79c8034d73d8139da..41236c16e58ac15a2cb5666dd377750d15640c7f 100644
--- a/main/d-feet/APKBUILD
+++ b/main/d-feet/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A powerful D-Bus Debugger"
 url="http://live.gnome.org/DFeet/"
 arch="noarch"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="python2 py-gobject3"
 makedepends="py-gobject3-dev itstool gtk+3.0-dev gobject-introspection-dev
 	libxml2-utils"
diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD
index ea8e020db55469f6ea3a926648a08ab5ee8340e7..4d7d2f19fa4135f23d25ffefd27bd13980ca7120 100644
--- a/main/daq/APKBUILD
+++ b/main/daq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Data Acquisition library - packet I/O library"
 url="https://www.snort.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="libpcap-dev flex bison"
 install=""
diff --git a/main/darkice/APKBUILD b/main/darkice/APKBUILD
index 6feb2c2e5feaa6f40651ccceb3e3b63f6c99e5d4..3a3a444e07721cc32f1f9d848c5ce7640a9cb9b8 100644
--- a/main/darkice/APKBUILD
+++ b/main/darkice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Live audio streamer. Records audio from an audio interface, encodes it and sends it to a streaming server"
 url="http://www.darkice.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=
 makedepends="alsa-lib-dev faac-dev lame-dev libvorbis-dev"
 install=""
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index a82fb1e78c3a3c00b1d726b4a4e75ad3f8271089..bb49d94d08dfc1c0e64febe93f51402a6202bb57 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A low-level configuration system."
 url="http://live.gnome.org/dconf"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=""
 makedepends="glib-dev dbus-dev docbook-xsl vala"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/ddate/APKBUILD b/main/ddate/APKBUILD
index ecc23d221cc1cf322ac0518816bb4c72c4bf73de..25e1f9d07111aa2615cc2fc56e6459236e5f9a5c 100644
--- a/main/ddate/APKBUILD
+++ b/main/ddate/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Convert Gregorian dates to Discordian dates"
 url="https://github.com/bo0ts/ddate"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 depends=""
 depends_dev=""
 makedepends="$depends_dev cmake"
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index 064fa35c474546c73b7dd08c10627b080fcdcf37..ae91294dc2f3f4fec3dc3b60046e0916c4be35da 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Debian/Ubuntu bootstrap scripts"
 url="https://packages.qa.debian.org/d/debootstrap.html"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="debian-archive-keyring dpkg tar"
 makedepends=""
 subpackages="$pkgname-doc"
diff --git a/main/dejagnu/APKBUILD b/main/dejagnu/APKBUILD
index 87c264a078592634e9b9a9bfb8a458250a54a6f2..13c78942a7d317469fb169ab5a237c6e273e981d 100644
--- a/main/dejagnu/APKBUILD
+++ b/main/dejagnu/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A framework for testing other programs"
 url="https://www.gnu.org/software/dejagnu/"
 arch="noarch"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends="expect"
 makedepends="tcl>=8.5"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/dev86/APKBUILD b/main/dev86/APKBUILD
index e9f360a597cba36242b9264113121b8a262fb4f4..77a70909beddd49f3baaadb5247d58ecf8a649e6 100644
--- a/main/dev86/APKBUILD
+++ b/main/dev86/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A real mode 80x86 assembler and linker"
 url="http://v3.sk/~lkundrak/dev86/"
 arch="all"
-license="GPL+ and GPLv2+ and LGPLv2+"
+license="GPL+ and GPL-2.0-or-later and LGPL-2.0-or-later"
 depends=
 makedepends="bash coreutils"
 install=""
diff --git a/main/dhcpcd-ui/APKBUILD b/main/dhcpcd-ui/APKBUILD
index 445382bd58f19b5ba083a86aa21551feaa760700..ce7f204239d2ac5a78926609f7ddd718eb4751aa 100644
--- a/main/dhcpcd-ui/APKBUILD
+++ b/main/dhcpcd-ui/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd"
 url="https://roy.marples.name/projects/dhcpcd-ui"
 arch="all"
-license="BSD-2"
+license="BSD-2-Clause"
 depends="dhcpcd-dbus hicolor-icon-theme"
 makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev bsd-compat-headers"
 install=
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 65db52da6cacbf80e2add1efdace74a5df08900d..649ab5c389fb216911de7bfe0d4799cf3ee9487a 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client"
 url="https://roy.marples.name/projects/dhcpcd/"
 arch="all"
-license="BSD-2"
+license="BSD-2-Clause"
 depends=""
 depends_dev=""
 makedepends="$depends_dev linux-headers bsd-compat-headers dbus-dev"
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 042f5136e6702551a13d513581acc0c56049cae3..3a376440028a64cfd28cd545a9e78b901d9d8d32 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Show differences among files"
 subpackages="$pkgname-doc"
 url="https://www.gnu.org/software/diffutils/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 options="!check"
 source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 builddir=$srcdir/$pkgname-$pkgver
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index a116779c8891f4fdb713fcfcafd4afb77e8d06a9..9fdcd0058c81b0ffc5f50f588a3368e80ce10a26 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=12
 pkgdesc="A distributed C, C++, Obj C compiler"
 url="https://github.com/distcc/distcc"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="autoconf automake popt-dev python2-dev"
 install="$pkgname.pre-install"
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index 033ea6cd39e2cb36c3d61889c75c541fec29e978..b50c1827bf3dd6b74b1a4077e3ca0e74e42d9043 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=47
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 arch="all"
-license="public-domain"
+license="Public-Domain"
 subpackages="djbdns-common tinydns dnscache $pkgname-doc"
 source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
 http://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 3644d718f934b909009c710f08363d179d090027..931c6bdf87cb3656c178a5fb3018be7977afa44e 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -17,7 +17,7 @@ pkgrel=1
 pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
 url="http://www.thekelleys.org.uk/dnsmasq/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="!$pkgname-dnssec"
 makedepends="linux-headers nettle-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
diff --git a/main/dnssec-root/APKBUILD b/main/dnssec-root/APKBUILD
index bdca169d59333968dd1733709067d19885d6f363..7da9cfdf6978e5670bbae54dd794db1111f32547 100644
--- a/main/dnssec-root/APKBUILD
+++ b/main/dnssec-root/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="The DNSSEC root key(s)"
 url="https://www.iana.org/dnssec/"
 arch="noarch"
-license="public-domain"
+license="Public-Domain"
 depends=""
 makedepends="libxslt gnupg bind-tools"
 install=""
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index fdbc46b4286b40c8f16f9ed3ca686c5b11d1ccf6..be50fbc1c18935eedd3608ef1908dcc40a1cd136 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="DOS filesystem utilities"
 url="https://github.com/dosfstools/dosfstools"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 makedepends="linux-headers autoconf automake libtool"
 subpackages="$pkgname-doc"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 57adfdf239126a60df44925b27396be220a86dce..93dcb396ce5006ee0622a548844b4fc5baffbb13 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -13,7 +13,7 @@ pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 arch="all"
 options="!check"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="libressl"
 pkgusers="dovecot dovenull"
 pkggroups="dovecot dovenull"
diff --git a/main/dtc/APKBUILD b/main/dtc/APKBUILD
index 2d3192ed07643d824073a7278f80ead40b99e123..bcaf843f29793d16e0d1fbd5cf9b2a801f1e983d 100644
--- a/main/dtc/APKBUILD
+++ b/main/dtc/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Device Tree Compiler"
 url="http://devicetree.org/Device_Tree_Compiler"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev bison flex"
diff --git a/main/duply/APKBUILD b/main/duply/APKBUILD
index cf9c4242f0203324ba5f2ccdaeb992f10cddc37d..74ed9bb501c5e56b356f6237c33db34762b66763 100644
--- a/main/duply/APKBUILD
+++ b/main/duply/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Wrapper for duplicity"
 url="http://duply.net"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends="duplicity bash"
 depends_dev=""
 makedepends="$depends_dev txt2man"
diff --git a/main/dvgrab/APKBUILD b/main/dvgrab/APKBUILD
index 2f01f14050f3eb39bf7adc4840e17bab7bf9a198..aca6f6246bc2a62559e7fdd2c90f0551694b8b9b 100644
--- a/main/dvgrab/APKBUILD
+++ b/main/dvgrab/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Utility to capture video from a DV camera"
 url="http://www.kinodv.org/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=
 makedepends="libraw1394-dev libavc1394-dev libdv-dev libiec61883-dev
 	libjpeg-turbo-dev"
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index 7e3b2a06836473050c1f1db3a3f4105b6811f1de..2f962d54262ff335d69ba25334c2429fab595d5f 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A collection of utilities and DSOs to handle ELF files and DWARF data"
 url="http://elfutils.org/"
 arch="all"
-license="GPLv3+ and (GPLv2+ or LGPLv3+)"
+license="GPL-3.0-or-later and (GPL-2.0-or-later or LGPL-3.0-or-later)"
 depends=""
 makedepends="bison flex-dev zlib-dev bzip2-dev xz-dev argp-standalone
 	bsd-compat-headers autoconf automake libtool"
diff --git a/main/email2trac/APKBUILD b/main/email2trac/APKBUILD
index 22711a94788b7236878cac932c095f190007c1c7..6e788d8f7261fb62a8e75cb56467e27b36415102 100644
--- a/main/email2trac/APKBUILD
+++ b/main/email2trac/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Utilities for converting emails to trac tickets"
 url="https://subtrac.sara.nl/oss/email2trac"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="trac"
 makedepends="python2"
 install=""
diff --git a/main/enchant/APKBUILD b/main/enchant/APKBUILD
index 01c340248fafc460f8be2025f1c58351be2fb62c..ca4538763785d13fa23bf41ba9710060c5846772 100644
--- a/main/enchant/APKBUILD
+++ b/main/enchant/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=12
 pkgdesc="A wrapper library for generic spell checking"
 url="http://www.abisource.com/enchant/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=""
 depends_dev="glib-dev"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index ffa6a1ec2f4cfa4aba8e11d1ebbc95d5ef559764..fa7ad43de5b5a56ecc1011bd15b8b787d01c2b2f 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Speech synthesizer for English and other languages"
 url="http://espeak.sourceforge.net/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 subpackages="$pkgname-dev"
 depends=
 makedepends=
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 24f005bb6429ba3cfea200413c35f1c1f4d5c9ac..19de8204455cb6091d76145a89c1a13c161345ed 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="gkernel ethtool"
 url="https://sourceforge.net/projects/gkernel/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="linux-headers"
 source="http://www.kernel.org/pub/software/network/ethtool/ethtool-$pkgver.tar.xz"
 subpackages="$pkgname-doc"
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index 5e78c15fc447cf45134025078697f0f80082fa62..482d5008f9404075e9d02d80ce6f740e12646acd 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="OpenRC compatible fork of systemd-udev"
 url="https://wiki.gentoo.org/wiki/Project:Eudev"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="udev-init-scripts"
 depends_dev=""
 replaces="udev"
diff --git a/main/exiv2/APKBUILD b/main/exiv2/APKBUILD
index 2acba1eddf277363d5b2c0c426e166433bd04007..f92028869f9ece41cc60b44f6b55b9c0e0810d17 100644
--- a/main/exiv2/APKBUILD
+++ b/main/exiv2/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Exif and Iptc metadata manipulation library and tools."
 url="http://exiv2.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev="expat-dev zlib-dev"
 makedepends="$depends_dev bash"
diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD
index ba972439322eec63f407a175d60e01791ca95b71..8dc131e2475456d8bc483cae0c153b54b67630fd 100644
--- a/main/exo/APKBUILD
+++ b/main/exo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Extensions to Xfce by os-cillation"
 url="http://www.os-cillation.com/article.php?sid=40"
 arch="all"
-license="GPL2 LGPL-2"
+license="GPL-2.0 LGPL-2"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 makedepends="gtk+2.0-dev libxfce4util-dev libxfce4ui-dev perl perl-uri
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index 7d7465e1406a4116cf97141a2ffde9d1810e6411..804884cd489015e3869c7767ba17b70af8f90998 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Tools for Flash-Friendly File System (F2FS)"
 url="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev automake autoconf libtool util-linux-dev
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index 872736ffaa4cabb736f127c5655e24eca8facc3b..1c9b2a864be487ea54cc732bd0f9f3ec4b596960 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
 url="http://www.fail2ban.org"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2 iptables ip6tables logrotate"
 makedepends="python2-dev py-setuptools"
 source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz
diff --git a/main/farstream/APKBUILD b/main/farstream/APKBUILD
index f63e40ea7633fe6448c08fa1eae185571f0452e9..d885c377d444721e19079eb8bf36aa6df7726f83 100644
--- a/main/farstream/APKBUILD
+++ b/main/farstream/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Libraries for videoconferencing"
 url="http://www.freedesktop.org/wiki/Software/Farstream"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="libnice-dev gstreamer-dev gst-plugins-base-dev"
 makedepends="$depends_dev gobject-introspection-dev py-gobject-dev python2-dev"
diff --git a/main/farstream0.1/APKBUILD b/main/farstream0.1/APKBUILD
index 05fa87e4aa4b87fe0311ffb15b31a57b7991da10..78e222ba0d787317bbf55e510914bf5e11fd5221 100644
--- a/main/farstream0.1/APKBUILD
+++ b/main/farstream0.1/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Libraries for videoconferencing"
 url="http://www.freedesktop.org/wiki/Software/Farstream"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="libnice-dev gstreamer0.10-dev gst-plugins-base0.10-dev"
 makedepends="$depends_dev gobject-introspection-dev py-gobject-dev python2-dev
diff --git a/main/fastjar/APKBUILD b/main/fastjar/APKBUILD
index b7d4fbb13f20a65efdf79cf14c3d3a312775dfc1..61e43e604b8e8e76680b0f4dd6024df40adb03bc 100644
--- a/main/fastjar/APKBUILD
+++ b/main/fastjar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A fast implementation of Java Archiver"
 url="http://savannah.nongnu.org/projects/fastjar"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="zlib-dev"
 install=""
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index dda2b73a66a3fcaab77a730207ebd8f571748448..3ed15f85111836eb1604b3bccf879a51814119fb 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A modern interactive commandline shell"
 url="http://www.fishshell.com/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="bc"
 depends_dev="$pkgname-tools"
 makedepends="libtool doxygen ncurses-dev"
diff --git a/main/flex/APKBUILD b/main/flex/APKBUILD
index 95607b8b73f31661ee66c06fe9d5859e32de7b46..fe03b8dfa026ba09edfaf8cfbb9601cc20e6bd7c 100644
--- a/main/flex/APKBUILD
+++ b/main/flex/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A tool for generating text-scanning programs"
 url="https://github.com/westes/flex"
 arch="all"
-license="BSD and LGPLv2+"
+license="BSD and LGPL-2.0-or-later"
 depends="m4"
 depends_dev="flex"
 makedepends="$depends_dev m4 bison help2man"
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index f5da65272c7b3c5122f04d6b8c1b968e5645090a..dd760ba4345cc422924af66c811d632ba75ca9b5 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm"
 url="http://fribidi.org"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=""
 makedepends=""
diff --git a/main/fsarchiver/APKBUILD b/main/fsarchiver/APKBUILD
index d7fd87a135e6f70d1db52a20c23029e9fd24edd3..05e6b5e5ceff92a012b9eeb379e5559181f938bd 100644
--- a/main/fsarchiver/APKBUILD
+++ b/main/fsarchiver/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Safe and flexible file-system backup and deployment tool"
 arch="all"
 url="http://www.fsarchiver.org/"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-doc"
 makedepends="linux-headers attr-dev bzip2-dev e2fsprogs-dev lz4-dev lzo-dev xz-dev libgcrypt-dev zlib-dev"
 source="https://github.com/fdupoux/fsarchiver/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
index 3b8aa9ac357423da22e2e613bfff96812f591d43..26ec7435224481cd3b684dec290bd26d24de7454 100644
--- a/main/fuse/APKBUILD
+++ b/main/fuse/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 url="https://github.com/libfuse/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="gettext-dev"
 install=
diff --git a/main/gapk/APKBUILD b/main/gapk/APKBUILD
index 471de1919dc1afcc2f793a0ac335117f0d46a6f4..ba38ffaaf2f9fd8123a69384c85a244c4e7513c4 100644
--- a/main/gapk/APKBUILD
+++ b/main/gapk/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="simple GTK frontend for apk-tools"
 url="https://github.com/ncopa/gapk"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="apk-tools"
 depends_dev=""
 makedepends="$depends_dev gtk+3.0-dev"
diff --git a/main/garcon/APKBUILD b/main/garcon/APKBUILD
index 1f4fdb54a1bb680b3da24bbdd83bc76f9e70d510..257d24c1265874c4615a8d0afc28429c7d30c9f0 100644
--- a/main/garcon/APKBUILD
+++ b/main/garcon/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="a freedesktop.org compliant menu implementation based on GLib and GIO"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 makedepends="glib-dev gtk+2.0-dev libxfce4ui-dev intltool libxfce4util-dev gtk-doc"
diff --git a/main/gcr/APKBUILD b/main/gcr/APKBUILD
index 296936b2465ea125e55ed67dc236a4aeb9d14a23..48e737c78593b30f6a197ab7513fb1476d70c2bf 100644
--- a/main/gcr/APKBUILD
+++ b/main/gcr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 url="https://wiki.gnome.org/Projects/CryptoGlue"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends_dev="glib-dev gtk+3.0-dev libgcrypt-dev p11-kit-dev"
 makedepends="$depends_dev gobject-introspection-dev libxslt vala"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index 1b479a1a9d63845e6a2483c28f66d600b8befb66..f11541547ccd4f2b5c0e03d831487917a662713f 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="The GNU Debugger"
 url="https://www.sourceware.org/gdb/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=
 makedepends="ncurses-dev expat-dev texinfo readline-dev python3-dev
 	zlib-dev autoconf automake libtool linux-headers perl"
diff --git a/main/gengetopt/APKBUILD b/main/gengetopt/APKBUILD
index da6b4a47cd60b580fa0786b1c3c28a79f57edad5..45ea15c59b058f61380b3b35436a5bfbc6886f2f 100644
--- a/main/gengetopt/APKBUILD
+++ b/main/gengetopt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Tool to write command line option parsing code for C programs"
 url="https://www.gnu.org/software/gengetopt/"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends=""
 depends_dev="gengetopt"
 makedepends="$depends_dev"
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index bb21ac723b5cb2df526bb5863d460c4c130d8fc8..6053bf4d597ff8e31375a297016719ef668cf1c2 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An interpreter for the PostScript language and for PDF"
 url="https://ghostscript.com/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="autoconf automake libjpeg-turbo-dev libpng-dev jasper-dev expat-dev
 	zlib-dev tiff-dev freetype-dev lcms2-dev gtk+3.0-dev
 	cups-dev libtool jbig2dec-dev openjpeg-dev"
diff --git a/main/gigolo/APKBUILD b/main/gigolo/APKBUILD
index 26bae4b4140695ae184ef9aa94ab0fa3f6a60756..8b3dcae21f2c032a3e3ec8ac160be2856b5af349 100644
--- a/main/gigolo/APKBUILD
+++ b/main/gigolo/APKBUILD
@@ -5,7 +5,7 @@ pkgver=0.4.2
 pkgrel=0
 pkgdesc="GIO/GVFS management application"
 url="http://www.uvena.de/gigolo/"
-license="GPLv2"
+license="GPL-2.0"
 arch="all"
 makedepends="gtk+-dev python2"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 74b7a64bf8ed8a048948b75cb4013ccd6c69d0c1..0f71549895f3bda1066333d907a2cb7efcedc636 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A distributed version control system"
 url="https://www.git-scm.com/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=
 replaces="git-perl"
 
diff --git a/main/gitolite/APKBUILD b/main/gitolite/APKBUILD
index 9fb22bf5d486663e568944059c66d397547acfa4..ee267b43c83c83aa0a4ddc4f1fd37d9a0ef1f4cb 100644
--- a/main/gitolite/APKBUILD
+++ b/main/gitolite/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Centralized git server, with very fine-grained access control and many powerful features"
 url="https://github.com/sitaramc/gitolite"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="git perl"
 install=$pkgname.pre-install
 pkgusers="git"
diff --git a/main/glib-networking/APKBUILD b/main/glib-networking/APKBUILD
index 0dcaeeee76c52595a19c59963b58619bdf3dd390..8fb6c60e512fa6b2b6af1e43b70cc92a2a00c3a0 100644
--- a/main/glib-networking/APKBUILD
+++ b/main/glib-networking/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="Networking support for GLib"
 url="http://www.gnome.org"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends="ca-certificates"
 depends_dev="glib-dev gnutls-dev libproxy-dev intltool libgcrypt-dev"
 makedepends="$depends_dev bash p11-kit-dev"
diff --git a/main/gmp/APKBUILD b/main/gmp/APKBUILD
index 4f880f70a57823c540e10f9dd63f5946b29d9349..225e7b6a00d55511097643395412a17ba19e45b0 100644
--- a/main/gmp/APKBUILD
+++ b/main/gmp/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A free library for arbitrary precision arithmetic"
 url="https://gmplib.org/"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 makedepends="m4 texinfo libtool"
 depends=
 subpackages="$pkgname-doc $pkgname-dev libgmpxx"
diff --git a/main/gnats/APKBUILD b/main/gnats/APKBUILD
index 4d1692236bc656d3a53afabd497cb1ea65db5c79..c006bacf3845da97e0f613770416cf096e2ddba3 100644
--- a/main/gnats/APKBUILD
+++ b/main/gnats/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="The GNU Bug Tracking System"
 url="https://www.gnu.org/software/gnats/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="postfix"
 makedepends="texinfo"
 install=
diff --git a/main/gnuchess/APKBUILD b/main/gnuchess/APKBUILD
index 44c613cc6c18e68a98aba226d9d24b26116cdbec..4077ae31d644394628f051b4d07f221b9bbb047a 100644
--- a/main/gnuchess/APKBUILD
+++ b/main/gnuchess/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The GNU chess program"
 url="https://www.gnu.org/software/chess/"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends=
 makedepends=
 install=""
diff --git a/main/goaccess/APKBUILD b/main/goaccess/APKBUILD
index b083890a72ec8855827aee756510ff6ff45bbb42..a35a3407031c7b1601454ced6894b238c429dbf8 100644
--- a/main/goaccess/APKBUILD
+++ b/main/goaccess/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A real-time web log analyzer and interactive viewer"
 url="http://goaccess.prosoftcorp.com/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="ncurses-dev geoip-dev glib-dev"
 subpackages="$pkgname-doc"
 source="http://tar.goaccess.io/$pkgname-$pkgver.tar.gz"
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD
index 65017daab280bdc4fa7e7d5723ec1e94dd161fe5..e22fdcf584a25579321e3d4fc6afe80e39584f28 100644
--- a/main/gpicview/APKBUILD
+++ b/main/gpicview/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Picture viewer of the LXDE Desktop"
 url="https://wiki.lxde.org/en/GPicView"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 subpackages="$pkgname-lang"
 makedepends="gtk+-dev intltool libjpeg-turbo-dev"
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index 3520a0a3b0619e9d958c7cccc32705cf713287f7..608dbe339402e7b3e52fa0a6e101066776899be2 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Bootloader with support for Linux, Multiboot and more"
 url="https://www.gnu.org/software/grub/"
 arch="all !s390x"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev bison flex linux-headers xz-dev lvm2-dev
diff --git a/main/gtk-doc/APKBUILD b/main/gtk-doc/APKBUILD
index 7d6686838e427e90e0e11b7cb59e5d30e5dac08e..ac74cbc9ed5e23a8cc2798375fa1f47fb066850d 100644
--- a/main/gtk-doc/APKBUILD
+++ b/main/gtk-doc/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Documentation tool for public library API"
 url="https://www.gtk.org/gtk-doc/"
 arch="noarch"
-license="GPL FDL"
+license="GFDL"
 depends="docbook-xsl gnome-doc-utils perl python2 py2-six pkgconf glib-dev highlight"
 makedepends="rarian-dev py-libxml2 gettext itstool autoconf automake libtool"
 checkdepends="bc"
diff --git a/main/gtk-murrine-engine/APKBUILD b/main/gtk-murrine-engine/APKBUILD
index 6cf5d86dd83ada7c57f1294c622bc3fa96705eff..a0815bc65e8675905711c985fef6583f600b7059 100644
--- a/main/gtk-murrine-engine/APKBUILD
+++ b/main/gtk-murrine-engine/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="cairo-based gtk engine"
 url="http://www.cimitan.com/murrine/"
 arch="all"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends=""
 makedepends="gtk+2.0-dev cairo-dev intltool"
 install=""
diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index 2fa6432e0f5ab6881e8f9c20518b3ea42d27f046..497e5c9c25c601d415dd447b13e10742d85895d6 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Xfce theme engine"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="gtk+2.0-dev gtk+3.0-dev"
 source="http://archive.xfce.org/src/xfce/gtk-xfce-engine/${pkgver%.*}/gtk-xfce-engine-$pkgver.tar.bz2
 fix-utf8-codec-can-not-decode-byte.patch"
diff --git a/main/gtkman/APKBUILD b/main/gtkman/APKBUILD
index ab7eb8bf282e68ceed7a13fe9d98e051d3db5d08..2344a5a2c47454d36f0518014208653e12646e8f 100644
--- a/main/gtkman/APKBUILD
+++ b/main/gtkman/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="GTK+2 manual page viewer"
 url="http://www.salixos.org/wiki/index.php/GTKMan"
 arch="noarch"
-license="GPLv3"
+license="GPL-3.0"
 depends="py-gtk"
 depends_dev=
 makedepends="gettext intltool"
diff --git a/main/gummiboot/APKBUILD b/main/gummiboot/APKBUILD
index 2beeb5aeb34e29982451341c75d9e66322653956..fe793d508b0f9f876bba6f6f8ce79083fb1da7f5 100644
--- a/main/gummiboot/APKBUILD
+++ b/main/gummiboot/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Simple EFI Boot Manager"
 url="http://freedesktop.org/wiki/Software/gummiboot"
 arch="x86 x86_64 aarch64"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="util-linux-dev"
 makedepends="$depends_dev gnu-efi-dev autoconf automake docbook-xsl libxslt"
diff --git a/main/gvpe/APKBUILD b/main/gvpe/APKBUILD
index 85b826a1cedcb668e1599eb40f90ed89bfd62085..68597b53272cb4cf298fc2451d29cddcda36d217 100644
--- a/main/gvpe/APKBUILD
+++ b/main/gvpe/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="GNU Virtual Private Ethernet"
 url="http://software.schmorp.de/pkg/gvpe.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="libressl-dev libev-dev zlib-dev gmp-dev linux-headers"
 source="http://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.gz
diff --git a/main/gzip/APKBUILD b/main/gzip/APKBUILD
index 2c39336a72f51e5ef297eb204fee36aea65a1f42..c9993add674037da956e83576162b42538c8a585 100644
--- a/main/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="A popular data compression program"
 subpackages="$pkgname-doc"
 url="https://www.gnu.org/software/gzip/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends=
 install=
diff --git a/main/halberd/APKBUILD b/main/halberd/APKBUILD
index a1ec641f540e6b231060aad8856b130876b2075f..1456fc9980b91bb593d95a4df6c6471fc9608175 100644
--- a/main/halberd/APKBUILD
+++ b/main/halberd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Tool to discover HTTP load balancers"
 url="http://halberd.superadditive.com"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev help2man"
diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index 8a4f8f9f362e3d1397394b25f1b401b258c86420..da46a4800294125aeec496b80b19f4e607ef987d 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Html And Shell Embedded Report Language"
 url="http://haserl.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="automake autoconf"
 subpackages="$pkgname-doc"
diff --git a/main/help2man/APKBUILD b/main/help2man/APKBUILD
index 74806697a37c17aae8c55e3b6ee96f738725ccfa..f47d631648ffd8d762cfff3ca6ea7f688a949c39 100644
--- a/main/help2man/APKBUILD
+++ b/main/help2man/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Create simple man pages from --help output"
 url="https://www.gnu.org/software/help2man"
 arch="noarch"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends="perl"
 makedepends=""
 options="!check"  # No test suite
diff --git a/main/hexchat/APKBUILD b/main/hexchat/APKBUILD
index e23c6f335a23ff2fea498cb2d50dd0f28b996f41..a5b25be24536ba2228ba788b18bae051b6ab5827 100644
--- a/main/hexchat/APKBUILD
+++ b/main/hexchat/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A popular and easy to use graphical IRC (chat) client"
 url="https://hexchat.github.io"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="gtk+2.0-dev libressl-dev dbus-glib-dev perl-dev
 	libsexy-dev python2-dev libnotify-dev libproxy-dev lua5.3-dev
diff --git a/main/hicolor-icon-theme/APKBUILD b/main/hicolor-icon-theme/APKBUILD
index 55ea76e3692de897b173f1526b30b07ad6037703..ce4b082872df92f9d85424ddff75070d1cc0c51e 100644
--- a/main/hicolor-icon-theme/APKBUILD
+++ b/main/hicolor-icon-theme/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Freedesktop.org Hicolor icon theme"
 url="https://icon-theme.freedesktop.org/wiki/HicolorTheme"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 source="http://icon-theme.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"
 
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD
index fd596efed808a0e48004d8e016d1f03a637cd0cf..ccc9b8016b1eb7e6adf917367ab6a64fe24c502b 100644
--- a/main/highlight/APKBUILD
+++ b/main/highlight/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Fast and flexible source code highlighter"
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 makedepends="lua${_luaver}-dev boost-dev"
 subpackages="$pkgname-doc"
 source="http://www.andre-simon.de/zip/highlight-$pkgver.tar.bz2
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index ecf847a009d27c2571f6006d4d5f167d2af1201c..315cfeb77a2c61b6fab3b0105bbc6c4bdf1cb22e 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An interactive process viewer"
 url="http://hisham.hm/htop/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="ncurses-dev"
 subpackages="$pkgname-doc"
diff --git a/main/hunspell-en/APKBUILD b/main/hunspell-en/APKBUILD
index 8002b40d9e4377199f1eea25f90f4afd13cf8fb8..7129f89b783c3f2fbbec5e62d2d71ef50c82cbb7 100644
--- a/main/hunspell-en/APKBUILD
+++ b/main/hunspell-en/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="English hunspell dictionaries"
 url="http://wordlist.aspell.net/dicts/"
 arch="noarch"
-license="LGPL2+ scowl"
+license="LGPL-2.0-or-later scowl"
 options="!check" # data only package
 source="http://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_US-$pkgver.zip
         http://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_CA-$pkgver.zip
diff --git a/main/hunspell-pt-br/APKBUILD b/main/hunspell-pt-br/APKBUILD
index 1f2faee5a4aeefe2490d598c2e45a87e20cee25b..59a9c563c06cb0e0eefc63ca2b0895eba0b0c32e 100644
--- a/main/hunspell-pt-br/APKBUILD
+++ b/main/hunspell-pt-br/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Portuguese (Brazil) hunspell dictionaries"
 url="http://pt-br.libreoffice.org/"
 arch="noarch"
-license="LGPLv3 MPL"
+license="LGPL-3.0 MPL"
 depends=""
 makedepends=""
 source="http://pt-br.libreoffice.org/assets/Uploads/PT-BR-Documents/VERO/VeroptBRV320AOC.oxt
diff --git a/main/hunspell-pt/APKBUILD b/main/hunspell-pt/APKBUILD
index 3b3d92c8ee56da27bdbf698584bea242cb1631d0..79c4f4b2b5eccbc846818ea69ed7e437d7e85991 100644
--- a/main/hunspell-pt/APKBUILD
+++ b/main/hunspell-pt/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Portuguese hunspell dictionaries"
 url="http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/"
 arch="noarch"
 options="!check" # data only package
-license="LGPLv2 GPLv2 MPLv1.1"
+license="LGPL-2.0 GPL-2.0 MPL-1.1"
 source="http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-$pkgver.tar.gz
 	"
 
diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD
index bb332c9d2d0067026bc365c817724d63e21d6586..9bc05a42cb6e47d86c7c1410ec3f6042bf991855 100644
--- a/main/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Spell checker and morphological analyzer library and program"
 url="https://hunspell.github.io/"
 arch="all"
-license="GPL2+ LGPL2+ MPL 1.1"
+license="GPL-2.0-or-later LGPL-2.0-or-later MPL-1.1"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 makedepends="gettext-dev ncurses-dev readline-dev autoconf automake libtool"
 source="$pkgname-$pkgver.tar.gz::https://github.com/hunspell/hunspell/archive/v$pkgver.tar.gz"
diff --git a/main/hvtools/APKBUILD b/main/hvtools/APKBUILD
index f723c2ffca0e7cdda403f0d165206977d1867afc..13346b847c724b763e273a6a1429423b01ef051a 100644
--- a/main/hvtools/APKBUILD
+++ b/main/hvtools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Hyper-v tools"
 url="http://www.kernel.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="$depends_dev linux-headers"
 source="https://kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz
 	https://kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz
diff --git a/main/hwdata/APKBUILD b/main/hwdata/APKBUILD
index 3f300fed506074a44318a4a79f600c73e37891fa..627567efd9e7aa90bcc60cc0f6b5c508c05fc3e0 100644
--- a/main/hwdata/APKBUILD
+++ b/main/hwdata/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Hardware identification and configuration data"
 url="https://github.com/vcrhonek/hwdata"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="bash"
 subpackages="$pkgname-usb $pkgname-pci $pkgname-pnp $pkgname-oui"
 options="!check"  # requires pciutils, which causes build loop
diff --git a/main/hypermail/APKBUILD b/main/hypermail/APKBUILD
index ddf0c0470d5e8e8349f6ef3a720607ee8a3592ae..dfb250c2af584916ca3716d42d4bf41d32349cfb 100644
--- a/main/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Mail Archiver"
 url="http://www.hypermail-project.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="lua"
 makedepends="pcre-dev bison gdbm-dev"
 install=""
diff --git a/main/icon-naming-utils/APKBUILD b/main/icon-naming-utils/APKBUILD
index 17e55d6834d857b15baf1c651da54817a093f2c1..2ded3e6ec5ddca19fb42442109eedef31c838372 100644
--- a/main/icon-naming-utils/APKBUILD
+++ b/main/icon-naming-utils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
 url="http://tango.freedesktop.org/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl-xml-simple"
 makedepends=""
 source="http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.bz2"
diff --git a/main/iftop/APKBUILD b/main/iftop/APKBUILD
index 349634c1b3903450a610a5d4ccd12dfa0247bdb9..741d766dfc9945c0e7a6a1220795f0a901c0937c 100644
--- a/main/iftop/APKBUILD
+++ b/main/iftop/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=7
 pkgdesc="A tool to display bandwidth usage on an interface"
 url="http://www.ex-parrot.com/~pdw/iftop/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="libpcap-dev>=1 ncurses-dev"
 subpackages="$pkgname-doc"
diff --git a/main/igmpproxy/APKBUILD b/main/igmpproxy/APKBUILD
index ddb3cc91d79d6b08448c862791a4ac6d4471ca94..e30311718c57a37b7c64e4c8dedff3dccb9e53b3 100644
--- a/main/igmpproxy/APKBUILD
+++ b/main/igmpproxy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="A simple dynamic Multicast Routing Daemon using only IGMP signalling"
 url="https://sourceforge.net/projects/igmpproxy/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD
index 2c06f2f773cf93371276c9f6b3896d66cf3ee7d1..af4837829b9fb04518f748d7d0706c18250dca9b 100644
--- a/main/imap/APKBUILD
+++ b/main/imap/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=7
 pkgdesc="An IMAP/POP server"
 url="http://www.washington.edu/imap"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 subpackages="$pkgname-dev c-client:cclient"
 depends=""
 makedepends="libressl-dev"
diff --git a/main/indent/APKBUILD b/main/indent/APKBUILD
index 3fd8a7ebd05d9b5c240b9434580535eed7b77bf5..0cb7a85b12c9b87ad9982048a88af3593698e289 100644
--- a/main/indent/APKBUILD
+++ b/main/indent/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="An indenting utility"
 url="https://www.gnu.org/software/indent/"
 arch="all"
-license="GPL3+ BSD"
+license="GPL-3.0-or-later BSD"
 depends=""
 makedepends="gettext-dev"
 install=""
diff --git a/main/inotify-tools/APKBUILD b/main/inotify-tools/APKBUILD
index 3d3894b37340b3724248675ffbef863d237c459e..d360ef995de22c5daf92502ead046b7ff617c5e9 100644
--- a/main/inotify-tools/APKBUILD
+++ b/main/inotify-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="C library and CLI tools providing a simple interface to inotify"
 url="https://github.com/rvoicilas/inotify-tools"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="!inotify-tools-inc"
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/installkernel/APKBUILD b/main/installkernel/APKBUILD
index b27bb1a5ebebd2353857a63ca12fca8301b82120..7c9855654e505928a54714ab0d430a655b016343 100644
--- a/main/installkernel/APKBUILD
+++ b/main/installkernel/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Alpine Linux Kernel install script"
 url="https://git.alpinelinux.org/cgit/aports/tree/main/installkernel"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 subpackages=""
 depends=""
 source="installkernel"
diff --git a/main/intltool/APKBUILD b/main/intltool/APKBUILD
index 5a086d395c93bf6e66ab91bbd4c5b6ca0960aa0d..c1e0969c79d0cbb60f11bb4cfc9afd93d60821f5 100644
--- a/main/intltool/APKBUILD
+++ b/main/intltool/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="The internationalization tool collection"
 url="http://freedesktop.org/wiki/Software/intltool"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl perl-xml-parser gettext file"
 subpackages="$pkgname-doc"
 source="http://edge.launchpad.net/intltool/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
diff --git a/main/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index d20a20d6b14571579a36edcadbad5c9d2e7f3e87..8e0c6d892eda1396c576447989c58718804e053b 100644
--- a/main/iproute2-qos/APKBUILD
+++ b/main/iproute2-qos/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Scripts to set up quality of service with iproute2"
 url="https://git.alpinelinux.org/cgit/aports"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="iproute2"
 makedepends=""
 source="qos.initd qos.eth0.sample qos.ifb0.sample setup-qos"
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 588c87ba1478b812606d4ff478a6737963a4f0ab..6e08374c9922d7d302d982467d26d7dd5008f35f 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="IP Routing Utilities"
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 install="$pkgname.post-install"
 makedepends="bison flex bash iptables-dev libelf-dev"
diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD
index 990394e66cdf91254c19c7d154ff9be2f33361d4..c45f6745ff8fbd51589f6888d9a79940afc342ec 100644
--- a/main/ipset/APKBUILD
+++ b/main/ipset/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Manage Linux IP sets"
 url="http://ipset.netfilter.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends_dev="libmnl-dev"
 makedepends="$depends_dev automake autoconf libtool linux-headers"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index 02b7342edaa053b824d9ff75c6a2c7af594e0ccd..df424fa8818d351cc5fd813a0073448438ee01a3 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="http://www.netfilter.org/projects/iptables/index.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends_dev="linux-headers"
 makedepends="$depends_dev libnftnl-dev bison flex autoconf automake"
 subpackages="ip6tables $pkgname-doc $pkgname-dev"
diff --git a/main/iptraf-ng/APKBUILD b/main/iptraf-ng/APKBUILD
index 8a2eac30135c23b295e0feb2587328339e95c4bc..b52fe0ecf605d625affaac92ea2a495384ad5661 100644
--- a/main/iptraf-ng/APKBUILD
+++ b/main/iptraf-ng/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="An IP Network Monitoring tool"
 url="https://fedorahosted.org/iptraf-ng/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="ncurses-dev linux-headers"
 install=""
diff --git a/main/ipvsadm/APKBUILD b/main/ipvsadm/APKBUILD
index ad8357c7adcbb3e4d38a0cdfd910c281bfbd551a..1332ed4a61bb47ad3211e69f2d3a1e4cb9029ce5 100644
--- a/main/ipvsadm/APKBUILD
+++ b/main/ipvsadm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The IP Virtual Server administration utility"
 url="http://www.linuxvirtualserver.org/software/ipvs.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 depends_dev="libnl-dev popt-dev"
 makedepends="$depends_dev linux-headers"
diff --git a/main/ircservices/APKBUILD b/main/ircservices/APKBUILD
index a08a5f7bf8c32f0ec2c75cb2279dfb3e5878c13a..01a295ca3e0c0bab911164fc893cd7bb74fa4095 100644
--- a/main/ircservices/APKBUILD
+++ b/main/ircservices/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)"
 url="http://www.ircservices.za.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="perl"
 install=$pkgname.pre-install
diff --git a/main/irqbalance/APKBUILD b/main/irqbalance/APKBUILD
index 36f9ef00ce2cf8f86515eb101ebe26253f27506a..3695b28f216fdf3e5a4b886172b436cc907f2371 100644
--- a/main/irqbalance/APKBUILD
+++ b/main/irqbalance/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Daemon that distributes interrupts over the processors"
 url="https://github.com/Irqbalance/irqbalance"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev glib-dev autoconf automake libtool ncurses-dev"
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index 3a3ef81d43228c18290d0fba4b22b2eb56074ec7..f577b6b4c88166537e7f39d0467698959405a9d7 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A modular textUI IRC client with IPv6 support"
 url="https://irssi.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="glib-dev libressl-dev ncurses-dev perl-dev automake autoconf libtool"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-proxy $pkgname-perl"
 source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz"
diff --git a/main/iscsi-scst/APKBUILD b/main/iscsi-scst/APKBUILD
index 694f4e26977409aec4d6db860c0ec94be1c6b941..2683d588dea02b2d3587a49886839cab8954d7aa 100644
--- a/main/iscsi-scst/APKBUILD
+++ b/main/iscsi-scst/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ISCSI target for SCST - userspace tools"
 url="http://scst.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 install=""
 makedepends="linux-headers libressl-dev bash"
diff --git a/main/iso-codes/APKBUILD b/main/iso-codes/APKBUILD
index 42e6271f6f9585668af044f50f35fc122c86821d..1de3e564996e9bbc7f8d15d6b1206916100dd83d 100644
--- a/main/iso-codes/APKBUILD
+++ b/main/iso-codes/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Lists of the country, language, and currency names"
 url="http://pkg-isocodes.alioth.debian.org/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 subpackages="$pkgname-lang $pkgname-dev"
 makedepends="python3 gettext"
diff --git a/main/itstool/APKBUILD b/main/itstool/APKBUILD
index ae9a91e72c806543c0c456eedf9cd388c1c6f795..abab2d4a1a0b6c705bc898b931ee1bf9517f6146 100644
--- a/main/itstool/APKBUILD
+++ b/main/itstool/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="ITS-based XML translation tool"
 url="http://itstool.org/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="py3-libxml2 python3"
 subpackages="$pkgname-doc"
 source="http://files.itstool.org/itstool/$pkgname-$pkgver.tar.bz2
diff --git a/main/jack/APKBUILD b/main/jack/APKBUILD
index 5ea4daf62340536a8f045194074e01943c6b8294..3f4c90a703a0973c140e89b3c28e06eb0f255fc2 100644
--- a/main/jack/APKBUILD
+++ b/main/jack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="The Jack Audio Connection Kit"
 url="http://www.jackaudio.org"
 arch="all"
-license="GPLv2 GPLv2+ LGPLv2+"
+license="GPL-2.0 GPL-2.0-or-later LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev alsa-lib-dev dbus-dev expat-dev libsamplerate-dev
diff --git a/main/java-common/APKBUILD b/main/java-common/APKBUILD
index 66a752f3df1608903f90288b9a0ce7d921b50cec..e7a1b2161da7c4d07b7807e848aa3842093a4042 100644
--- a/main/java-common/APKBUILD
+++ b/main/java-common/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Java common (updates java links)"
 url="https://git.alpinelinux.org/aports.git"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends=""
 install=""
diff --git a/main/jbig2dec/APKBUILD b/main/jbig2dec/APKBUILD
index 2d9a52f3a42d25601ed7390641f599e7e01c97ad..f8786edbaec1d7669440fc2ffa75409b6f4b601d 100644
--- a/main/jbig2dec/APKBUILD
+++ b/main/jbig2dec/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="JBIG2 image compression format decoder"
 url="https://www.ghostscript.com/jbig2dec.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://downloads.ghostscript.com/public/jbig2dec/jbig2dec-$pkgver.tar.gz"
diff --git a/main/jsoncpp/APKBUILD b/main/jsoncpp/APKBUILD
index c85fc71b8f2ec42822adf9dcb8e5c9af72a504c7..15f804436c439d9e3e4c13d69bde0989f0837f01 100644
--- a/main/jsoncpp/APKBUILD
+++ b/main/jsoncpp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="JSON C++ library"
 url="https://github.com/open-source-parsers/jsoncpp"
 arch="all"
-license="PublicDomain"
+license="Public-Domain"
 makedepends="meson"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/$pkgver.tar.gz"
diff --git a/main/jwm/APKBUILD b/main/jwm/APKBUILD
index c7c6252ceb98cfbb0f97ef8fc539e59afceadc41..2a069261a3c063e3f872a5d69c437f6ef035117c 100644
--- a/main/jwm/APKBUILD
+++ b/main/jwm/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A lightweight window manager for the X11 Window System"
 url="http://joewing.net/programs/jwm/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 depends_dev=""
 makedepends="libx11-dev libxext-dev libxft-dev libxmu-dev libxinerama-dev
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index b594cd8cf54e89eed5a28ad55c7f0fb7e1d6e4a2..20fe4e68adfd0f36b274c708fc4df09e70a75090 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -22,7 +22,7 @@ arch="all"
 pkgusers="kamailio"
 pkggroups="kamailio"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="bison flex expat-dev postgresql-dev pcre-dev mariadb-dev
 	libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD
index 623d98281c75ecefe016298fe0b58ebe776a1ee1..7ba873524d4d6aafa3d445e6d1f097eb84afeb56 100644
--- a/main/kbd/APKBUILD
+++ b/main/kbd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)"
 url="http://ftp.altlinux.org/pub/people/legion/kbd"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="kbd-misc"
 makedepends="linux-headers linux-pam-dev check-dev ckbcomp xkeyboard-config"
 install=""
diff --git a/main/keyutils/APKBUILD b/main/keyutils/APKBUILD
index 10fbb38d40c8f4dcf166f0474a713c7102523f1d..f23e1726f92ed7c9832572a416c4466a1c67bc3e 100644
--- a/main/keyutils/APKBUILD
+++ b/main/keyutils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Linux Key Management Utilities"
 url="http://people.redhat.com/~dhowells/keyutils/"
 arch="all"
-license="GPL2+ LGPL2+"
+license="GPL-2.0-or-later LGPL-2.0-or-later"
 depends=""
 makedepends="file linux-headers"
 install=""
diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD
index b69d51e728f041ddb60dd65a7daa5939845e3839..095cea532d2cd52bacc9fa67544f3c7f33f228d0 100644
--- a/main/kmod/APKBUILD
+++ b/main/kmod/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Linux kernel module management utilities"
 url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 # gnu sed is needed for symlink
diff --git a/main/knock/APKBUILD b/main/knock/APKBUILD
index 3341e5d7218281eaecf4f8d609d3be1adefd4918..99d73637a3c20fc614ceaec1762f7e4802747a47 100644
--- a/main/knock/APKBUILD
+++ b/main/knock/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A simple port-knocking daemon"
 url="http://www.zeroflux.org/projects/knock"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="iptables"
 makedepends="libpcap-dev"
 install=
diff --git a/main/ksymoops/APKBUILD b/main/ksymoops/APKBUILD
index 8e70620b45d1ba77deedd61c24ed726fc8ccfcd1..cd159fa72d4bc17b70bc98ae52e5f79b96e794e1 100644
--- a/main/ksymoops/APKBUILD
+++ b/main/ksymoops/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=7
 pkgdesc="A Linux kernel Oops file troubleshooting tool"
 url="https://kernel.org/pub/linux/utils/kernel/ksymoops/v2.4"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="binutils-dev"
 subpackages="$pkgname-doc"
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index dd24776ef72f5a7f462bdb2981932ff675451b52..39d227603c82678dbd2601327de823cfa284363d 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="An MP3 encoder and graphical frame analyzer"
 url="http://lame.sourceforge.net/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="nasm ncurses-dev autoconf automake libtool"
 source="http://downloads.sourceforge.net/project/lame/lame/$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/main/ldapvi/APKBUILD b/main/ldapvi/APKBUILD
index e8bc9ea1928f4fabdf1890d1cf478d15c86e2550..8b981c6a3ee6c7709f0568a0f1b47db9fc211681 100644
--- a/main/ldapvi/APKBUILD
+++ b/main/ldapvi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=8
 pkgdesc="ldapvi is an interactive LDAP client for Unix terminals"
 url="http://www.lichteblau.com/ldapvi/"
 arch="all"
-license="GNU"
+license="GPL"
 depends=""
 makedepends="ncurses-dev openldap-dev popt-dev readline-dev glib-dev"
 subpackages="$pkgname-doc"
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD
index d27f40fb2664568de0dc9e2f69fde55f834858a2..ce563bee3b32830f05b4ceeb032a52b95abd53e1 100644
--- a/main/ldb/APKBUILD
+++ b/main/ldb/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A schema-less, ldap like, API and database"
 url="http://ldb.samba.org/"
 arch="all"
-license="LGPLv3+"
+license="LGPL-3.0-or-later"
 makedepends="$depends_dev tevent-dev py-tevent tdb-dev py-tdb talloc-dev
 	python2-dev popt-dev cmocka-dev"
 subpackages="$pkgname-dev py-$pkgname:_py $pkgname-tools"
diff --git a/main/lddtree/APKBUILD b/main/lddtree/APKBUILD
index aa1e4e455ba08ed0090fdd05104cb4a3b9629789..e99fa794a445ed1b7f4cd483fdbac7fb1f87662c 100644
--- a/main/lddtree/APKBUILD
+++ b/main/lddtree/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="List dynamic dependencies as a tree"
 url="https://github.com/ncopa/lddtree"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="scanelf"
 depends_dev=""
 replaces="pax-utils"
diff --git a/main/libaio/APKBUILD b/main/libaio/APKBUILD
index 8561f334e44ce92e5f0d171cd9a5627290c94466..30abd27f8a0223bb970b01d143a2dc6bfc8300a2 100644
--- a/main/libaio/APKBUILD
+++ b/main/libaio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Asynchronous input/output library"
 url="http://lse.sourceforge.net/io/aio.html"
 arch="all"
-license="LGPL2"
+license="LGPL-2.0"
 options="!check"  # No test suite.
 depends=
 makedepends="linux-headers"
diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD
index acb3cac34386e148f86e13099f54e4a3837d06fe..84a3540d0a1a69b6cb326411486ec268a92f7836 100644
--- a/main/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A IPC library used by some GnuPG related software"
 url="ftp://ftp.gnupg.org/gcrypt/libassuan"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=
 makedepends="libgpg-error-dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/libasyncns/APKBUILD b/main/libasyncns/APKBUILD
index 42b9083fda9292bfc3f24276dd97a4e14cfeafca..3944fb7a94dd82c4cfb265e9fc0304c6afa66085 100644
--- a/main/libasyncns/APKBUILD
+++ b/main/libasyncns/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Asynchronous Name Service Library"
 url="http://0pointer.de/lennart/projects/libasyncns/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/libatomic_ops/APKBUILD b/main/libatomic_ops/APKBUILD
index c4b80b6377cfa1a7d5e2e6a86f4682ce95e5275b..5dfb3ce6ea70cab2ec407401452f9539ab97a176 100644
--- a/main/libatomic_ops/APKBUILD
+++ b/main/libatomic_ops/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Provides semi-portable access to hardware provided atomic memory operations"
 arch="all"
 url="https://github.com/ivmai/libatomic_ops"
-license="GPL2"
+license="GPL-2.0"
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/main/libavc1394/APKBUILD b/main/libavc1394/APKBUILD
index 1ad6a0d048a193345c6f065c343c002fd7d2bc1f..4b9697d7747c2070b6082672a874998a5f1a3b81 100644
--- a/main/libavc1394/APKBUILD
+++ b/main/libavc1394/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Audio/Video Control library for IEEE-1394 devices"
 url="https://sourceforge.net/projects/libavc1394/"
 arch="all"
-license="GPLv2+ LGPLv2+"
+license="GPL-2.0-or-later LGPL-2.0-or-later"
 depends=
 depends_dev="libraw1394-dev"
 makedepends="$depends_dev libtool automake autoconf"
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index dd2595a322bab5e3648cd88b78fa808c9f3ef936..994ddd77f34cdc0198c84b15a04b7c5a51bc1628 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -7,7 +7,7 @@ _ver=${pkgver/_/-}
 pkgrel=27
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
-license="LGPL2"
+license="LGPL-2.0"
 arch="all"
 options="!strip !libc_musl"
 makedepends="linux-headers"
diff --git a/main/libcdio-paranoia/APKBUILD b/main/libcdio-paranoia/APKBUILD
index a5df234c5a2bad80dd931777f80e3e18d879238f..2fede641239586419d6c88fbbdb0cc5f3e128b44 100644
--- a/main/libcdio-paranoia/APKBUILD
+++ b/main/libcdio-paranoia/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="CD paranoia on top of libcdio"
 url="https://www.gnu.org/software/libcdio/"
 arch="all"
-license="GPLv2+ and LGPLv2+"
+license="GPL-2.0-or-later and LGPL-2.0-or-later"
 makedepends="libcdio-dev autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.gnu.org/gnu/libcdio/$pkgname-$_pkgver.tar.gz"
diff --git a/main/libcdio/APKBUILD b/main/libcdio/APKBUILD
index 665aa7ae4259326e39a796d9092c3ea22dffb65c..df8c80799b8a93ea090f1ccc805110d13551e28b 100644
--- a/main/libcdio/APKBUILD
+++ b/main/libcdio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="GNU Compact Disc Input and Control Library"
 url="https://www.gnu.org/software/libcdio/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=
 makedepends="libcddb-dev ncurses-dev linux-headers"
 install=
diff --git a/main/libcrystalhd/APKBUILD b/main/libcrystalhd/APKBUILD
index 7e3dbc108d29b74b29ddba9fbaa0eaff0016b19a..5c27222dc4588f627b0861b814ef5d786656050f 100644
--- a/main/libcrystalhd/APKBUILD
+++ b/main/libcrystalhd/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Broadcom CrystalHD kernel driver library"
 url="https://git.linuxtv.org/jarod/crystalhd.git"
 arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev linux-headers"
diff --git a/main/libdbi/APKBUILD b/main/libdbi/APKBUILD
index 9ccedd4e6e79ff667e3993646d17b4d278f1c445..7c5866a199d3cb75f283dd405d5ede08987eb56a 100644
--- a/main/libdbi/APKBUILD
+++ b/main/libdbi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Database independent abstraction layer for C"
 url="http://libdbi.sourceforge.net/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/libdv/APKBUILD b/main/libdv/APKBUILD
index 686498305b31a73208914f75049e286b313d7440..dd52c8b5ddd69643dfe3a283fb968307a9b5b4ff 100644
--- a/main/libdv/APKBUILD
+++ b/main/libdv/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Software decoder for DV format video"
 url="http://libdv.sourceforge.net/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=
 makedepends="gtk+-dev libxv-dev sdl-dev autoconf automake libtool
 	linux-headers"
diff --git a/main/libee/APKBUILD b/main/libee/APKBUILD
index af758dd9d1a9759b521e798a164c02d2ba36c9ce..91f15f2755aa26d601c2a97a65549af5c4ac9ba0 100644
--- a/main/libee/APKBUILD
+++ b/main/libee/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="event Expression Library inspired by CEE"
 url="http://www.libee.org"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 makedepends="libestr-dev"
 subpackages="$pkgname-dev"
 source="http://www.libee.org/download/files/download/$pkgname-$pkgver.tar.gz"
diff --git a/main/libestr/APKBUILD b/main/libestr/APKBUILD
index ed54a1c115ebe9d9d08a0893a8b4a3c11b8e252e..69be4dfabd903f4e4b9ba8073049b5de8e554333 100644
--- a/main/libestr/APKBUILD
+++ b/main/libestr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="essentials for string handling (and a bit more)"
 url="http://libestr.adiscon.com"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 subpackages="$pkgname-dev"
 source="http://libestr.adiscon.com/files/download/$pkgname-$pkgver.tar.gz"
 
diff --git a/main/libfprint/APKBUILD b/main/libfprint/APKBUILD
index 65dc07a52fe9fdd15091abafd36ffe8187a67316..9590228aafcb411dbc8bed7464fc6bcee4df2a96 100644
--- a/main/libfprint/APKBUILD
+++ b/main/libfprint/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="fingerprint reader and identification library"
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=""
 depends_dev="libusb-dev"
 makedepends="$depends_dev nss-dev glib-dev gdk-pixbuf-dev pixman-dev"
diff --git a/main/libgcab/APKBUILD b/main/libgcab/APKBUILD
index 7148f4e6f4831ec7c96659fad00349ee0efe0bb4..690affeef358df5cc99d0fdd6361edfe3f23e1bd 100644
--- a/main/libgcab/APKBUILD
+++ b/main/libgcab/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A GObject library to create cabinet files"
 url=" https://wiki.gnome.org/msitools"
 arch="all"
-license="GLPL2.1"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="gettext-dev"
 makedepends="$depends_dev automake autoconf
diff --git a/main/libgee/APKBUILD b/main/libgee/APKBUILD
index df63c2f06c468a912f9c4f73c9f0372712e36e5b..a1e72b39fdecc17383979d50272b4386e7665795 100644
--- a/main/libgee/APKBUILD
+++ b/main/libgee/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=""
 makedepends="glib-dev gobject-introspection-dev"
 subpackages="$pkgname-dev"
diff --git a/main/libgit2/APKBUILD b/main/libgit2/APKBUILD
index 883c92641ca7953831171471e3a93a53b1292189..38904871f60db188512bf897c1d2dfb9cb3c1810 100644
--- a/main/libgit2/APKBUILD
+++ b/main/libgit2/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=4
 pkgdesc="A linkable library for Git"
 url="https://libgit2.github.com/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev="curl-dev libssh2-dev"
 makedepends="$depends_dev python2 cmake zlib-dev libressl-dev"
diff --git a/main/libgsasl/APKBUILD b/main/libgsasl/APKBUILD
index 34dfbad8345df9d9ce678667e745550b07c6d4d4..5dd2e2cf799dbde90907ca418b3f3d45c056ba47 100644
--- a/main/libgsasl/APKBUILD
+++ b/main/libgsasl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="An implementation of the Simple Authentication and Security Layer framework"
 url="https://www.gnu.org/software/gsasl/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="pkgconfig"
 makedepends="$depends_dev libidn-dev libgss-dev libgcrypt-dev"
diff --git a/main/libgss/APKBUILD b/main/libgss/APKBUILD
index 63db21004420fbc738f4777ea65a232b5de87e6f..c89d83968382685c8b2793ecc77fda78a5bdbc2c 100644
--- a/main/libgss/APKBUILD
+++ b/main/libgss/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="An implementation of the Generic Security Service Application Program Interface"
 url="https://www.gnu.org/software/gss/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 depends_dev="pkgconfig"
 makedepends="$depends_dev"
diff --git a/main/libgudev/APKBUILD b/main/libgudev/APKBUILD
index 74b645814ceaed342eb59d4737efefc00777e512..40d0f6d726b006917163ed4af2b6a589df498620 100644
--- a/main/libgudev/APKBUILD
+++ b/main/libgudev/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="GObject-based wrapper library for libudev"
 url="https://wiki.gnome.org/Projects/libgudev"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 options="!check"  # No test suite.
 depends=""
 depends_dev=""
diff --git a/main/libiec61883/APKBUILD b/main/libiec61883/APKBUILD
index e6b5243540e85baff78d59df0d019040981ffa1b..cd5ce6db1b296ec9b290129afc343cad85ebd480 100644
--- a/main/libiec61883/APKBUILD
+++ b/main/libiec61883/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Streaming library for IEEE1394"
 url="http://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev="libraw1394-dev"
 makedepends="$depends_dev"
diff --git a/main/libisoburn/APKBUILD b/main/libisoburn/APKBUILD
index fdbb9d3e9743948ce2369852c5ab306688084526..0929a77378d1780f5196f47e03bdd66e24632a48 100644
--- a/main/libisoburn/APKBUILD
+++ b/main/libisoburn/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Library to enable creation and expansion of ISO-9660 filesystems"
 url="http://libburnia-project.org/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libburn-dev libisofs-dev acl-dev zlib-dev
diff --git a/main/liblastfm/APKBUILD b/main/liblastfm/APKBUILD
index cf0da0c29df7fc5374589a27d24a82e03cbc936f..aea0834138e202cb40564b4ce28e39e1d4d81772 100644
--- a/main/liblastfm/APKBUILD
+++ b/main/liblastfm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A Qt C++ library for the Last.fm webservices"
 url="https://github.com/lastfm/liblastfm"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev="qt-dev libsamplerate-dev fftw-dev"
 makedepends="$depends_dev cmake"
diff --git a/main/libmaxminddb/APKBUILD b/main/libmaxminddb/APKBUILD
index cf4b3b4338ab02a2ebd3a01369c8b83475577ad3..8201b94980c42a82a2f86e2071233b119330eb2b 100644
--- a/main/libmaxminddb/APKBUILD
+++ b/main/libmaxminddb/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Maxmind GeoIP2 database library"
 url="https://github.com/maxmind/libmaxminddb"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="curl"
 makedepends="automake autoconf libtool"
 install=""
diff --git a/main/libmp3splt/APKBUILD b/main/libmp3splt/APKBUILD
index 1e5d9b1440d9fc60dcdb1fe66975c6a738afa2bb..f7eb24ba21f43e32713c3a563357ef58eaf8a3b2 100644
--- a/main/libmp3splt/APKBUILD
+++ b/main/libmp3splt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library to split mp3 and ogg files without decoding"
 url="http://mp3splt.sourceforge.net/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev="pcre-dev libogg-dev libmad-dev libvorbis-dev libid3tag-dev libtool"
 makedepends="$depends_dev"
diff --git a/main/libmpeg2/APKBUILD b/main/libmpeg2/APKBUILD
index ac8999493ec97bb8ae4bd3c3c8c6352a1b3c07c1..2e3d92e4ca13214e7643379b21959d0b9476427d 100644
--- a/main/libmpeg2/APKBUILD
+++ b/main/libmpeg2/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=7
 pkgdesc="libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams."
 url="http://libmpeg2.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc mpeg2dec"
 makedepends="libx11-dev libice-dev libsm-dev libxext-dev libxv-dev"
 source="http://$pkgname.sourceforge.net/files/$pkgname-$pkgver.tar.gz
diff --git a/main/libmspack/APKBUILD b/main/libmspack/APKBUILD
index 02437c11834543d0fed5a55a51f4dd8226c9aec4..afc0f38fadf39f6c42c50a20bc7480354966e830 100644
--- a/main/libmspack/APKBUILD
+++ b/main/libmspack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Library for CAB and related files compression and decompression"
 url="https://www.cabextract.org.uk/libmspack/"
 arch="all"
-license="LGPLv2"
+license="LGPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/libmtp/APKBUILD b/main/libmtp/APKBUILD
index cd415f876d9da2f1a748917e8426177a08779396..f690f42b8d15f0cbf5207268dc6c742e911bc6fb 100644
--- a/main/libmtp/APKBUILD
+++ b/main/libmtp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A software library for MTP media players"
 url="http://libmtp.sourceforge.net/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="libusb-compat-dev"
 makedepends="$depends_dev eudev-dev"
diff --git a/main/libnetfilter_acct/APKBUILD b/main/libnetfilter_acct/APKBUILD
index e34b48182e717ddaece2966356038397b9bae614..fdc491f225cd1c47082e30945085bc6f8a096a26 100644
--- a/main/libnetfilter_acct/APKBUILD
+++ b/main/libnetfilter_acct/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Userspace library providing interface to extended accounting infrastructure."
 url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="libnfnetlink-dev libmnl-dev linux-headers"
 subpackages="$pkgname-dev"
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 4dffa17b0cd6f9c6c4d1c1727f66850eecdeb011..b3299d68d2020cec92c97ba1804ffc9021828aa6 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
 url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="linux-headers libnfnetlink-dev libmnl-dev"
 subpackages="$pkgname-dev"
diff --git a/main/libnetfilter_cthelper/APKBUILD b/main/libnetfilter_cthelper/APKBUILD
index 329705b358f955e152b6cbba39c196c39cf11335..dc2ced0b5ced9c098acdc28c737b8fe7f9e234be 100644
--- a/main/libnetfilter_cthelper/APKBUILD
+++ b/main/libnetfilter_cthelper/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A Netfilter netlink library for connection tracking helpers"
 url="http://www.netfilter.org/projects/libnetfilter_cthelper/index.html"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers libmnl-dev"
 install=""
diff --git a/main/libnetfilter_cttimeout/APKBUILD b/main/libnetfilter_cttimeout/APKBUILD
index 82369b8858d58ec86e25df5b65645483e444cc3f..ac71c6f8e04d35a88b6a7f11c014723c37ddd478 100644
--- a/main/libnetfilter_cttimeout/APKBUILD
+++ b/main/libnetfilter_cttimeout/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library for the connection tracking timeout infrastructure"
 url="http://www.netfilter.org/projects/libnetfilter_cttimeout/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev="libmnl-dev"
 makedepends="linux-headers $depends_dev"
diff --git a/main/libnetfilter_log/APKBUILD b/main/libnetfilter_log/APKBUILD
index f028f08679856881c85de5e1088bedd2d4c34fc8..c410ba7d306ab51ebf32f4cde98857815dbb8349 100644
--- a/main/libnetfilter_log/APKBUILD
+++ b/main/libnetfilter_log/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="interface to packets that have been logged by the kernel packet filter"
 url="http://www.netfilter.org/projects/libnetfilter_log/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 depends_dev="linux-headers"
 makedepends="$depends_dev libnfnetlink-dev"
diff --git a/main/libnetfilter_queue/APKBUILD b/main/libnetfilter_queue/APKBUILD
index 99e0cd2e1f4483a9263c7d9b5312c0fa13372a5b..15312b2b2a27fea9def4c9ee2339e49c53971196 100644
--- a/main/libnetfilter_queue/APKBUILD
+++ b/main/libnetfilter_queue/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="API to packets that have been queued by the kernel packet filter"
 url="http://www.netfilter.org/projects/libnetfilter_queue/index.html"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 makedepends="libnfnetlink-dev libmnl-dev linux-headers"
 install=""
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 31878a239a8159f7af5381c7e1ba5cb022a3d38e..3065b8888857420f64b89b07c301f34c66c93bde 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
 url="http://www.netfilter.org/projects/libnfnetlink/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 subpackages="$pkgname-dev"
diff --git a/main/libnftnl/APKBUILD b/main/libnftnl/APKBUILD
index 778d7fe6e6a316833df98c59e4ce8e682a7b7031..2a06267b4412b799bafb3a7dd6f9713e053681e7 100644
--- a/main/libnftnl/APKBUILD
+++ b/main/libnftnl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
 url="http://netfilter.org/projects/libnftnl/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends_dev="libmnl-dev"
 makedepends="$depends_dev bash jansson-dev"
 subpackages="$pkgname-dev $pkgname-libs"
diff --git a/main/libnice/APKBUILD b/main/libnice/APKBUILD
index 8e2ba6854409622ca66c5da14c83434482978634..12ecc43bb4034d7de4cb605d938d799ab479ca8f 100644
--- a/main/libnice/APKBUILD
+++ b/main/libnice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="GLib ICE implementation"
 url="https://nice.freedesktop.org/wiki/"
 arch="all"
-license="LGPLv2 and MPLv1.1"
+license="LGPL-2.0 and MPL-1.1"
 makedepends="glib-dev gnutls-dev gstreamer-dev gst-plugins-base-dev
 	gstreamer0.10-dev gst-plugins-base0.10-dev
 	gobject-introspection-dev"
diff --git a/main/libnl/APKBUILD b/main/libnl/APKBUILD
index 144c5a7dac843a54ac0e81ab5b24aa886c18c661..83cd31f998518d01800ad41811d86f56be82c74e 100644
--- a/main/libnl/APKBUILD
+++ b/main/libnl/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Library for applications dealing with netlink sockets"
 url="https://www.infradead.org/~tgr/libnl/"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 makedepends="linux-headers"
 subpackages="$pkgname-dev"
 source="https://www.infradead.org/~tgr/libnl/files/$pkgname-$pkgver.tar.gz
diff --git a/main/liboping/APKBUILD b/main/liboping/APKBUILD
index 176627f811119e350c5292ba7a4d8e1ac60b0609..ae3504ffc6d225170be3025bb74cb6ac9d1ed178 100644
--- a/main/liboping/APKBUILD
+++ b/main/liboping/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A C library to generate ICMP echo requests"
 url="http://verplant.org/liboping/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="ncurses-dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/libotr/APKBUILD b/main/libotr/APKBUILD
index 96a23e0e14837ef91b746e2c356dab4fa90e0105..4265fab9fffddba5f7b65fcdf22390b3927e866b 100644
--- a/main/libotr/APKBUILD
+++ b/main/libotr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Off The Record Messaging, an encryption library for secure IM conversations"
 url="http://otr.cypherpunks.ca/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev="libgcrypt-dev"
 makedepends="$depends_dev"
diff --git a/main/libotr3/APKBUILD b/main/libotr3/APKBUILD
index 89aecf7ff169d3025f63b6a7ab32bf79ad8eb258..d023e6bf2c98641a1371cec868dd4442deed827c 100644
--- a/main/libotr3/APKBUILD
+++ b/main/libotr3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Off The Record Messaging, an encryption library for secure IM conversations"
 url="http://otr.cypherpunks.ca/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev="libgcrypt-dev"
 makedepends="$depends_dev"
diff --git a/main/libproxy/APKBUILD b/main/libproxy/APKBUILD
index ce813242ea8a00dc25d5f8851b64797d7d72a526..883352d606f1abca2863fe9062cd480ba86d5726 100644
--- a/main/libproxy/APKBUILD
+++ b/main/libproxy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A library handling all the details of proxy configuration"
 url="http://code.google.com/p/libproxy/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev="zlib-dev"
 makedepends="cmake python2-dev $depends_dev"
diff --git a/main/libquvi-scripts/APKBUILD b/main/libquvi-scripts/APKBUILD
index 0ea6f25555f00c002d13ce36f67eedad93e05784..5491f9d8aea2e5dfebc154f6e656c147a4f38a61 100644
--- a/main/libquvi-scripts/APKBUILD
+++ b/main/libquvi-scripts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="scripts for libquvi - the library for parsing video download links"
 url="http://quvi.sourceforge.net/"
 arch="noarch"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://downloads.sourceforge.net/project/quvi/${pkgver%.*}/$pkgname/$pkgname-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/main/libquvi/APKBUILD b/main/libquvi/APKBUILD
index 0185c2d4f047f7bfa02361f12070942e908067cb..22881605cf98d1c4358129b1cdb2b732b61b97e2 100644
--- a/main/libquvi/APKBUILD
+++ b/main/libquvi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="library for parsing video download links"
 url="http://quvi.sourceforge.net/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends="libquvi-scripts"
 depends_dev="libquvi-scripts-dev curl-dev lua5.1-dev"
 makedepends="$depends_dev libproxy-dev glib-dev libgcrypt-dev"
diff --git a/main/librevenge/APKBUILD b/main/librevenge/APKBUILD
index c8b33791730fab48897f50b4e674198bd048263b..7d24742d80700b2737f6d00e94e210514f4e9c06 100644
--- a/main/librevenge/APKBUILD
+++ b/main/librevenge/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Base library for writing document import filters"
 url="https://sourceforge.net/projects/libwpd/"
 arch="all"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 depends_dev="boost-dev zlib-dev cppunit-dev"
 makedepends="$depends_dev doxygen"
diff --git a/main/librsync/APKBUILD b/main/librsync/APKBUILD
index e7be9aaf1cb534dfc6c9f0e97016ef8154696c10..c1bdf7e495d001be2b69d671e7faadfebfd91582 100644
--- a/main/librsync/APKBUILD
+++ b/main/librsync/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="librsync implements the rolling-checksum algorithm of rsync"
 url="https://github.com/librsync/librsync"
 arch="all"
-license="LGPL 2.1"
+license="LGPL-2.1"
 makedepends="cmake popt-dev bzip2-dev zlib-dev perl"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/librsync/librsync/archive/v$pkgver.tar.gz
diff --git a/main/libseccomp/APKBUILD b/main/libseccomp/APKBUILD
index f6a40a0a4820644305ab55f9bf1e5a41719141da..61faa8e070ea0b544a967c8a986d4ef6c960aca4 100644
--- a/main/libseccomp/APKBUILD
+++ b/main/libseccomp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An interface to the Linux Kernel's syscall filtering mechanism"
 url="https://github.com/seccomp/libseccomp"
 arch="all"
-license="LGPLv2.1"
+license="LGPL-2.1"
 makedepends="linux-headers"
 checkdepends="bash"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/libsecret/APKBUILD b/main/libsecret/APKBUILD
index 2c25a2792b89889385a5556f5f1df13458d590b4..64118b09b1d5098a3459800edd3f14221aa45593 100644
--- a/main/libsecret/APKBUILD
+++ b/main/libsecret/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Library for storing and retrieving passwords and other secrets"
 url="https://live.gnome.org/Libsecret"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="glib-dev"
 makedepends="$depends_dev intltool libxslt-dev docbook-xsl libgcrypt-dev
diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 522f427a8e87a36c933b2abef6057d24ec4c4ab5..203dbf95ebf81958872246422fa6bfdebd057622 100644
--- a/main/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A C library for reading and writing files containing sampled sound"
 url="http://www.mega-nerd.com/libsndfile"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
 depends_dev="flac-dev libvorbis-dev libogg-dev"
diff --git a/main/libsoup/APKBUILD b/main/libsoup/APKBUILD
index 249536a59e75e0b83bd352576843ab4baa3b1229..15dc182937451229ff643cd39e1e958c03aa1dae 100644
--- a/main/libsoup/APKBUILD
+++ b/main/libsoup/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Gnome HTTP Library"
 url="http://live.gnome.org/LibSoup"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends="glib-networking"
 depends_dev="gnutls-dev sqlite-dev"
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 4d22d8b6c9a1b11522c89144a4a27a559b9ec31a..27855d6d87ae4310715f193258395f71fc3faa15 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
 url="http://www.libspf2.org"
 arch="all"
-license="LGPL2.1 BSD-2"
+license="LGPL-2.1 BSD-2"
 subpackages="$pkgname-dev $pkgname-tools"
 makedepends="autoconf automake libtool"
 depends=
diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 75b74da477a31b8cec1f58fb82330b58158da411..2e24ca63b24ba3da11bc3172f2881b44e4a0283f 100644
--- a/main/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="The ASN.1 library used in GNUTLS"
 url="https://www.gnu.org/software/gnutls/"
 arch="all"
-license="GPL3 LGPL"
+license="GPL-3.0 LGPL"
 makedepends="texinfo"
 subpackages="$pkgname-dev $pkgname-doc"
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD
index 7528563de24541c3b1b910b5f49155523129a7dc..8dedd123decf5a4398a1815d7c2097b29621e113 100644
--- a/main/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library to enable user space application programs to communicate with USB devices"
 url="http://libusb.info/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev"
 replaces="libusbx"
 makedepends="linux-headers"
diff --git a/main/libvncserver/APKBUILD b/main/libvncserver/APKBUILD
index 6851a8c44e49f4f00fa2dd35ca3438874c549cdc..05fa8ea36f1a6a87c5222101c321a9e4407c81cb 100644
--- a/main/libvncserver/APKBUILD
+++ b/main/libvncserver/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Library to make writing a vnc server easy"
 url="http://libvncserver.sourceforge.net/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev
 	libice-dev libx11-dev libxdamage-dev libxext-dev libxfixes-dev
diff --git a/main/libwebsockets/APKBUILD b/main/libwebsockets/APKBUILD
index b9a195a49992e021a53e9ade0b7afe143889da53..c0a8e4c24fb46ac9f98cbc25f9497d4ba4beef1c 100644
--- a/main/libwebsockets/APKBUILD
+++ b/main/libwebsockets/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="C library for lightweight websocket clients and servers"
 url="http://libwebsockets.org"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check"
 makedepends="cmake zlib-dev libressl-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-test:_test"
diff --git a/main/libxfce4ui/APKBUILD b/main/libxfce4ui/APKBUILD
index 275678fd612641f600262a35dcb9dca74cd50716..2bfc1c14484776d1c6aaf40e043d895a011a6ec5 100644
--- a/main/libxfce4ui/APKBUILD
+++ b/main/libxfce4ui/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Widgets library for the Xfce desktop environment"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-gtk3"
 depends=
 depends_dev="startup-notification-dev"
diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD
index 1abf7be6a2e370f940891d3965be8486c1a16f64..282c3313e7de6044f5db4595238422bc49ffa7b3 100644
--- a/main/libxfce4util/APKBUILD
+++ b/main/libxfce4util/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="Basic utility non-GUI functions for Xfce"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 makedepends="glib-dev intltool"
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index fafb39f44d2f79769471671238e2c91cf7a1936d..2aba071f30d8fc42727b1574d09a180fc3f9dfc2 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="A text WWW browser, similar to Lynx"
 url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends=""
 makedepends="zlib-dev libressl-dev bzip2-dev"
diff --git a/main/linux-hardened/APKBUILD b/main/linux-hardened/APKBUILD
index e4eddd8b3395ee5f9369850e9bd0aee261d37c4c..c8aa0de4273fa775a37b6f8d5672e37ed19ce58f 100644
--- a/main/linux-hardened/APKBUILD
+++ b/main/linux-hardened/APKBUILD
@@ -44,7 +44,7 @@ for _i in $source; do
 done
 
 arch="x86 x86_64 armhf"
-license="GPL2"
+license="GPL-2.0"
 
 prepare() {
 	local _patch_failed=
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 3dc9c394406b0a75b22a3f702ebb7f3accf88b17..5f6a6aceeff399409cb4ba2f39aa24aff5533a8a 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -40,7 +40,7 @@ for _i in $source; do
 done
 
 arch="armhf"
-license="GPL2"
+license="GPL-2.0"
 
 prepare() {
 	local _patch_failed=
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index e8b9f7ddfefd32490339efb7919d326fe66c5d72..08cd571a0297e26cc8fd6c42885d24514aa28b2f 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -32,7 +32,7 @@ if [ "${pkgver%.0}" = "$pkgver" ]; then
 fi
 subpackages="$pkgname-dev::$CBUILD_ARCH"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 
 _abi_release=${pkgver}
 _carch=${CARCH}
diff --git a/main/lksctp-tools/APKBUILD b/main/lksctp-tools/APKBUILD
index 9bde8840d2a338b1df6ac2966a95eb27aa3c89c5..af4336408cc0d5ddfcc381b0dc5076ddbe8ba263 100644
--- a/main/lksctp-tools/APKBUILD
+++ b/main/lksctp-tools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="User-space access to Linux Kernel SCTP"
 url="http://lksctp.sourceforge.net"
 arch="all"
-license="GPLv2 and GPLv2+ and LGPLv2 and MIT"
+license="GPL-2.0 and GPL-2.0-or-later and LGPL-2.0 and MIT"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libtool automake autoconf linux-headers"
diff --git a/main/logrotate/APKBUILD b/main/logrotate/APKBUILD
index e635ec62af5b1418a2c311554e025d808622c785..509bddec2ddeb872cf6059ab926b0f15d635df55 100644
--- a/main/logrotate/APKBUILD
+++ b/main/logrotate/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Tool to rotate logfiles"
 url="https://github.com/logrotate/logrotate"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="popt-dev autoconf automake libtool"
 subpackages="$pkgname-doc"
diff --git a/main/logtail/APKBUILD b/main/logtail/APKBUILD
index 2f3903de41253f3d8ded7356423f95d08ef5afb9..e4c61eacea4d1d312c1d6c84a437e434ca0fd954 100644
--- a/main/logtail/APKBUILD
+++ b/main/logtail/APKBUILD
@@ -15,7 +15,7 @@ pkgrel=0
 pkgdesc="Print new lines in log file since the last run (sf.net $pkgname-v3 ver)"
 url="http://logtail-v3.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 subpackages=""
diff --git a/main/loudmouth/APKBUILD b/main/loudmouth/APKBUILD
index a6dc591ef704a696bc0064e810d97795f616ac7c..b123a9ced52ae5644d10ea8d5756aa1b0b909905 100644
--- a/main/loudmouth/APKBUILD
+++ b/main/loudmouth/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A lightweight Jabber client library"
 url="http://groups.google.com/group/loudmouth-dev"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends_dev="pkgconfig gnutls-dev libidn-dev libasyncns-dev check-dev autoconf"
 makedepends="$depends_dev glib-dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/lsyncd/APKBUILD b/main/lsyncd/APKBUILD
index d65057e29c15b795b8ec4dd34a02d6b4b260ce02..55a573198e9123d953f73f989ed56de1aef06dba 100644
--- a/main/lsyncd/APKBUILD
+++ b/main/lsyncd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Live Syncing (Mirror) Daemon"
 url="https://github.com/axkibe/lsyncd"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="rsync"
 makedepends="$depends_dev cmake lua lua-dev"
 options="!check"
diff --git a/main/lttng-ust/APKBUILD b/main/lttng-ust/APKBUILD
index baceb31dbddfe8a96cbb3976e05e514a4e444536..af1a8d62deb1c20ad72598b12c79296c8ec4c72a 100644
--- a/main/lttng-ust/APKBUILD
+++ b/main/lttng-ust/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="LTTng 2.0 Userspace Tracer"
 url="https://lttng.org"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="userspace-rcu-dev>0.10 util-linux-dev linux-headers bash"
 install=""
 subpackages="$pkgname-doc $pkgname-dev"
diff --git a/main/lua-bitlib/APKBUILD b/main/lua-bitlib/APKBUILD
index 71da7b9b4e19ba923cb9a319d47df0a84624fba2..bc9fced031994ac5d3515585a0999a76440a0aa9 100644
--- a/main/lua-bitlib/APKBUILD
+++ b/main/lua-bitlib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A lua library providing bitwise operations"
 url="https://github.com/keplerproject/lua-compat-5.2"
 arch="all"
-license="MIT/X11"
+license="MIT"
 depends=""
 makedepends=""
 subpackages=""
diff --git a/main/lua-cmsgpack/APKBUILD b/main/lua-cmsgpack/APKBUILD
index 9d35b253ceb7291a966349d7bfbc22561751f789..6d70f293374d40e1572f56605a1c9c6ccfdff873 100644
--- a/main/lua-cmsgpack/APKBUILD
+++ b/main/lua-cmsgpack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="MessagePack C implementation for Lua"
 url="https://github.com/antirez/lua-cmsgpack"
 arch="all"
-license="Two-clause BSD"
+license="BSD-2-Clause"
 depends=""
 depends_dev=""
 makedepends="lua-dev"
diff --git a/main/lua-crypto/APKBUILD b/main/lua-crypto/APKBUILD
index 4c42a54b4178a7145eda1dca321992456995c23d..fe58f0078a2252b75a70997e35230510490d01b4 100644
--- a/main/lua-crypto/APKBUILD
+++ b/main/lua-crypto/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="a Lua frontend to the OpenSSL cryptographic library"
 url="http://mkottman.github.io/luacrypto/"
 arch="all"
-license="MIT/X11"
+license="MIT"
 depends=
 makedepends="libressl-dev lua-dev"
 install=
diff --git a/main/lua-curl/APKBUILD b/main/lua-curl/APKBUILD
index a34699b155358ff7bde10bcb22b72ff3f7ef9b28..09bc93588321e6035969113b86c3b1e174fc1617 100644
--- a/main/lua-curl/APKBUILD
+++ b/main/lua-curl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Lua bindings to cURL library"
 url="https://github.com/Lua-cURL/Lua-cURLv3"
 arch="all"
-license="MIT/X11"
+license="MIT"
 depends=""
 makedepends="curl-dev"
 subpackages=""
diff --git a/main/lua-json4/APKBUILD b/main/lua-json4/APKBUILD
index dc5211804eb4ff13a99a96280321fe3f39f2f4f8..fca92c35ce0fa4259044105a1578780edb9a757a 100644
--- a/main/lua-json4/APKBUILD
+++ b/main/lua-json4/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="JSON encoding / decoding module for Lua (JSON4lua)"
 url="https://github.com/craigmj/json4lua"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 subpackages=""
 for _i in $_luaversions; do
diff --git a/main/lua-pc/APKBUILD b/main/lua-pc/APKBUILD
index cf402d737d68f7f1d818a2c7712633b5a917fd4a..f24034c99ae2800d5cd9a919d582720ab06bf710 100644
--- a/main/lua-pc/APKBUILD
+++ b/main/lua-pc/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=9
 pkgdesc="Lua Process Call"
 url="https://github.com/LuaDist/lpc"
 arch="all"
-license="MIT/X11"
+license="MIT"
 makedepends=""
 depends="lua5.1-pc"
 source="http://dev.alpinelinux.org/archive/lpc/lpc-$pkgver.tar.gz
diff --git a/main/lua-posixtz/APKBUILD b/main/lua-posixtz/APKBUILD
index 2121cffa8a33d138ecfe33d46a97961bdafe72c3..9a6e34092be2a0d95573ba02960a86a7b5022b19 100644
--- a/main/lua-posixtz/APKBUILD
+++ b/main/lua-posixtz/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Lua module to extract POSIX timezone from tzdata"
 url="http://git.alpinelinux.org/cgit/posixtz.git/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-posixtz:split_${_i/./_}"
diff --git a/main/lua-pty/APKBUILD b/main/lua-pty/APKBUILD
index d3087dca08692d7f8ceecf7839fac7c9ae6b1964..7d22b9c6f96d9e193544fa9fc5ad7ed15ae7c16c 100644
--- a/main/lua-pty/APKBUILD
+++ b/main/lua-pty/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Lua module to control other programs via PTYs."
 url="http://www.tset.de/lpty/"
 arch="all"
-license="MIT/X11"
+license="MIT"
 depends=""
 makedepends=""
 source="http://www.tset.de/downloads/$_pkgname-$pkgver-$_rockver.tar.gz"
diff --git a/main/lua-uuid/APKBUILD b/main/lua-uuid/APKBUILD
index b309e4c12601e7270a1d942a21b922b936ec41cf..a8a9e937acb5abd1a5da53b4711e54eccae09e9b 100644
--- a/main/lua-uuid/APKBUILD
+++ b/main/lua-uuid/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Lua library generating universally unique identifiers based on libuuid"
 url="http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 depends=
 makedepends="lua-dev util-linux-dev"
 install=
diff --git a/main/lua-xctrl/APKBUILD b/main/lua-xctrl/APKBUILD
index 7bae7217ada8961848eb40f3eb96e68c0d6ce64d..734b8ea62547f6234b3cbf7a91b8bcee5c0929e8 100644
--- a/main/lua-xctrl/APKBUILD
+++ b/main/lua-xctrl/APKBUILD
@@ -11,7 +11,7 @@ _luaversions="5.1 5.2 5.3"
 pkgdesc="Lua module that allows you to query and manipulate various aspects of an X11 window manager"
 url="https://github.com/yetanothergeek/xctrl"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="lua-dev libx11-dev libxmu-dev"
 for _i in $_luaversions; do
diff --git a/main/lxpolkit/APKBUILD b/main/lxpolkit/APKBUILD
index df1a81983b5cf904ee3bbb66c3aaa460b744a503..b5527029a2cce7e90e4d1d131b34af908bedec3b 100644
--- a/main/lxpolkit/APKBUILD
+++ b/main/lxpolkit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Simple PolicyKit authentication agent"
 url="http://lxde.org/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="gtk+-dev polkit-dev"
 install=""
diff --git a/main/lxsession/APKBUILD b/main/lxsession/APKBUILD
index 798f744113d865b747d2953b6d490604082f9079..ee9d4785dc5a493b723806ba5dfe2651454db4bc 100644
--- a/main/lxsession/APKBUILD
+++ b/main/lxsession/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Lightweight X11 session manager"
 url="http://lxde.org/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="gtk+-dev dbus-glib-dev polkit-dev libunique-dev"
 install=""
diff --git a/main/lxterminal/APKBUILD b/main/lxterminal/APKBUILD
index dc596b0416de6d7d8e2b7fb401cc320c95340a69..660528c961d70293e3af8200b91df99dc6aa2c0e 100644
--- a/main/lxterminal/APKBUILD
+++ b/main/lxterminal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Desktop-independent VTE-based terminal emulator"
 url="http://lxde.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="vte-dev"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/main/lzip/APKBUILD b/main/lzip/APKBUILD
index 9689d0e3ab55dd8f11d84c767dd916455f1fb148..0f1c98b4295c96bd6c1b86aa2b884b7b27560eaa 100644
--- a/main/lzip/APKBUILD
+++ b/main/lzip/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Lzip is a lossless data compressor"
 url="http://www.nongnu.org/lzip/lzip.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
 
diff --git a/main/mailcap/APKBUILD b/main/mailcap/APKBUILD
index 9685e2661d372ae2c00556eafb22977e8ebae03f..83088eb6d08d26f928ca223d7e7f8e91c9de46e4 100644
--- a/main/mailcap/APKBUILD
+++ b/main/mailcap/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Helper application and MIME type associations for file types"
 url="http://git.fedorahosted.org/git/mailcap.git"
 arch="noarch"
-license="Public Domain and MIT"
+license="Public-Domain and MIT"
 subpackages="$pkgname-doc"
 source="https://releases.pagure.org/$pkgname/$pkgname-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index aea893862a06ffee449626ed7d001e2503efadce..4fc238fedc90065b9b50f45587927d083a999262 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="GNU make utility to maintain groups of programs"
 url="https://www.gnu.org/software/make"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 subpackages="$pkgname-doc"
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index b1567d6b3357f36a9e6c9c7c60c072db1b57c8b5..2e0de9aef75a2c44f6e1966dda9f473d1155a220 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A filemanager/shell that emulates Norton Commander"
 url="http://www.midnight-commander.org"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 subpackages="$pkgname-doc $pkgname-lang"
 makedepends="e2fsprogs-dev glib-dev pcre-dev ncurses-dev libssh2-dev"
diff --git a/main/mcabber/APKBUILD b/main/mcabber/APKBUILD
index 7bcac50a136bb44519c4acfafb8551aed6fc1600..6eb7a72bda991fb5fde3fabbe2f10c45410e2563 100644
--- a/main/mcabber/APKBUILD
+++ b/main/mcabber/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A small Jabber console client"
 url="https://mcabber.com"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="beep"
 options="libtool"
 makedepends="loudmouth-dev glib-dev ncurses-dev gpgme-dev aspell-dev
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index 6d4650a804128f63e946802b0adb057c225be6d8..1b16327895cc4c16b3c7e6a03d65e3d052b65cbf 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="a tool for managing Linux Software RAID arrays"
 url="http://neil.brown.name/blog/mdadm"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="groff linux-headers"
 subpackages="$pkgname-doc $pkgname-udev::noarch $pkgname-misc::noarch"
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index 0a80bc5238a194efdf7df617b614d1d113f82a6b..95e1db015207c927227e12e2ce3a0c9776eb9cc5 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A scalable distributed SCM tool"
 url="https://www.mercurial-scm.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="python2-dev"
 subpackages="
diff --git a/main/meson/APKBUILD b/main/meson/APKBUILD
index 2d9ef5964c3c6b6a40e576c066716067607329a9..aeab7d85ff40ae83404c0a7a04432b67eb034b91 100644
--- a/main/meson/APKBUILD
+++ b/main/meson/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Build system meant to be both extremely fast and as user friendly as possible"
 url="http://mesonbuild.com/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python3 ninja"
 makedepends="python3-dev"
 subpackages="$pkgname-doc"
diff --git a/main/mg/APKBUILD b/main/mg/APKBUILD
index c225af2b55181d2a645e5c2abf8c5003afb8fc57..7337df80338f198a53f4c65a798efc215daa1453 100644
--- a/main/mg/APKBUILD
+++ b/main/mg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="microscopic EMACS style editor"
 url="http://homepage.boetes.org/software/mg"
 arch="all"
-license="Public domain"
+license="Public-Domain"
 depends=
 makedepends="ncurses-dev libbsd-dev bsd-compat-headers"
 install=
diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD
index ff38b2afc2d269db31b79393a269b5b456ad63f2..98fde340dce544a37d8b45fe8365af21dce4595f 100644
--- a/main/minicom/APKBUILD
+++ b/main/minicom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="menu driven communications program for terminals"
 url="https://alioth.debian.org/projects/minicom"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="ncurses-dev gettext-dev linux-headers"
 install=""
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 16ca1a91e9a8da66ee5a93ebb03f75467afbce4e..31643dcadfe3f0bd374deef00fadf254371f6d41 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url="https://git.alpinelinux.org/cgit/mkinitfs"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends_build=""
 makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev linux-headers"
 makedepends="$makedepends_build $makedepends_host"
diff --git a/main/monkeysphere/APKBUILD b/main/monkeysphere/APKBUILD
index 1cc072a0c642dde56675b132366161d0f9fe6ff1..726ab37eb3d387a819c4277627b574f1afd522ba 100644
--- a/main/monkeysphere/APKBUILD
+++ b/main/monkeysphere/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="openpgp web of trust certification tools for SSH and TLS servers"
 url="http://web.monkeysphere.info/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="libressl gnupg"
 makedepends="libassuan-dev libgcrypt-dev"
 depends_dev=""
diff --git a/main/mosh/APKBUILD b/main/mosh/APKBUILD
index cd7e4d1659e391c89ce00bb838d247e40b00efa0..dd3ff9a5692dd90f648070cdd996786f73c01794 100644
--- a/main/mosh/APKBUILD
+++ b/main/mosh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Mobile shell surviving disconnects with local echo and line editing"
 url="https://mosh.org"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="$pkgname-client $pkgname-server"
 checkdepends="tmux perl"
 makedepends="ncurses-dev zlib-dev libressl-dev perl-dev perl-io-tty
diff --git a/main/motif/APKBUILD b/main/motif/APKBUILD
index 70691a13d0e645034b9512414faf3cad2c795be0..94024b459e17dfbc96fbb96b14526128118225f2 100644
--- a/main/motif/APKBUILD
+++ b/main/motif/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="The Motif library"
 url="http://motif.ics.com/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="libx11-dev libxft-dev libxt-dev libxpm-dev libxext-dev xbitmaps"
 makedepends="$depends_dev libtool autoconf automake flex flex-libs flex-dev bison"
diff --git a/main/mousepad/APKBUILD b/main/mousepad/APKBUILD
index 2c496f97506f06daa17d8237220dd2df19c7d897..cba3fd4af8a7a58ec24ba578e201de2a54690472 100644
--- a/main/mousepad/APKBUILD
+++ b/main/mousepad/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Simple Text Editor for Xfce4"
 url="http://foo-projects.org/~benny/xfce/apps.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="gtk+2.0-dev gtksourceview2-dev"
 depends="desktop-file-utils"
 install=""
diff --git a/main/mp3splt-gtk/APKBUILD b/main/mp3splt-gtk/APKBUILD
index e1f5f49492b97b5a7640f2da5c93a7a330de69d8..5b908abdc06f0628987e2e3fb44be514de9b7808 100644
--- a/main/mp3splt-gtk/APKBUILD
+++ b/main/mp3splt-gtk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Gtk frontend for mp3splt"
 url="http://mp3splt.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="gtk+3.0-dev gst-plugins-base-dev libmp3splt-dev
 			autoconf automake libtool"
diff --git a/main/mp3splt/APKBUILD b/main/mp3splt/APKBUILD
index ad84a89573c72e2a06b1ccf323c5218490b41cc8..7c353fa6e9ba5bc2a288e669f7e699d4d0990b82 100644
--- a/main/mp3splt/APKBUILD
+++ b/main/mp3splt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A command-line, AlbumWrap and mp3wrap file exctractor"
 url="http://mp3splt.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="libmp3splt-dev"
 install=""
diff --git a/main/mpc1/APKBUILD b/main/mpc1/APKBUILD
index 7d0b40107ae20975ad18eddbb0b8f58b03aed39e..6552a588db9862b38808061a82a9907fc3918953 100644
--- a/main/mpc1/APKBUILD
+++ b/main/mpc1/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Multiprecision C library"
 url="http://www.multiprecision.org/"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=
 makedepends_host="gmp-dev mpfr-dev"
 makedepends="$makedepends_host"
diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD
index cde84fe39c0d9fb43e2ea3b608e339ae4752cfb3..e117d3fb916ada5623e279bca3cbd617d8147df1 100644
--- a/main/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 url="http://www.mpg123.org/"
 arch="all"
-license="GPL2 LGPL2"
+license="GPL-2.0 LGPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=""
 makedepends="libtool alsa-lib-dev linux-headers"
diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD
index bb6b253ab1b1311c0c66c29af7a3b658a76b1bf7..c2fa9b1437265166139f0adf788fac4daa40bcb5 100644
--- a/main/msmtp/APKBUILD
+++ b/main/msmtp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="SMTP client with a sendmail compatible interface"
 url="http://msmtp.sourceforge.net/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 makedepends="libressl-dev"
 install=""
diff --git a/main/mt-st/APKBUILD b/main/mt-st/APKBUILD
index e84367d687c28a726d21912480ce40a5e235f9e1..b776f310940524329ecd612b5d63d0b21b02ce3c 100644
--- a/main/mt-st/APKBUILD
+++ b/main/mt-st/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="Linux SCSI tape driver aware magnetic tape control"
 url="http://www.ibiblio.org/pub/linux/system/backup/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends='linux-headers'
 install=
diff --git a/main/mtx/APKBUILD b/main/mtx/APKBUILD
index d3558f40df9d3dc4b390a410df87565eb4cf2285..58830f5907b50f997fc95c439a2fda65cb1584a0 100644
--- a/main/mtx/APKBUILD
+++ b/main/mtx/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="SCSI Media Changer and Backup Device Control"
 url="http://mtx.opensource-sw.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/main/multisort/APKBUILD b/main/multisort/APKBUILD
index 2a16faec51a84d415d64f4bd859b2d655285ba9b..357f9c5ee9122732be1cba67a933e3cd2e6337dc 100644
--- a/main/multisort/APKBUILD
+++ b/main/multisort/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Tool to merge multiple logfiles"
 url="https://www.xach.com/multisort/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends=""
 install=""
diff --git a/main/mupdf/APKBUILD b/main/mupdf/APKBUILD
index cfab6145db78e843a57c3a0f09b04ccff5971148..c472980d8fe93705d5ea036b63d10fa8fcb046a0 100644
--- a/main/mupdf/APKBUILD
+++ b/main/mupdf/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A lightweight PDF and XPS viewer"
 url="http://mupdf.com"
 arch="all"
-license="AGPL3+"
+license="AGPL-3.0-or-later"
 depends=""
 makedepends="freetype-dev jpeg-dev jbig2dec-dev libx11-dev libxext-dev
 	openjpeg-dev harfbuzz-dev freeglut-dev"
diff --git a/main/myrepos/APKBUILD b/main/myrepos/APKBUILD
index 97ee8238f7812d8d132535e41de2e8772ce8d715..ea756ab53a3982f651bef4030c58901603143ef4 100644
--- a/main/myrepos/APKBUILD
+++ b/main/myrepos/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A multiple repository management tool"
 url="https://git.joeyh.name/git/myrepos.git"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="perl git"
 depends_dev=""
 makedepends=""
diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index 87745d02c085a01474acdef8da0d40d680b7f8df..55921faa368f79052b0613fd979885d6223138ab 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="Plugins for Nagios to check services on hosts"
 url="https://nagios-plugins.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_by_ssh="openssh-client"
 depends_dig="bind-tools"
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index 639644ea67a3af4a5ff3efbad52137cbb4a86c0b..5794efdd54f851265ad1ce429ca6fcdddab5df51 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Popular monitoring tool"
 url="https://www.nagios.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="perl"
 install="$pkgname.pre-install"
 makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp"
diff --git a/main/nasm/APKBUILD b/main/nasm/APKBUILD
index 490d773c0cad7f068c88d8d8d25f6df7554ab9eb..85bd6c69acf8a59efd5627f64a79eff2c7ba60e0 100644
--- a/main/nasm/APKBUILD
+++ b/main/nasm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="80x86 assembler designed for portability and modularity"
 url="http://nasm.sourceforge.net"
 arch="all"
-license="BSD-2"
+license="BSD-2-Clause"
 checkdepends="perl"
 subpackages="$pkgname-doc"
 source="http://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.bz2"
diff --git a/main/net-tools/APKBUILD b/main/net-tools/APKBUILD
index d6c3c31912b1a34587d78199cdbfbfa6dbe5bcae..926403e3d39f44285255e6f7fef990f4f209b6a2 100644
--- a/main/net-tools/APKBUILD
+++ b/main/net-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Linux networking base tools"
 url="https://sourceforge.net/projects/net-tools/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="mii-tool"
 depends_dev=""
 makedepends="$depends_dev bash linux-headers"
diff --git a/main/netcf/APKBUILD b/main/netcf/APKBUILD
index 8814866bfda44c3de4e9e369bc0a57da1c6dbaac..d35c12f8116a21fada24a4d3b74a560de9992d7f 100644
--- a/main/netcf/APKBUILD
+++ b/main/netcf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="Cross-platform network configuration library"
 arch="all"
 url="https://fedorahosted.org/released/netcf"
-license="LGPLv2"
+license="LGPL-2.0"
 depends=
 makedepends="augeas-dev libgcrypt-dev libnl3-dev libxml2-dev libxslt-dev
 	linux-headers pkgconfig readline-dev"
diff --git a/main/nettle/APKBUILD b/main/nettle/APKBUILD
index 3976266b0ddacf6fc6e0d84ffaa37e0a8099ea44..1b961171c1ea7a3b43614e2336c1f0082fe4dda3 100644
--- a/main/nettle/APKBUILD
+++ b/main/nettle/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A low-level cryptographic library"
 url="http://www.lysator.liu.se/~nisse/nettle/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="gmp-dev"
 makedepends="$depends_dev m4"
diff --git a/main/newt/APKBUILD b/main/newt/APKBUILD
index 70f0a55588cad8a7144f0b04a6cf12ff6b5719eb..323368b3cb82ac3ff3a136ce55aff9e7c8b8ea4e 100644
--- a/main/newt/APKBUILD
+++ b/main/newt/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Redhat's Newt windowing toolkit development files"
 url="https://pagure.io/newt/"
 arch="all"
-license="LGPL2"
+license="LGPL-2.0"
 makedepends="slang-dev popt-dev python2-dev python3-dev ncurses-dev"
 subpackages="$pkgname-dev $pkgname-doc py-newt:py2 py3-newt:py3 $pkgname-lang"
 source="https://releases.pagure.org/newt/newt-$pkgver.tar.gz
diff --git a/main/nftables/APKBUILD b/main/nftables/APKBUILD
index bd2f76ef9b95b5f02a9e435cef101edac1dda2cc..3dd2a36cc3c6ecc2dec6e0ed491f39159e06fb4f 100644
--- a/main/nftables/APKBUILD
+++ b/main/nftables/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Netfilter tables userspace tools"
 url="http://netfilter.org/projects/nftables/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libmnl-dev libnftnl-dev gmp-dev readline-dev
 	ncurses-dev bison flex docbook2x"
 subpackages="$pkgname-doc"
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index ccd97dc5f24f28cd4c639b049821453e1ee85e8b..0938a6217a17480fdf0f9557cab7260f450d6ac1 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Next Generation IRC Daemon"
 url="https://ngircd.barton.de/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="libressl-dev zlib-dev linux-pam-dev"
 subpackages="$pkgname-doc"
diff --git a/main/nikto/APKBUILD b/main/nikto/APKBUILD
index 930fc4a65fcb8ca9b6369bcd2fdc324df4a0f7f3..9ce05963b4be08f6e92fd1d02bf1590de03a85fa 100644
--- a/main/nikto/APKBUILD
+++ b/main/nikto/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A web application security scanner"
 url="https://www.cirt.net/Nikto2"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl nmap libressl"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/npth/APKBUILD b/main/npth/APKBUILD
index 3e808b0258ec1a366b60d0ba76edd2cb15fb605c..c9c828da6a6c4c1a6bd2e70b5aa8068e1af2bef3 100644
--- a/main/npth/APKBUILD
+++ b/main/npth/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="The New GNU Portable Threads library"
 url="ftp://ftp.gnupg.org/gcrypt/npth/"
 arch="all"
-license="LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
+license="LGPL-3.0-or-later or GPL-2.0-or-later or (LGPL-3.0-or-later and GPL-2.0-or-later)"
 subpackages="$pkgname-dev"
 source="ftp://ftp.gnupg.org/gcrypt/npth/npth-$pkgver.tar.bz2"
 
diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index a485f8bae92ea75a743defb8eb2d6de1430a0079..bb682d89f053eb10261c8da969fd806fabde352d 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Netscape Portable Runtime"
 url="http://www.mozilla.org/projects/nspr/"
 arch="all"
-license="MPL-1.1 GPL2 LGPL-2.1"
+license="MPL-1.1 GPL-2.0 LGPL-2.1"
 options="!check"  # No test suite.
 depends=
 # -dev package does not ship any symlinks so dependency cannot be autodetected
diff --git a/main/nss-pam-ldapd/APKBUILD b/main/nss-pam-ldapd/APKBUILD
index 7caf5a1ade0b71fd18c9363797e71a453e3488b5..40f8ca0ea60f2efd2ca3abac272052e0a21fb6bc 100644
--- a/main/nss-pam-ldapd/APKBUILD
+++ b/main/nss-pam-ldapd/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="An nsswitch module which uses directory servers"
 url="https://arthurdejong.org/nss-pam-ldapd/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="linux-pam-dev openldap-dev"
 makedepends="$depends_dev"
diff --git a/main/obex-data-server/APKBUILD b/main/obex-data-server/APKBUILD
index aab4281e80df0786c6f63b950f9a028ac5c4466f..5dd1ec5cba2fa972e9e3a416093450ca170da78f 100644
--- a/main/obex-data-server/APKBUILD
+++ b/main/obex-data-server/APKBUILD
@@ -4,7 +4,7 @@ pkgver=0.4.6
 pkgrel=4
 pkgdesc="D-Bus service for Obex access"
 url="http://wiki.muiline.com/obex-data-server"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 arch="all"
 depends=""
 subpackages="$pkgname-doc"
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD
index 0b68a16d737a138e47e25cd1a4bbbb8443d775b6..1b29522f42b569d2267586e4abee8a15161379c0 100644
--- a/main/omxplayer/APKBUILD
+++ b/main/omxplayer/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Commandline OMX player for Raspberry Pi"
 url="https://github.com/popcornmix/omxplayer"
 arch="armhf"
-license="GPLv2"
+license="GPL-2.0"
 depends="ttf-freefont"
 makedepends="linux-headers raspberrypi-dev ffmpeg-dev pcre-dev
 	boost-dev freetype-dev dbus-dev alsa-lib-dev"
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index 1fcb1c127a0d52b3c360be7396794993c26bab3f..b9944df12541ea24f535132c7766603cd5fc531f 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
 url="http://www.open-iscsi.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="autoconf automake libressl-dev libtool linux-headers open-isns-dev
 	util-linux-dev"
 options="!check"
diff --git a/main/open-isns/APKBUILD b/main/open-isns/APKBUILD
index 62605465a62a180846a04637c6ad53f7ad9011e1..1da72f27499f798d59b56130e107d49cb0f286e2 100644
--- a/main/open-isns/APKBUILD
+++ b/main/open-isns/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="iSNS server and client for Linux"
 url="https://github.com/open-iscsi/open-isns"
 arch="all"
-license="LGPL2"
+license="LGPL-2.0"
 makedepends="autoconf automake libressl-dev musl-dev"
 options="!check"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lib"
diff --git a/main/openbox/APKBUILD b/main/openbox/APKBUILD
index fb1c4331dae97f5647f34f85a9636ef99def8d65..eb1619ff6a86c962fe0c5673ae14681a06c684e8 100644
--- a/main/openbox/APKBUILD
+++ b/main/openbox/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A highly configurable and standards-compliant X11 window manager"
 url="http://openbox.org"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=
 depends_dev="libxcursor-dev libxrandr-dev libxinerama-dev startup-notification-dev"
 makedepends="$depends_dev pango-dev libxml2-dev imlib2-dev librsvg-dev
diff --git a/main/openipmi/APKBUILD b/main/openipmi/APKBUILD
index a8867b0cf7359535ccf761f0e6ceef8755db5a36..5bad6d1d98e53d4db437a48007bdc689551681a1 100644
--- a/main/openipmi/APKBUILD
+++ b/main/openipmi/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="IPMI (Intelligent Platform Management Interface) library and tools"
 url="https://sourceforge.net/projects/openipmi/"
 arch="all"
-license="LGPLv2+ and GPLv2+ or BSD"
+license="LGPL-2.0-or-later and GPL-2.0-or-later or BSD"
 depends=""
 depends_dev=""
 makedepends="$depends_dev popt-dev glib-dev net-snmp-dev ncurses-dev
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 1e67c6748e39ae96396580310cab0025a3638780..d7508246a92ef36f9e83be66b020c6fa4f0c7af1 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=6
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="https://sourceforge.net/projects/opennhrp"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="c-ares-dev linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/openpgm/APKBUILD b/main/openpgm/APKBUILD
index 3aeb362ab571fa43e103a803c8b42eea7cf7d2b2..a8407093d9a22f5c31ef25a4208bf0338038dbd9 100644
--- a/main/openpgm/APKBUILD
+++ b/main/openpgm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="An implementation of the PGM reliable multicast protocol"
 url="https://code.google.com/archive/p/openpgm/"
 arch="all"
-license="LGPL 2.1"
+license="LGPL-2.1"
 depends=""
 depends_dev=""
 makedepends="$depends_dev python2 perl"
diff --git a/main/openvswitch/APKBUILD b/main/openvswitch/APKBUILD
index 89248448d283b4eebc6bd24d5c20da30325719a7..03e4bc441cf556759e4dd067b8ebee17b4af867a 100644
--- a/main/openvswitch/APKBUILD
+++ b/main/openvswitch/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A production quality, multilayer virtual switch"
 url="http://openvswitch.org/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 depends_dev="libressl-dev"
 makedepends="$depends_dev perl python2 linux-headers bash py-six"
diff --git a/main/orage/APKBUILD b/main/orage/APKBUILD
index 78e4fb5730a2b37bd8206407f8e5cf6295844eb5..1df848dd1b551cf15c62cc491508e78651a791ed 100644
--- a/main/orage/APKBUILD
+++ b/main/orage/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A simple calendar application with reminders for Xfce"
 url="https://xfce.org/projects/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 makedepends="xfce4-panel-dev libnotify-dev libxfce4ui-dev libical-dev popt-dev"
diff --git a/main/ortp/APKBUILD b/main/ortp/APKBUILD
index e7d9d220bf039ee42edf24d0ea5f97d2f36c4580..5dff81a527999560ac1a497b2f6691694b91ae89 100644
--- a/main/ortp/APKBUILD
+++ b/main/ortp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A C library implementing the RTP protocol (RFC3550)"
 url="http://www.linphone.org/index.php/code_review/ortp"
 arch="all"
-license="LGPLv2+ VSL"
+license="LGPL-2.0-or-later VSL"
 depends=""
 makedepends=""
 install=""
diff --git a/main/p7zip/APKBUILD b/main/p7zip/APKBUILD
index 0d5ea4305acd2015e5b44584a4bd4f32ca6ef1ae..55f38372b27d333e127f855793c637175bae63b4 100644
--- a/main/p7zip/APKBUILD
+++ b/main/p7zip/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A command-line port of the 7zip compression utility"
 url="http://p7zip.sourceforge.net"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends=""
 makedepends="bash yasm nasm"
diff --git a/main/parallel/APKBUILD b/main/parallel/APKBUILD
index 534da129b6003ae011d145acdd20b07e4a18481c..8419e55358e21b8ee7c09e4e33265f758ba1910b 100644
--- a/main/parallel/APKBUILD
+++ b/main/parallel/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Shell tool for executing jobs in parallel"
 arch="noarch"
 url="http://www.gnu.org/software/parallel/"
-license="GPL3"
+license="GPL-3.0"
 depends="perl"
 subpackages="$pkgname-doc"
 options="!check"
diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD
index 066f791fc95c24382d6cb7b57c6df7a281f1ec36..2088bf928910ef511b3c92f94d7536f42a3561b0 100644
--- a/main/parted/APKBUILD
+++ b/main/parted/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=6
 pkgdesc="Utility to create, destroy, resize, check and copy partitions"
 url="https://www.gnu.org/software/parted/parted.html"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="readline-dev ncurses-dev lvm2-dev bash util-linux-dev"
diff --git a/main/patchutils/APKBUILD b/main/patchutils/APKBUILD
index c5782d58b247142c0b8ba6a9a8bf15e76e2f308e..c10a609478366e1990a0f44ebf30efa6453a99fa 100644
--- a/main/patchutils/APKBUILD
+++ b/main/patchutils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A collection of programs for manipulating patch files"
 url="http://cyberelk.net/tim/patchutils/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev xmlto"
diff --git a/main/pax-utils/APKBUILD b/main/pax-utils/APKBUILD
index 1e9cb019fa021f532422bf5577239e32145dd6e0..722df758e144eb7229e452f712583cc7d7d426a7 100644
--- a/main/pax-utils/APKBUILD
+++ b/main/pax-utils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="ELF related utils for ELF 32/64 binaries"
 url="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="scanelf"
 makedepends_build=""
 makedepends_host="linux-headers libcap-dev"
diff --git a/main/paxctl/APKBUILD b/main/paxctl/APKBUILD
index 80ecc5ebbc1f40e83e5e4e8d5935a9489a749e1e..6903f871a433af021580675fd6adbc3c13208afb 100644
--- a/main/paxctl/APKBUILD
+++ b/main/paxctl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Manage PaX releated program header flags"
 url="http://pax.grsecurity.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 install=
diff --git a/main/perl-cache-simple-timedexpiry/APKBUILD b/main/perl-cache-simple-timedexpiry/APKBUILD
index 4df6e40af342bbbcac32849db08f16dc0d787abe..d959b9f52e44eacad932be72cc7327ec668edd6a 100644
--- a/main/perl-cache-simple-timedexpiry/APKBUILD
+++ b/main/perl-cache-simple-timedexpiry/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Cache::Simple::TimedExpiry perl module"
 url="http://search.cpan.org/dist/Cache-Simple-TimedExpiry/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
diff --git a/main/perl-capture-tiny/APKBUILD b/main/perl-capture-tiny/APKBUILD
index 00bc380aa5b58e9ace11c91c9f6b024ec934a5b7..f5af46379cf317625073d0d9feac70f24685f7e6 100644
--- a/main/perl-capture-tiny/APKBUILD
+++ b/main/perl-capture-tiny/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Capture STDOUT and STDERR from Perl, XS or external programs"
 url="http://search.cpan.org/dist/Capture-Tiny/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-class-accessor/APKBUILD b/main/perl-class-accessor/APKBUILD
index 66b3644e9580968d6d65dbfd442de70a22a530d5..fb89f9449d35b787176764295fdbd141f41e2f3a 100644
--- a/main/perl-class-accessor/APKBUILD
+++ b/main/perl-class-accessor/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Class::Accessor perl module"
 url="http://search.cpan.org/dist/Class-Accessor/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-class-inspector/APKBUILD b/main/perl-class-inspector/APKBUILD
index 2f2489822759f1731a9b0c4220de866d475b8525..809347aa2f51db15b273366d6ac19fa63983ac36 100644
--- a/main/perl-class-inspector/APKBUILD
+++ b/main/perl-class-inspector/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Class::Inspector perl module"
 url="http://search.cpan.org/dist/Class-Inspector/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
diff --git a/main/perl-class-returnvalue/APKBUILD b/main/perl-class-returnvalue/APKBUILD
index 4bd570a37c49c664f5c37df0b61f7eaa61979380..f60c6fe3ff5a20a0d9ae2d95a8e1c5b3d2cdb984 100644
--- a/main/perl-class-returnvalue/APKBUILD
+++ b/main/perl-class-returnvalue/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Class::ReturnValue perl module"
 url="http://search.cpan.org/dist/Class-ReturnValue/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-devel-stacktrace"
 makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
diff --git a/main/perl-class-tiny/APKBUILD b/main/perl-class-tiny/APKBUILD
index 00cbd0cf91be2118eef95490a1e55caeeaf0a7bc..3db1a0c6c36f60d78615533d43135ec00b2ed6db 100644
--- a/main/perl-class-tiny/APKBUILD
+++ b/main/perl-class-tiny/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Minimalist class construction"
 url="http://search.cpan.org/dist/Class-Tiny/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends=""
 cpancheckdepends=""
diff --git a/main/perl-clone/APKBUILD b/main/perl-clone/APKBUILD
index c86c3affb7c5bdbb3297f7f562a43c25e9ada856..39e52851518e4070db233f6757b8569533a825ac 100644
--- a/main/perl-clone/APKBUILD
+++ b/main/perl-clone/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Clone perl module"
 url="http://search.cpan.org/dist/Clone/"
 arch="all"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-convert-uulib/APKBUILD b/main/perl-convert-uulib/APKBUILD
index 60adf45d24ee042d753693c99c0cabf37901af50..a3abf44343a587c93b026e73a5c213580e4df71c 100644
--- a/main/perl-convert-uulib/APKBUILD
+++ b/main/perl-convert-uulib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Convert::UUlib perl module"
 url="http://search.cpan.org/dist/Convert-UUlib/"
 arch="all"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev perl-canary-stability"
 install=""
diff --git a/main/perl-crypt-openssl-rsa/APKBUILD b/main/perl-crypt-openssl-rsa/APKBUILD
index 12a94bbd364f584bb40b4209ef212e352d0ddf9a..020a6860f51fe2ea59bf740b8f8691bdff6a19be 100644
--- a/main/perl-crypt-openssl-rsa/APKBUILD
+++ b/main/perl-crypt-openssl-rsa/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=9
 pkgdesc="RSA encoding and decoding, using the openSSL libraries"
 url="http://search.cpan.org/~perler/"
 arch="all"
-license="Perl Artistic, GPL"
+license="Perl Artistic GPL"
 depends="perl perl-crypt-openssl-random"
 makedepends="perl-dev libressl-dev"
 install=
diff --git a/main/perl-crypt-rijndael/APKBUILD b/main/perl-crypt-rijndael/APKBUILD
index b056eacdf6d0bb960d32d9546abbe390c5ef1db4..5c97ae5bd78ec72b63429b58c2a085e4fa1ea8fa 100644
--- a/main/perl-crypt-rijndael/APKBUILD
+++ b/main/perl-crypt-rijndael/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Crypt::CBC compliant Rijndael encryption module"
 url="http://search.cpan.org/dist/Crypt-Rijndael/"
 arch="all"
-license="lgpl_2_1"
+license="LGPL-2.1"
 cpandepends="perl-test-manifest"
 cpanmakedepends=""
 depends="$cpandepends"
diff --git a/main/perl-css-squish/APKBUILD b/main/perl-css-squish/APKBUILD
index 72412a08b07f1d076ca8f54efad97b794bbcb054..6b2a17660e132733667ac4a35451d27ab717a8e1 100644
--- a/main/perl-css-squish/APKBUILD
+++ b/main/perl-css-squish/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="CSS::Squish perl module"
 url="http://search.cpan.org/dist/CSS-Squish/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-uri perl-test-longstring"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-data-optlist/APKBUILD b/main/perl-data-optlist/APKBUILD
index 12e2fcf58d8d8fd5d66c38ccc65ea1628ac7cfb5..c93fa4198dccba22ae450d4f128b15e91cd2e2cd 100644
--- a/main/perl-data-optlist/APKBUILD
+++ b/main/perl-data-optlist/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Data::OptList perl module"
 url="http://search.cpan.org/dist/Data-OptList/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-params-util perl-sub-install"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-data-uuid/APKBUILD b/main/perl-data-uuid/APKBUILD
index 3b19d5ad1a244fcf88bc7e9950b6732913e6b837..4858ebbef21c54f876be790b1e887ad46e70a63b 100644
--- a/main/perl-data-uuid/APKBUILD
+++ b/main/perl-data-uuid/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
 url="http://search.cpan.org/dist/Data-UUID/"
 arch="all"
-license="bsd"
+license="BSD"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-datetime-format-mail/APKBUILD b/main/perl-datetime-format-mail/APKBUILD
index 6d21a88359c2ee35758d2422133245837f1fd24b..ffb5bd1f7edd01009e147a0f17de2aba95991a7f 100644
--- a/main/perl-datetime-format-mail/APKBUILD
+++ b/main/perl-datetime-format-mail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="DateTime::Format::Mail perl module"
 url="http://search.cpan.org/dist/DateTime-Format-Mail/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-datetime perl-params-validate"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-datetime-format-w3cdtf/APKBUILD b/main/perl-datetime-format-w3cdtf/APKBUILD
index ead0bea9b929f78ea076514e880a07f6aaf3f8e4..67f303aef47be7b80d24e972127f964aafbc211e 100644
--- a/main/perl-datetime-format-w3cdtf/APKBUILD
+++ b/main/perl-datetime-format-w3cdtf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="DateTime::Format::W3CDTF perl module"
 url="http://search.cpan.org/dist/DateTime-Format-W3CDTF/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-datetime"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-datetime-locale/APKBUILD b/main/perl-datetime-locale/APKBUILD
index e356aa37587a3d6915ae2e68aa0af0c7cefe5c46..1e5406cfdedb3c32aeede877d887497208ea7c4c 100644
--- a/main/perl-datetime-locale/APKBUILD
+++ b/main/perl-datetime-locale/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="DateTime::Locale perl module"
 url="http://search.cpan.org/dist/DateTime-Locale/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-list-moreutils perl-params-validate perl-dist-checkconflicts
 	perl-cpan-meta-check perl-test-fatal perl-test-requires perl-test-warnings
 	perl-scalar-list-utils perl-params-validationcompiler perl-file-sharedir
diff --git a/main/perl-datetime/APKBUILD b/main/perl-datetime/APKBUILD
index b825fd43997a5c3ad70ac584ae1db06bf9378b5a..eb3a25c46664c22f2158ef8bde5ca2e32fdb868a 100644
--- a/main/perl-datetime/APKBUILD
+++ b/main/perl-datetime/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A date and time object for Perl"
 url="http://search.cpan.org/dist/DateTime/"
 arch="all"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-datetime-locale perl-try-tiny perl-dist-checkconflicts perl-params-validationcompiler perl-datetime-timezone perl-namespace-autoclean perl-specio"
 cpanmakedepends="  perl-test-warnings perl-cpan-meta-check perl-test-fatal "
 depends="$cpandepends"
diff --git a/main/perl-dbix-dbschema/APKBUILD b/main/perl-dbix-dbschema/APKBUILD
index 2319779730eaf4bf54ae22fc4a4875b364350892..ca55d97eb9545b67a44e8a9beeeaaf8ea4dc0486 100644
--- a/main/perl-dbix-dbschema/APKBUILD
+++ b/main/perl-dbix-dbschema/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="DBIx::DBSchema perl module"
 url="http://search.cpan.org/dist/DBIx-DBSchema/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-dbi"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-devel-stacktrace-ashtml/APKBUILD b/main/perl-devel-stacktrace-ashtml/APKBUILD
index d25b510b6977751c9507cdf43c2082772cd9194e..31414bfa912b96c28c585e2ebc795f0c05f889ec 100644
--- a/main/perl-devel-stacktrace-ashtml/APKBUILD
+++ b/main/perl-devel-stacktrace-ashtml/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Devel::StackTrace::AsHTML perl module"
 url="http://search.cpan.org/dist/Devel-StackTrace-AsHTML/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-devel-stacktrace"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
diff --git a/main/perl-devel-stacktrace/APKBUILD b/main/perl-devel-stacktrace/APKBUILD
index 55d6c0e32fd7aee4af85b19daadce560052d574a..df7da02c03f388302a8ae77ad358349b08d0f3cb 100644
--- a/main/perl-devel-stacktrace/APKBUILD
+++ b/main/perl-devel-stacktrace/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="An object representing a stack trace"
 url="http://search.cpan.org/dist/Devel-StackTrace/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-fcgi-procmanager/APKBUILD b/main/perl-fcgi-procmanager/APKBUILD
index eb5d12e25b72bfa2521f3036a306aac1a68024f7..29522c8f6cf13135cfe0137d052720b9ed1ea867 100644
--- a/main/perl-fcgi-procmanager/APKBUILD
+++ b/main/perl-fcgi-procmanager/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Functions for managing FastCGI applications"
 url="http://search.cpan.org/dist/FCGI-ProcManager/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-file-listing/APKBUILD b/main/perl-file-listing/APKBUILD
index 36009c6e9f8c0b9f65daf6b4c0a1facf60b4f915..37b0a1e2a5cb80e6709715afff0d4790e6601a36 100644
--- a/main/perl-file-listing/APKBUILD
+++ b/main/perl-file-listing/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="File::Listing perl module"
 url="http://search.cpan.org/dist/File-Listing/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-http-date"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-file-sharedir/APKBUILD b/main/perl-file-sharedir/APKBUILD
index ffd3a9d1cba0030b3e2032a9bac57c5ee21839e1..b18ec76dc062f7ff279ee7cc3f2ce3fe2c8600fc 100644
--- a/main/perl-file-sharedir/APKBUILD
+++ b/main/perl-file-sharedir/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="File::ShareDir perl module"
 url="http://search.cpan.org/dist/File-ShareDir/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-class-inspector"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-filesys-notify-simple/APKBUILD b/main/perl-filesys-notify-simple/APKBUILD
index ff47f8468d8a1f89f38aea7a69722d42309a7aea..ed75ced8d76db8485385b06855a48640bc65ebb0 100644
--- a/main/perl-filesys-notify-simple/APKBUILD
+++ b/main/perl-filesys-notify-simple/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Filesys::Notify::Simple perl module"
 url="http://search.cpan.org/dist/Filesys-Notify-Simple/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 checkdepends="perl-test-sharedfork"
diff --git a/main/perl-hash-multivalue/APKBUILD b/main/perl-hash-multivalue/APKBUILD
index 8b7adcfb9edc760608aa876e9f775d5519f78d39..054ce2320615b513387a18d643e60b58766c3bdb 100644
--- a/main/perl-hash-multivalue/APKBUILD
+++ b/main/perl-hash-multivalue/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Hash::MultiValue perl module"
 url="http://search.cpan.org/dist/Hash-MultiValue/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
diff --git a/main/perl-html-quoted/APKBUILD b/main/perl-html-quoted/APKBUILD
index b147903e1e3a50f78bd4342dc1ac38e73d5cb7ee..c6eeb89630c6adf0e6511c92c580244784ec4e3e 100644
--- a/main/perl-html-quoted/APKBUILD
+++ b/main/perl-html-quoted/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="HTML::Quoted perl module"
 url="http://search.cpan.org/dist/HTML-Quoted/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-html-parser"
 makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
diff --git a/main/perl-http-body/APKBUILD b/main/perl-http-body/APKBUILD
index 8310d57afcc9df2154e4b24a919129719a4abed2..aaf5d9067c57b16463558e111af6fc6055f435ed 100644
--- a/main/perl-http-body/APKBUILD
+++ b/main/perl-http-body/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="HTTP::Body perl module"
 url="http://search.cpan.org/dist/HTTP-Body/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-http-message perl-uri"
 makedepends="perl-dev perl-test-deep"
 install=""
diff --git a/main/perl-http-cookies/APKBUILD b/main/perl-http-cookies/APKBUILD
index 0875e19f9033741e96ac1783716ca88eb0f11f02..5ec0daced4afb85c9a67a22223cacab81fb2aaee 100644
--- a/main/perl-http-cookies/APKBUILD
+++ b/main/perl-http-cookies/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="HTTP::Cookies perl module"
 url="http://search.cpan.org/dist/HTTP-Cookies/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-http-date perl-http-message"
 makedepends="perl-dev"
 replaces="perl-libwww"
diff --git a/main/perl-http-daemon/APKBUILD b/main/perl-http-daemon/APKBUILD
index 4b0b0e3578aef48aa44617351dde883075387d7d..8078077503ce5dd75fc03144d02435887ec1e33d 100644
--- a/main/perl-http-daemon/APKBUILD
+++ b/main/perl-http-daemon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="HTTP::Daemon perl module"
 url="http://search.cpan.org/dist/HTTP-Daemon/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-http-date perl-http-message"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-http-negotiate/APKBUILD b/main/perl-http-negotiate/APKBUILD
index 125edce67d83f1fcdd23b959f87941632d38873a..930b1b2c24c25230254e8955c9bb8af5a51e34e9 100644
--- a/main/perl-http-negotiate/APKBUILD
+++ b/main/perl-http-negotiate/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="HTTP::Negotiate perl module"
 url="http://search.cpan.org/dist/HTTP-Negotiate/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-http-message"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-ipc-run3/APKBUILD b/main/perl-ipc-run3/APKBUILD
index 4f48c38de48bdfc1c43f72837e49cd3bd54ebb85..a433a651c8496399124ca2de89113f2f9157ca92 100644
--- a/main/perl-ipc-run3/APKBUILD
+++ b/main/perl-ipc-run3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="IPC::Run3 perl module"
 url="http://search.cpan.org/dist/IPC-Run3/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-list-allutils/APKBUILD b/main/perl-list-allutils/APKBUILD
index c853acce45f9317bc7ab257a919025382bf8777a..7cacbb7f408d948dc923c98b6cb845f06bac2f62 100644
--- a/main/perl-list-allutils/APKBUILD
+++ b/main/perl-list-allutils/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Combines List::Util, List::SomeUtils and List::UtilsBy in one bite-sized package"
 url="http://search.cpan.org/dist/List-AllUtils/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-list-utilsby perl-list-someutils"
 cpanmakedepends="   "
 depends="$cpandepends perl-scalar-list-utils"
diff --git a/main/perl-list-someutils-xs/APKBUILD b/main/perl-list-someutils-xs/APKBUILD
index 95d1fea4db96cb7c98918d3eb9a158fefe69dbe0..93ffc0d46663fd00a3c062ba220f79cdaedb8f1e 100644
--- a/main/perl-list-someutils-xs/APKBUILD
+++ b/main/perl-list-someutils-xs/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="XS implementation for List::SomeUtils"
 url="http://search.cpan.org/dist/List-SomeUtils-XS/"
 arch="all"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends=""
 cpanmakedepends="perl-test-leaktrace perl-test-warnings "
 depends="$cpandepends"
diff --git a/main/perl-locale-maketext-fuzzy/APKBUILD b/main/perl-locale-maketext-fuzzy/APKBUILD
index 39eb649cf9ec464e7d9132b3e4e58c19fd87505d..05364b1f8b414250a72f2d247954bb1a8bf8443d 100644
--- a/main/perl-locale-maketext-fuzzy/APKBUILD
+++ b/main/perl-locale-maketext-fuzzy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Locale::Maketext::Fuzzy perl module"
 url="http://search.cpan.org/dist/Locale-Maketext-Fuzzy/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-locale-maketext-lexicon/APKBUILD b/main/perl-locale-maketext-lexicon/APKBUILD
index 7aad47977a9b7f4915144cca953a999c02368811..0def09b54b577e0b4b8bcbfd44ea7be276518991 100644
--- a/main/perl-locale-maketext-lexicon/APKBUILD
+++ b/main/perl-locale-maketext-lexicon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Locale::Maketext::Lexicon perl module"
 url="http://search.cpan.org/dist/Locale-Maketext-Lexicon/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-log-dispatch/APKBUILD b/main/perl-log-dispatch/APKBUILD
index 03e28a00c9bb6bf8e202aa9bb9ad41272327f452..e8480505bc527583e2a578cabba2b97948d29a34 100644
--- a/main/perl-log-dispatch/APKBUILD
+++ b/main/perl-log-dispatch/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Dispatches messages to one or more outputs"
 url="http://search.cpan.org/dist/Log-Dispatch/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-module-runtime perl-params-validate perl-dist-checkconflicts
 	perl-devel-globaldestruction"
 cpanmakedepends="perl-ipc-run3 perl-test-fatal perl-test-requires perl-test-needs
diff --git a/main/perl-mail-spamassassin/APKBUILD b/main/perl-mail-spamassassin/APKBUILD
index 6cdb0d9e5482cf24223c11a738e1943564580319..480336b1547ae4fb9308a40a96134c8ca3126324 100644
--- a/main/perl-mail-spamassassin/APKBUILD
+++ b/main/perl-mail-spamassassin/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="SpamAssassin is an extensible email filter which is used to identify spam"
 url="http://search.cpan.org/dist/Mail-SpamAssassin/"
 arch="all"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends="perl-mail-dkim perl-netaddr-ip perl-digest-sha1 perl-html-parser perl-net-dns"
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-math-round/APKBUILD b/main/perl-math-round/APKBUILD
index ec16f09e22d10b28e3bf08b4545362abd171d254..31f23485e7deb0978778b0d1ff2964cd88f515c1 100644
--- a/main/perl-math-round/APKBUILD
+++ b/main/perl-math-round/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Math::Round perl module"
 url="http://search.cpan.org/dist/Math-Round/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-module-implementation/APKBUILD b/main/perl-module-implementation/APKBUILD
index 441783a44fe513f750d49be7ab90c47fe7989fef..3099f634b08d2cef037f9c209478a1cf770cb845 100644
--- a/main/perl-module-implementation/APKBUILD
+++ b/main/perl-module-implementation/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Loads one of several alternate underlying implementations for a module"
 url="http://search.cpan.org/dist/Module-Implementation/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-try-tiny perl-module-runtime"
 cpanmakedepends="  perl-test-fatal perl-test-requires "
 depends="$cpandepends"
diff --git a/main/perl-module-versions-report/APKBUILD b/main/perl-module-versions-report/APKBUILD
index 9b7f7898ed0e6c545a189ab3cca4fb18fe1606c1..0c15c847e80ce2d82cc1fd5b4e1934c8ff282ba5 100644
--- a/main/perl-module-versions-report/APKBUILD
+++ b/main/perl-module-versions-report/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Module::Versions::Report perl module"
 url="http://search.cpan.org/dist/Module-Versions-Report/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-net-http/APKBUILD b/main/perl-net-http/APKBUILD
index 33f146f3e257447a55e9168dd4cc8bf44ae307c1..3490a95d7696868128c874f993f5f3789a6d0ec5 100644
--- a/main/perl-net-http/APKBUILD
+++ b/main/perl-net-http/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Net::HTTP perl module"
 url="http://search.cpan.org/dist/Net-HTTP/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-uri"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-net-rblclient/APKBUILD b/main/perl-net-rblclient/APKBUILD
index bd4ad8578eaf9eb988f1b95176e5650f6751958e..5a2e2a7126f544d85eb33cb10feced6cf8aef2e9 100644
--- a/main/perl-net-rblclient/APKBUILD
+++ b/main/perl-net-rblclient/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="Queries multiple Realtime Blackhole Lists in parallel"
 url="http://search.cpan.org/dist/Net-RBLClient/"
 arch="noarch"
-license="Artistic GPL2"
+license="Artistic GPL-2.0"
 depends="perl"
 makedepends="perl-dev"
 install=
diff --git a/main/perl-netaddr-ip/APKBUILD b/main/perl-netaddr-ip/APKBUILD
index 2f988f6be02e5c20e880a90b21f673f9aa8f8361..eb8aa27e363f6482c43f06e888920a2c6b102e7b 100644
--- a/main/perl-netaddr-ip/APKBUILD
+++ b/main/perl-netaddr-ip/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets"
 url="http://search.cpan.org/~miker/NetAddr-IP-$pkgver/"
 arch="all"
-license="GPL2 and Artistic"
+license="GPL-2.0 and Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-package-deprecationmanager/APKBUILD b/main/perl-package-deprecationmanager/APKBUILD
index fce15dcc4dc477b07cdbb2cc7a5abc6c872dc41c..666ddd1bb4326b7a13d8ad2d1aee5c0ac48bf8a2 100644
--- a/main/perl-package-deprecationmanager/APKBUILD
+++ b/main/perl-package-deprecationmanager/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Manage deprecation warnings for your distribution"
 url="http://search.cpan.org/dist/Package-DeprecationManager/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-list-moreutils perl-sub-install perl-params-util perl-test-fatal
 	perl-test-requires perl-package-stash perl-test-warnings perl-sub-name"
 cpanmakedepends=""
diff --git a/main/perl-params-util/APKBUILD b/main/perl-params-util/APKBUILD
index 73a002da7c7c94e422e5b46fcb7506654d6478c2..1db2ae2f131eecf6119d6fbeb34f698bc03fb145 100644
--- a/main/perl-params-util/APKBUILD
+++ b/main/perl-params-util/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="Params::Util perl module"
 url="http://search.cpan.org/dist/Params-Util/"
 arch="all"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-params-validate/APKBUILD b/main/perl-params-validate/APKBUILD
index 5cb04727241aeea6e70cd07b2430986f2f8ca338..6bcaec1bb870b6cb918522f2df5a10676d754578 100644
--- a/main/perl-params-validate/APKBUILD
+++ b/main/perl-params-validate/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Validate method/function parameters"
 url="http://search.cpan.org/dist/Params-Validate/"
 arch="all"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-module-implementation"
 cpanmakedepends="perl-test-fatal perl-module-implementation perl-test-requires"
 depends="$cpandepends"
diff --git a/main/perl-params-validationcompiler/APKBUILD b/main/perl-params-validationcompiler/APKBUILD
index 7bff4113c853d84d8e587a3d05ee9933994b2267..09fc0a6684b9795184f796a03d0f3da1a8d85e25 100644
--- a/main/perl-params-validationcompiler/APKBUILD
+++ b/main/perl-params-validationcompiler/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Params::ValidationCompiler perl module"
 url="http://search.cpan.org/~drolsky/"
 arch="noarch"
-license="GPL or Artistic 2"
+license="GPL or Artistic-2.0"
 depends="perl-specio perl-test2-suite perl-test-simple perl-test-without-module
 	perl-eval-closure perl-exception-class perl-test2-plugin-nowarnings
 	perl-role-tiny perl-mro-compat"
diff --git a/main/perl-path-tiny/APKBUILD b/main/perl-path-tiny/APKBUILD
index ded5e18289649bf128808851e249719e3687d763..1acd67aa7b396cbefd6731e20fbcc6ebe89e76b2 100644
--- a/main/perl-path-tiny/APKBUILD
+++ b/main/perl-path-tiny/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="File path utility"
 url="http://search.cpan.org/dist/Path-Tiny/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends="perl-test-mockrandom perl-test-failwarnings"
 depends="$cpandepends"
diff --git a/main/perl-regexp-common-net-cidr/APKBUILD b/main/perl-regexp-common-net-cidr/APKBUILD
index 365c8e935b8140e612285aae8d6be791a03e7f5f..fdc38742c3fbbecabf05f2dc2c7639cbf6471f77 100644
--- a/main/perl-regexp-common-net-cidr/APKBUILD
+++ b/main/perl-regexp-common-net-cidr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Regexp::Common::net::CIDR perl module"
 url="http://search.cpan.org/dist/Regexp-Common-net-CIDR/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-regexp-common"
 makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
diff --git a/main/perl-regexp-common/APKBUILD b/main/perl-regexp-common/APKBUILD
index 64a152b1dfe8e3dc053d561f5caff052f3bc892d..24f38cb1645899c98db134ad7148afeef617ee22 100644
--- a/main/perl-regexp-common/APKBUILD
+++ b/main/perl-regexp-common/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Provide commonly requested regular expressions"
 url="http://search.cpan.org/dist/Regexp-Common/"
 arch="noarch"
-license="mit"
+license="MIT"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-regexp-ipv6/APKBUILD b/main/perl-regexp-ipv6/APKBUILD
index 3df5a698aafbf53707ce741bbc30a4d89ea0e9b1..6cd9ee8600e0fb72ee7a5d803f2e992c28589806 100644
--- a/main/perl-regexp-ipv6/APKBUILD
+++ b/main/perl-regexp-ipv6/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Regexp::IPv6 perl module"
 url="http://search.cpan.org/dist/Regexp-IPv6/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-scope-guard/APKBUILD b/main/perl-scope-guard/APKBUILD
index ffa657b3b4cf26daed71a6aa27ee8d8417678fd5..babe7af3cf964db2e52fc17c754991484337ab15 100644
--- a/main/perl-scope-guard/APKBUILD
+++ b/main/perl-scope-guard/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Scope::Guard perl module"
 url="http://search.cpan.org/dist/Scope-Guard/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-specio/APKBUILD b/main/perl-specio/APKBUILD
index 86a2ca4fd62fe9f179eb660c656d9e94dda030d1..ac32f12dfbff979b91d5fa2360ada89448507b80 100644
--- a/main/perl-specio/APKBUILD
+++ b/main/perl-specio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Specio perl module"
 url="http://search.cpan.org/~drolsky/"
 arch="noarch"
-license="GPL or Artistic 2"
+license="GPL or Artistic-2.0"
 depends="perl-test-needs perl-devel-stacktrace perl-eval-closure perl-mro-compat
 	perl-role-tiny perl-test-fatal perl-module-runtime"
 makedepends="perl-dev"
diff --git a/main/perl-sub-install/APKBUILD b/main/perl-sub-install/APKBUILD
index f759a65603f252051f5eacc15384b9d9b2afd80a..d661d7279f6bf15dfafa761d9a54d7fc156b91c9 100644
--- a/main/perl-sub-install/APKBUILD
+++ b/main/perl-sub-install/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Sub::Install perl module"
 url="http://search.cpan.org/dist/Sub-Install/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-test-deep/APKBUILD b/main/perl-test-deep/APKBUILD
index 0a13c931f12f470cebea92ff0c4f5bfa72d29032..838313b15ee0f845afdb49ed7fd0e521748a1ff2 100644
--- a/main/perl-test-deep/APKBUILD
+++ b/main/perl-test-deep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Test::Deep perl module"
 url="http://search.cpan.org/dist/Test-Deep/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-test-tester perl-test-nowarnings"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-test-failwarnings/APKBUILD b/main/perl-test-failwarnings/APKBUILD
index d4450ecaa72e2711049379e7b611dcc1d4c3ef94..58ec97d23e09a4b576c794fb36aa4e313727586f 100644
--- a/main/perl-test-failwarnings/APKBUILD
+++ b/main/perl-test-failwarnings/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Add test failures if warnings are caught"
 url="http://search.cpan.org/dist/Test-FailWarnings/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends="perl-capture-tiny"
 depends="$cpandepends"
diff --git a/main/perl-test-longstring/APKBUILD b/main/perl-test-longstring/APKBUILD
index bf778783f03abef70f7e5b8fdf18a22ba08008ae..b360db30c2b28250ba914401c8c90819769db9f9 100644
--- a/main/perl-test-longstring/APKBUILD
+++ b/main/perl-test-longstring/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Test::LongString perl module"
 url="http://search.cpan.org/dist/Test-LongString/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-test-mockrandom/APKBUILD b/main/perl-test-mockrandom/APKBUILD
index e65f5aaeed870868ebbc9c9341049f7a7b3b974e..a63803c9543214e8880d9fc43ad982e1bebb6244 100644
--- a/main/perl-test-mockrandom/APKBUILD
+++ b/main/perl-test-mockrandom/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Replaces random number generation with non-random number generation"
 url="http://search.cpan.org/dist/Test-MockRandom/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-test-nowarnings/APKBUILD b/main/perl-test-nowarnings/APKBUILD
index 82d25a09d15c911a6ef850b684d40722737e1315..7012f6d121998073713987b52774e976bb2270f9 100644
--- a/main/perl-test-nowarnings/APKBUILD
+++ b/main/perl-test-nowarnings/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Test::NoWarnings perl module"
 url="http://search.cpan.org/dist/Test-NoWarnings/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-test-simple"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-test-number-delta/APKBUILD b/main/perl-test-number-delta/APKBUILD
index 40169d6051235a96cc7a017021e9d14de0f54503..add53f4b051c15042b478cad7ba6ed41824c2b81 100644
--- a/main/perl-test-number-delta/APKBUILD
+++ b/main/perl-test-number-delta/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Compare the difference between numbers against a given tolerance"
 url="http://search.cpan.org/dist/Test-Number-Delta/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-test-sharedfork/APKBUILD b/main/perl-test-sharedfork/APKBUILD
index d75febfc8a7ba44a32a8afc4affd1cc12b9ef964..3f626cb795927d440cee8103304ffecaf4bd3e58 100644
--- a/main/perl-test-sharedfork/APKBUILD
+++ b/main/perl-test-sharedfork/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Test::SharedFork perl module"
 url="http://search.cpan.org/dist/Test-SharedFork/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-test-requires"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-test2-plugin-nowarnings/APKBUILD b/main/perl-test2-plugin-nowarnings/APKBUILD
index 4a7769140e104400cf348aee2476538376bf5f68..b98375f97a4c82c8da4a64cf0cbed3f5fff338f1 100644
--- a/main/perl-test2-plugin-nowarnings/APKBUILD
+++ b/main/perl-test2-plugin-nowarnings/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Test2::Plugin::NoWarnings perl module"
 url="http://search.cpan.org/dist/Test2-Plugin-NoWarnings"
 arch="noarch"
-license="GPL or Artistic 2"
+license="GPL or Artistic-2.0"
 depends="perl-ipc-run3 perl-test2-suite perl-test-simple"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
diff --git a/main/perl-text-autoformat/APKBUILD b/main/perl-text-autoformat/APKBUILD
index 10736664765cf7c07ca0694815b8efa98da75d1d..aa873843d5cd9690c7873c7ec0c12a3a4d356aa9 100644
--- a/main/perl-text-autoformat/APKBUILD
+++ b/main/perl-text-autoformat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Text::Autoformat perl module"
 url="http://search.cpan.org/dist/Text-Autoformat/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-text-reform"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-text-password-pronounceable/APKBUILD b/main/perl-text-password-pronounceable/APKBUILD
index 7cbb331e6edb82eb2b979197c2daca430c013d6a..5ad790e380fe7e2ac7bea2170d657696a2193136 100644
--- a/main/perl-text-password-pronounceable/APKBUILD
+++ b/main/perl-text-password-pronounceable/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Text::Password::Pronounceable perl module"
 url="http://search.cpan.org/dist/Text-Password-Pronounceable/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
diff --git a/main/perl-text-reform/APKBUILD b/main/perl-text-reform/APKBUILD
index 4b65fabebb3fa2474f08c7392c814dea443a8cbe..02674ab4e231ef59ff7e05dc7241a8d4ec54074c 100644
--- a/main/perl-text-reform/APKBUILD
+++ b/main/perl-text-reform/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Text::Reform perl module"
 url="http://search.cpan.org/dist/Text-Reform/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-text-template/APKBUILD b/main/perl-text-template/APKBUILD
index 1566575161cf49dee0c2d5fc1bffb3efcbd127f7..c1f0d004419a52983d63c17391d837f2fd0746c2 100644
--- a/main/perl-text-template/APKBUILD
+++ b/main/perl-text-template/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Text::Template perl module"
 url="http://search.cpan.org/dist/Text-Template/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-tree-dag_node/APKBUILD b/main/perl-tree-dag_node/APKBUILD
index ca5bbf18e024ebef2991df6d1524afadc41f8d2f..1de5f1f8b812b5178a8b08a1446d99f7f1f0292d 100644
--- a/main/perl-tree-dag_node/APKBUILD
+++ b/main/perl-tree-dag_node/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="An N-ary tree"
 url="http://search.cpan.org/dist/Tree-DAG_Node/"
 arch="noarch"
-license="Artistic-2"
+license="Artistic-2.0"
 cpandepends="perl-file-slurp-tiny"
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/main/perl-www-robotrules/APKBUILD b/main/perl-www-robotrules/APKBUILD
index 7c13364fb5d774aa6a9d69b31d137955dd6fecd3..f183fb6acf480b30a3d419078174e43b53f79b4d 100644
--- a/main/perl-www-robotrules/APKBUILD
+++ b/main/perl-www-robotrules/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="WWW::RobotRules perl module"
 url="http://search.cpan.org/dist/WWW-RobotRules/"
 arch="noarch"
-license="GPLv2 or Artistic"
+license="GPL-2.0 or Artistic"
 depends="perl perl-uri"
 makedepends="perl-dev"
 install=""
diff --git a/main/perl-yaml-syck/APKBUILD b/main/perl-yaml-syck/APKBUILD
index e2669470c25cb74b68a121d181d1db6ad49d027c..1795d2cd9a48e50521085301430a8194473eb932 100644
--- a/main/perl-yaml-syck/APKBUILD
+++ b/main/perl-yaml-syck/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Fast, lightweight YAML loader and dumper"
 url="http://search.cpan.org/dist/YAML-Syck/"
 arch="all"
-license="mit"
+license="MIT"
 cpandepends=""
 cpanmakedepends=""
 cpancheckdepends=""
diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD
index e687152cbad99a43fcfc7283ba83bbe60cbd59ee..924bfb8e1108fbcee4afe90d9b75d7d3e6eb85bc 100644
--- a/main/perl/APKBUILD
+++ b/main/perl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url="http://www.perl.org/"
 arch="all"
-license="Artistic GPL2"
+license="Artistic GPL-2.0"
 options="!fhs"
 depends=""
 depends_dev="perl-utils"
diff --git a/main/phodav/APKBUILD b/main/phodav/APKBUILD
index cd81e49ecb904aea8f0f78b93e6c4ffb461bd783..96f575883ce0f78fabe58f5a3ab69d1e73f4d13c 100644
--- a/main/phodav/APKBUILD
+++ b/main/phodav/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A WebDAV server using libsoup"
 url="https://wiki.gnome.org/phodav"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libsoup-dev avahi-dev intltool"
diff --git a/main/pidgin-sipe/APKBUILD b/main/pidgin-sipe/APKBUILD
index b058004452891ff89e229b41ec6028d57cfd8d3a..c73b12c7554514fd2d244df2401c076df603f187 100644
--- a/main/pidgin-sipe/APKBUILD
+++ b/main/pidgin-sipe/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Pidgin protocol plugin to connect to MS Office Communicator"
 url="http://sipe.sourceforge.net/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev zlib-dev pidgin-dev e2fsprogs-dev intltool
diff --git a/main/pinentry/APKBUILD b/main/pinentry/APKBUILD
index 50c85ec6bff9cf0fcab0c359f1ab8a877ddc7cbd..e90b5f46fdf2cb02d4df666f409dadf1fcc9e686 100644
--- a/main/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 url="http://www.gnupg.org/aegypten2"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 install="pinentry.post-install pinentry.post-deinstall"
 makedepends="ncurses-dev libcap-dev gtk+-dev libgpg-error-dev libassuan-dev"
diff --git a/main/polkit-gnome/APKBUILD b/main/polkit-gnome/APKBUILD
index 343a2509deaef3134e719973bd24c259d163db36..e290d4a5a14ec6b253cf766917c80f0e7f97076b 100644
--- a/main/polkit-gnome/APKBUILD
+++ b/main/polkit-gnome/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="PolicyKit integration for the GNOME desktop"
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev gtk+3.0-dev polkit-dev"
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index 4115be5cfbde7e054b1220d3dfcc1f5e962f65e5..bd09c261e977457484c228c534994e6b6dc8d8a6 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
 arch="all"
-license="IPL-1"
+license="IPL-1.0"
 depends=
 makedepends="db-dev pcre-dev libressl-dev postgresql-dev mariadb-dev openldap-dev
 	cyrus-sasl-dev perl file sqlite-dev linux-headers coreutils"
diff --git a/main/powertop/APKBUILD b/main/powertop/APKBUILD
index 31e6a3500e4c80c93b718ca835f346776fe2ccde..caf8383b0d6765cde8d0881add331c2218280538 100644
--- a/main/powertop/APKBUILD
+++ b/main/powertop/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Power consumption monitor"
 url="https://01.org/powertop"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=
 makedepends="linux-headers ncurses-dev pciutils-dev zlib-dev libnl-dev
 	gettext-dev"
diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD
index ddeb16e906ff3be4bee91019a8bcbe6e6e4d5fd5..feccc752600eb328afae2d5e2723915888dcefa3 100644
--- a/main/ppp/APKBUILD
+++ b/main/ppp/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=5
 pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
 url="http://www.samba.org/ppp/"
 arch="all"
-license="BSD and LGPLv2+ and GPLv2+ and Public Domain"
+license="BSD and LGPL-2.0-or-later and GPL-2.0-or-later and Public-Domain"
 makedepends="bsd-compat-headers linux-headers"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-chat $pkgname-radius
 	    $pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind
diff --git a/main/pptpd/APKBUILD b/main/pptpd/APKBUILD
index 12ec804370d48385801fd61c8c3685c357031f9e..befd66bcadc279089afa8faedd3e583098bec99d 100644
--- a/main/pptpd/APKBUILD
+++ b/main/pptpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="PoPToP - PPTP Daemon, Linux as Microsoft VPN Server"
 url="http://www.poptop.org/"
 arch="all"
-license="GPL v2 or later"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="ppp-dev"
 install=""
diff --git a/main/proxychains-ng/APKBUILD b/main/proxychains-ng/APKBUILD
index 9e73f5040856a5bce230c2cbd16de43cd983a785..94f93f739b67df74044b42bf4bcb187a3dbc7e96 100644
--- a/main/proxychains-ng/APKBUILD
+++ b/main/proxychains-ng/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="This tool provides proxy server support to any app."
 url="https://github.com/rofl0r/proxychains-ng"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD
index 6dd60862d92a2d2ef0b911734c45b0acaa9e5dfe..3befc6bd691aa11b0295375e468ec41ae56f1d6b 100644
--- a/main/pth/APKBUILD
+++ b/main/pth/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="The GNU Portable Threads."
 url="https://www.gnu.org/software/pth"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=""
 subpackages="$pkgname-dev $pkgname-doc"
 options="!libc_musl"
diff --git a/main/py-bcrypt/APKBUILD b/main/py-bcrypt/APKBUILD
index 14dfa277749ee36fe5ea7a8fa9e8d8d5d319b90c..af3e3eebdc2fab2b77d601cab24e13fcf0e094ea 100644
--- a/main/py-bcrypt/APKBUILD
+++ b/main/py-bcrypt/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Modern password hashing for your software and your servers"
 url="https://github.com/pyca/bcrypt"
 arch="all"
-license="APACHE2.0"
+license="Apache-2.0"
 makedepends="python2-dev python3-dev py-setuptools libffi-dev"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
 source="$pkgname-$pkgver.tar.gz::https://github.com/pyca/$_pkgname/archive/$pkgver.tar.gz"
diff --git a/main/py-bluez/APKBUILD b/main/py-bluez/APKBUILD
index 43c0c6f83c3348ae439943b08f50b7925b11cdd1..f1500fc3046a2c27a30b7b7f6a43c8b7d8377287 100644
--- a/main/py-bluez/APKBUILD
+++ b/main/py-bluez/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Python API for the BlueZ bluetooth stack"
 url="http://karulis.github.io/pybluez/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools bluez-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/main/py-chardet/APKBUILD b/main/py-chardet/APKBUILD
index 5108dd994c1cdb617d3c42e663ec38648121f901..248639b9a96d6a11a7a2def08e287dec4daa29ff 100644
--- a/main/py-chardet/APKBUILD
+++ b/main/py-chardet/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="The Universal Character Encoding Detector"
 url="https://github.com/chardet/chardet/"
 arch="noarch"
-license="LGPL 2.1"
+license="LGPL-2.1"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/main/py-cliapp/APKBUILD b/main/py-cliapp/APKBUILD
index 25433e1bf846e160da18e05a823829ec30a06af9..2fc32960c412667daf42c596a3a312f05f185910 100644
--- a/main/py-cliapp/APKBUILD
+++ b/main/py-cliapp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Framework for Unix-like command line programs"
 url="http://liw.fi/cliapp/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="py-setuptools"
diff --git a/main/py-country/APKBUILD b/main/py-country/APKBUILD
index 2db94646a927849ccd6c3b752fcfcc2514492910..3ae8ff8729320d41f81379100f593a739a9aad26 100644
--- a/main/py-country/APKBUILD
+++ b/main/py-country/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="ISO country, subdivision, language, currency and script definitions and their translations"
 url="https://pypi.python.org/pypi/pycountry"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/main/py-cryptography/APKBUILD b/main/py-cryptography/APKBUILD
index 41ce72458b3c0612cfcdcbe48b66b1a2b068e43a..3c55d0e873f77d4da3b72cf4ea4db3a390416032 100644
--- a/main/py-cryptography/APKBUILD
+++ b/main/py-cryptography/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A package which provides cryptographic recipes and primitives"
 url="https://pypi.python.org/pypi/cryptography"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="py-cffi py-idna py-asn1crypto py-six"
 makedepends="python2-dev python3-dev py-setuptools libffi-dev libressl-dev"
 subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
diff --git a/main/py-curl/APKBUILD b/main/py-curl/APKBUILD
index f5ce2f46adb35965be0ffdd1cd078e713617f9df..6a1394e54e16db026cb9f906006d3af896dbb00a 100644
--- a/main/py-curl/APKBUILD
+++ b/main/py-curl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=4
 pkgdesc="A Python interface to libcurl"
 url="http://pycurl.io/"
 arch="all"
-license="LGPLv2+ MIT"
+license="LGPL-2.0-or-later MIT"
 depends=""
 makedepends="curl-dev libressl-dev python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/main/py-django-treebeard/APKBUILD b/main/py-django-treebeard/APKBUILD
index 8dd62f3e6f08acd5fbad7714fb0bab7cabafb9dd..634b4eb0dc07c102e652b095e5934e8bfd211ccb 100644
--- a/main/py-django-treebeard/APKBUILD
+++ b/main/py-django-treebeard/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Efficient tree implementations for Django"
 url=https://tabo.pe/projects/django-treebeard/
 arch=noarch
-license="ASL 2.0"
+license="Apache-2.0"
 depends=py-django
 makedepends=py-setuptools
 source="https://files.pythonhosted.org/packages/source/d/django-treebeard/django-treebeard-$pkgver.tar.gz"
diff --git a/main/py-docutils/APKBUILD b/main/py-docutils/APKBUILD
index b65ced72d49e3fc5924aed8c317fb7fb73087a42..14eac598a86606e8e6823607a00dcd24178ad05d 100644
--- a/main/py-docutils/APKBUILD
+++ b/main/py-docutils/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Documentation Utilities for Python"
 url="http://docutils.sourceforge.net/"
 arch="noarch"
-license="Public Domain"
+license="Public-Domain"
 depends="py3-${pkgname#py-}"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3 $pkgname-doc::noarch"
diff --git a/main/py-funcsigs/APKBUILD b/main/py-funcsigs/APKBUILD
index d3ea6d3906d2970f714567ef1798a37ffc25ffd6..ba2b9c3685c0f23e24ad573cc9232f69725b041a 100644
--- a/main/py-funcsigs/APKBUILD
+++ b/main/py-funcsigs/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
 url="http://funcsigs.readthedocs.org"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/main/py-fuse/APKBUILD b/main/py-fuse/APKBUILD
index fd91f7a29fc504976488338c5bbf9a82548aec15..8b2496fac3e0e0a1973fbe6069a6521986422514 100644
--- a/main/py-fuse/APKBUILD
+++ b/main/py-fuse/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Python bindings for FUSE - filesystem in userspace"
 url="https://github.com/libfuse/python-fuse/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="python2"
 makedepends="python2-dev py-setuptools fuse-dev"
 source="https://github.com/libfuse/python-fuse/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
diff --git a/main/py-gst0.10/APKBUILD b/main/py-gst0.10/APKBUILD
index ccc179fbd5d58427405194d93b7e839ae39c669a..e75ab79d86e0fa4d701408ae824ebc0fae4044e3 100644
--- a/main/py-gst0.10/APKBUILD
+++ b/main/py-gst0.10/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="python bindings for gstreamer"
 url="https://gstreamer.freedesktop.org/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 replaces="py-gst"
 depends="py-gtk py-gobject"
 makedepends="gstreamer0.10-dev gst-plugins-base0.10-dev py-gtk-dev
diff --git a/main/py-hgtools/APKBUILD b/main/py-hgtools/APKBUILD
index d8833472669bd72dd373ceafb7223ef10962b98a..e87d0d679180f552f02da469a847b96e25314607 100644
--- a/main/py-hgtools/APKBUILD
+++ b/main/py-hgtools/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Classes and setuptools plugin for Mercurial and Git repositories"
 url="https://pypi.python.org/pypi/hgtools"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 makedepends="py-setuptools"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
diff --git a/main/py-irc/APKBUILD b/main/py-irc/APKBUILD
index 14599cb2f84b7ebeeaebf702337a019f28d90e6c..78998f2141770d8580db9d14a282c60a4f7df863 100644
--- a/main/py-irc/APKBUILD
+++ b/main/py-irc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A python irc client library"
 url="http://python-irclib.sourceforge.net/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="python2"
 makedepends="$depends_dev py-hgtools py-setuptools"
diff --git a/main/py-larch/APKBUILD b/main/py-larch/APKBUILD
index 6e1524e79793b712bdec83cf57f01043393bdf6c..caf3c6cf8a3542fd61257648f7d1b6266350d31c 100644
--- a/main/py-larch/APKBUILD
+++ b/main/py-larch/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Copy-on-write B-tree data structure"
 url="http://liw.fi/larch/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2 py-tracing py-cliapp py-ttystatus"
 depends_dev=""
 makedepends="py-setuptools"
diff --git a/main/py-libvirt/APKBUILD b/main/py-libvirt/APKBUILD
index 6199baa2d784e22dde244b7c335cd219c66fe7f7..b2a301e9e8fed8e8fb87ef5f2dcd4689d01786b6 100644
--- a/main/py-libvirt/APKBUILD
+++ b/main/py-libvirt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The libvirt virtualization API python binding"
 url="http://libvirt.org"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 makedepends="python2-dev python3-dev libvirt-dev"
 subpackages="py3-${pkgname#py-}:_py3 py2-${pkgname#py-}:_py2"
 source="http://libvirt.org/sources/python/$_pkgname-$pkgver.tar.gz
diff --git a/main/py-nose/APKBUILD b/main/py-nose/APKBUILD
index 1c9872a151651c9179fda083344fe4294649a66e..7de0a07f061c7c45fd793607f0c9b66d15c14b07 100644
--- a/main/py-nose/APKBUILD
+++ b/main/py-nose/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A Python unittest module"
 url="http://readthedocs.org/docs/nose/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="$pkgname-doc py2-$_pkgname:_py2 py3-$_pkgname:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
diff --git a/main/py-openssl/APKBUILD b/main/py-openssl/APKBUILD
index 65b471b56574a7cc8288feadc7aecac701e0132a..484cb87e1c309ffc250651b86cc99e04269cda61 100644
--- a/main/py-openssl/APKBUILD
+++ b/main/py-openssl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Python wrapper module around the OpenSSL library"
 url="https://github.com/pyca/pyopenssl"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="py-cryptography py-six"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py3-${pkgname#py-}:_py3 py2-${pkgname#py-}:_py2"
diff --git a/main/py-paramiko/APKBUILD b/main/py-paramiko/APKBUILD
index b48a8dc470e0fbbff5d2c97c33681da8f8dbced2..adcba2cd20863127a95751cb94dac3173c6de5f4 100644
--- a/main/py-paramiko/APKBUILD
+++ b/main/py-paramiko/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="An SSH2 protocol library for Python"
 url="https://github.com/paramiko/paramiko/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check"
 depends="py-asn1 py-cryptography py-bcrypt py-pynacl"
 makedepends="python2-dev python3-dev py-setuptools"
diff --git a/main/py-pbr/APKBUILD b/main/py-pbr/APKBUILD
index 8c28b6f77e0ac7f48fca7f13d3895fe83301a6ca..fdb87f8cb40cff68112df16292b79bea0af25b2b 100644
--- a/main/py-pbr/APKBUILD
+++ b/main/py-pbr/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python Build Reasonableness"
 url="https://pypi.python.org/pypi/pbr"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/main/py-phonenumbers/APKBUILD b/main/py-phonenumbers/APKBUILD
index 8662b1497077ac7b169ff1d11651a146bca89df3..d29385e91add5390f36aec4fa6cd128c2344a38d 100644
--- a/main/py-phonenumbers/APKBUILD
+++ b/main/py-phonenumbers/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="International phone number library for Python"
 url="https://github.com/daviddrysdale/python-phonenumbers"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/main/py-psycopg2/APKBUILD b/main/py-psycopg2/APKBUILD
index d1c65c6f21dcdd17922765fc22fb32c337f69940..baee5baabff86f1d171b0b58118255f1e54dfcc7 100644
--- a/main/py-psycopg2/APKBUILD
+++ b/main/py-psycopg2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python-PostgreSQL Database Adapter"
 url="http://initd.org/psycopg/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="postgresql-dev python2-dev python3-dev py-egenix-mx-base-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/main/py-pynacl/APKBUILD b/main/py-pynacl/APKBUILD
index 4b1763d2fdc11d8f8a98f62e7ec609eb61100de1..aa65f146d3525478444a1d45c576af25a762c20a 100644
--- a/main/py-pynacl/APKBUILD
+++ b/main/py-pynacl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python binding to the Networking and Cryptography (NaCl) library"
 url="https://github.com/pyca/pynacl"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 makedepends="py-setuptools python2-dev python3-dev libffi-dev"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
 source="$pkgname-$pkgver.tar.gz::https://github.com/pyca/$_pkgname/archive/$pkgver.tar.gz"
diff --git a/main/py-requests/APKBUILD b/main/py-requests/APKBUILD
index 781db606e1103d5dc05475dbe4e8d40b9d24d5d7..eae39e2074439e96e5688552334a90d5c7ac270f 100644
--- a/main/py-requests/APKBUILD
+++ b/main/py-requests/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A HTTP request library for Python"
 url="http://www.python-requests.org/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 # Requirements for tests are not available in main
 options="!check"
 depends="py-chardet py-idna py-certifi py-urllib3"
diff --git a/main/py-tornado/APKBUILD b/main/py-tornado/APKBUILD
index fb0dfc52d227e23b3cd839f430131033da33c48f..5bb188fef5c96c0bdc921bf6b69bba90946718eb 100644
--- a/main/py-tornado/APKBUILD
+++ b/main/py-tornado/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Python web framework and asynchronous networking library"
 url="http://www.tornadoweb.org/"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/main/py-tracing/APKBUILD b/main/py-tracing/APKBUILD
index 188100a38810664e7dbb6a171ba3dd0190777bcd..98ec4740b155161f7cf8e5c186abbe395f23ec2c 100644
--- a/main/py-tracing/APKBUILD
+++ b/main/py-tracing/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Debug log/trace messages"
 url="http://liw.fi/tracing/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="py-setuptools"
diff --git a/main/py-ttystatus/APKBUILD b/main/py-ttystatus/APKBUILD
index b3fd49dcf506392bcdb7fc67f1c0c5aced1f8f38..d2dcf16bc5f34967d9bac890c9b26b7c7616208c 100644
--- a/main/py-ttystatus/APKBUILD
+++ b/main/py-ttystatus/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Terminal progress bar and status output for command line"
 url="http://liw.fi/ttystatus/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="py-setuptools"
diff --git a/main/py-twitter/APKBUILD b/main/py-twitter/APKBUILD
index aafa31f8d6a5c7fb1a6aa796176720f0ee624caa..12f276ccefb887854aad0590648db1be5dca3619 100644
--- a/main/py-twitter/APKBUILD
+++ b/main/py-twitter/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Python wrapper around the Twitter API"
 url="https://pypi.python.org/pypi/python-twitter"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-future py-requests py-requests-oauthlib"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py3-${pkgname#py-}:_py3 py2-${pkgname#py-}:_py2"
diff --git a/main/py-unidecode/APKBUILD b/main/py-unidecode/APKBUILD
index b39e16cdea79044232eb4cc97f082a1db4d4a1c9..93c15423eb36ede8d24be1d60be1b65fa4027cc8 100644
--- a/main/py-unidecode/APKBUILD
+++ b/main/py-unidecode/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python ASCII transliterations of Unicode text"
 url="https://pypi.python.org/pypi/Unidecode"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="py3-${pkgname#py-}"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/main/py-urlgrabber/APKBUILD b/main/py-urlgrabber/APKBUILD
index 33562e0b50af51977892e77113d5768116258346..291cb71118a0d3785f73e3b1a9c06f77dfb0ba52 100644
--- a/main/py-urlgrabber/APKBUILD
+++ b/main/py-urlgrabber/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A python module for fetching files"
 url="http://urlgrabber.baseurl.org/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="python2 py-curl"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/py-urwid/APKBUILD b/main/py-urwid/APKBUILD
index 44837932d8d88d26d951ea2cc8fc27fd14006240..3d48a607558104ea80ac8969f5a4958c88859a26 100644
--- a/main/py-urwid/APKBUILD
+++ b/main/py-urwid/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A console user interface library for Python"
 url="http://excess.org/urwid/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 install=""
diff --git a/main/py2-cairo/APKBUILD b/main/py2-cairo/APKBUILD
index 90ad406d260f8f3057dcd97659c633782d53b046..3b9ce635c6bdb1cf819b2857294783b0cb03c2b5 100644
--- a/main/py2-cairo/APKBUILD
+++ b/main/py2-cairo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Python bindings for the cairo graphics library"
 url="http://cairographics.org/pycairo/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check"
 depends=""
 makedepends="python2-dev cairo-dev"
diff --git a/main/py3-cairo/APKBUILD b/main/py3-cairo/APKBUILD
index bb839fd2956305ae3c241f33926cd2bf6c7fe92e..c76297e13a8fc6fb9785576727e383aab10a24f1 100644
--- a/main/py3-cairo/APKBUILD
+++ b/main/py3-cairo/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Python bindings for the cairo graphics library"
 url="http://cairographics.org/pycairo/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="python3-dev cairo-dev"
 install=""
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index 49c8af467cbcdf0dd5eb7fbd5331b2f746217bf6..f5e3e59ee2686ef9f436b6f1b6390ef244c03748 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu.org/"
 arch="all"
-license="GPL2 LGPL-2"
+license="GPL-2.0 LGPL-2"
 makedepends="
 	alsa-lib-dev
 	bison
diff --git a/main/qpdf/APKBUILD b/main/qpdf/APKBUILD
index af42a8568c8997e0521c89dfa9e55489fb844e13..74aa09aa545f34335aba9cce0f781149eb758157 100644
--- a/main/qpdf/APKBUILD
+++ b/main/qpdf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Command-line tools and library for transforming PDF files"
 url="http://qpdf.sourceforge.net/"
 arch="all"
-license="Artistic 2.0"
+license="Artistic-2.0"
 depends=""
 # coreutils needed for tests
 makedepends="zlib-dev libjpeg-turbo-dev bash coreutils perl"
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD
index 58fbf06c31e273e70426197d9153be1876829cb2..2ae8d33b3d081b80f5661b46d4544217ae9d806f 100644
--- a/main/qt/APKBUILD
+++ b/main/qt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=8
 pkgdesc="A cross-platform application and UI framework"
 url="http://qt-project.org/"
 arch="all"
-license="GPL3 LGPL"
+license="GPL-3.0 LGPL"
 depends="ca-certificates"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-assistant $pkgname-config
 	$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-mysql
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index b575628e7397249b2b4d577484afb7a1929c9c8c..1a33ada426d2cf262ef2383365d4241ee496832e 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF, BGP and NHRP"
 url="http://quagga.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="iproute2"
 replaces="quagga-nhrp"
 provides="quagga-nhrp=$pkgver"
diff --git a/main/quvi/APKBUILD b/main/quvi/APKBUILD
index 1186479590feb132234c966c7c4a4ca7dddfd8fb..bf1fb114e0fceadb0e6e3b034287caaff51ce3c7 100644
--- a/main/quvi/APKBUILD
+++ b/main/quvi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Command line tool for parsing video download links"
 url="http://quvi.sourceforge.net/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev="libquvi-dev zlib-dev libressl-dev"
 makedepends="$depends_dev glib-dev"
diff --git a/main/ragel/APKBUILD b/main/ragel/APKBUILD
index 03713323f5a32d12dc6861c0e9e0161f0751a95c..61261aa9cc83446fe63e9c825e13c9865581c79b 100644
--- a/main/ragel/APKBUILD
+++ b/main/ragel/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Finite state machine compiler"
 url="http://www.complang.org/ragel/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/rdiff-backup/APKBUILD b/main/rdiff-backup/APKBUILD
index 29f76b10b560555f012a165baaa58f31652f66bf..c464feb5ac435c00ff6f3a08f2a77ffdcd998af6 100644
--- a/main/rdiff-backup/APKBUILD
+++ b/main/rdiff-backup/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A backup utility that maintains extra reverse diffs so that files can be restored from previous backups"
 url="https://www.gnu.org/savannah-checkouts/non-gnu/rdiff-backup/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="librsync-dev python2-dev"
 subpackages="$pkgname-doc"
diff --git a/main/re2c/APKBUILD b/main/re2c/APKBUILD
index d21f775c2aaaf962cfbb1f235b693c461fe58b41..4ac02993795c42e1c29b2613f1e8d7eddc1fd8b7 100644
--- a/main/re2c/APKBUILD
+++ b/main/re2c/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A tool for writing fast and flexible scanners in C from regular expressions"
 url="http://www.re2c.org"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 checkdepends="bash"
 subpackages="$pkgname-doc"
 source="https://github.com/skvadrik/re2c/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/main/recode/APKBUILD b/main/recode/APKBUILD
index 807d805da2c0b0f48b30777aeb8dc13a20a86426..c3bfaf42ddb35b3e8f9725116041beaa389c5b6f 100644
--- a/main/recode/APKBUILD
+++ b/main/recode/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Charset converter tool and library"
 url="https://github.com/pinard/Recode"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libtool automake autoconf texinfo flex bison"
diff --git a/main/rest/APKBUILD b/main/rest/APKBUILD
index 0dffd29a64210f32b7773437dc574e0cb97ae6c4..1fe694651742b6e2f52666a2f74da26c52e0ed11 100644
--- a/main/rest/APKBUILD
+++ b/main/rest/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A library for access to RESTful web services"
 url="http://www.gnome.org"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends_dev="libsoup-dev gobject-introspection-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD
index 709e9cdb826aefca049395e66c05f91e1e561ad6..3c8b25444d852630240c33d75b7017b505c50eae 100644
--- a/main/ristretto/APKBUILD
+++ b/main/ristretto/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Ristretto is a image viewer for Xfce"
 url="http://goodies.xfce.org/projects/applications/ristretto"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="libxfce4ui-dev dbus-glib-dev libexif-dev thunar-dev"
 install=
diff --git a/main/rrdcollect/APKBUILD b/main/rrdcollect/APKBUILD
index 749c3d802c690c1e3413379f2df2a57ade716569..a0de55df0468b695440860956f96b577a1886521 100644
--- a/main/rrdcollect/APKBUILD
+++ b/main/rrdcollect/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Read system statistical data and feed it to RRDtool"
 url="http://rrdcollect.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="rrdtool"
 makedepends="libpcap-dev"
 subpackages="$pkgname-doc"
diff --git a/main/rsnapshot/APKBUILD b/main/rsnapshot/APKBUILD
index b1deee7d8cc2f0de6fa5bb9460885661131f8e18..d660f4fd30684272b7b6c09e47604a9428ba3737 100644
--- a/main/rsnapshot/APKBUILD
+++ b/main/rsnapshot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Local and remote filesystem snapshot utility"
 url="http://www.rsnapshot.org/"
 arch="noarch"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="perl rsync openssh-client"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 0b89574fb3aec24fccd829d394ef0d6dae34d79d..ad3db98d1c135b4f5c8213ba5a6c0e1c35404b16 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=7
 pkgdesc="A file transfer program to keep remote files in sync"
 url="https://rsync.samba.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 options="!check" # included test suite fails some tests
 makedepends="perl acl-dev popt-dev"
 subpackages="$pkgname-doc rrsync"
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index ee76846336b40b187adcffc038f7ecfe346ab10f..ad61bf96fcf31c2aff574fb38f5f7280a3ea2302 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
 pkgdesc="Enhanced multi-threaded syslogd with database support and more."
 url="http://www.rsyslog.com/"
 arch="all"
-license="GPLv3 LGPL3"
+license="GPL-3.0 LGPL-3.0"
 options="!check"
 makedepends="zlib-dev gnutls-dev mariadb-dev postgresql-dev net-snmp-dev
 	libnet-dev libgcrypt-dev libee-dev libestr-dev liblogging-dev
diff --git a/main/ruby-augeas/APKBUILD b/main/ruby-augeas/APKBUILD
index 6c1bdd273bb25c5c798ef705b68fb3cdc3109f58..5091da2a9aad6b6b8733ebcc9d6ccf7db01b53bf 100644
--- a/main/ruby-augeas/APKBUILD
+++ b/main/ruby-augeas/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=4
 pkgdesc="Augeas bindings for Ruby"
 url=http://rubygems.org/gems/$_gemname
 arch=all
-license=LGPL2.1+
+license="LGPL-2.1-or-later"
 depends=ruby
 makedepends="augeas-dev ruby-dev"
 install=
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index a8fd24764b752afe17c2a744dad34818d8abebf0..1e9f07a759e42ec128d5287cb48a4bb89d0dc462 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 subpackages="$pkgname-dev $pkgname-doc
 	$pkgname-common::noarch
 	$pkgname-initscript::noarch
diff --git a/main/sc/APKBUILD b/main/sc/APKBUILD
index c309c297283b6925728f87cae64a6ae197711af4..3204be40da749d49d253f8690270c1ec5aafa492 100644
--- a/main/sc/APKBUILD
+++ b/main/sc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Speadsheet Calculator"
 url="https://github.com/dkastner/sc"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 depends="ncurses"
 depends_dev=""
 makedepends="ncurses-dev bison"
diff --git a/main/screen/APKBUILD b/main/screen/APKBUILD
index be4d32dd8f2b6b15dd6d5ed941895b4d4556d7d2..89718aa3d3ced96d0a06b823ea8f3781a33cebcb 100644
--- a/main/screen/APKBUILD
+++ b/main/screen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A window manager that multiplexes a physical terminal"
 url="http://ftp.gnu.org/gnu/screen/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 options="!check"  # No test suite.
 makedepends="ncurses-dev ncurses"
 subpackages="$pkgname-doc"
diff --git a/main/scstadmin/APKBUILD b/main/scstadmin/APKBUILD
index fd55e3ab5590a0831e2337a91ea942b91422332c..aee50fda25d119c38543c7f6fef0544efc0e44a0 100644
--- a/main/scstadmin/APKBUILD
+++ b/main/scstadmin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="SCST administration tool written in perl"
 url="http://scst.sourceforge.net"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl"
 makedepends="perl-dev"
 install=
diff --git a/main/sdl_image/APKBUILD b/main/sdl_image/APKBUILD
index 65e0c8b104dae9f656fecbf3bf0dcfe15d48e96e..16ce47cda3474c6ff788e598af7d7385b8dff0e3 100644
--- a/main/sdl_image/APKBUILD
+++ b/main/sdl_image/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A simple library to load images of various formats as SDL surfaces"
 url="http://www.libsdl.org/projects/SDL_image/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="sdl-dev libpng-dev libjpeg-turbo-dev tiff-dev zlib-dev"
 install=""
diff --git a/main/seabios/APKBUILD b/main/seabios/APKBUILD
index 3334f9bd081bcfdd82e48637d71a7db97d6f6f60..9c8bbd926cee141a7b77e9f39f8eb031299d4b54 100644
--- a/main/seabios/APKBUILD
+++ b/main/seabios/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Open-source legacy BIOS implementation"
 url="http://www.coreboot.org/SeaBIOS"
 arch="x86 x86_64"
-license="LGPLv3"
+license="LGPL-3.0"
 depends="$pkgname-bin=$pkgver-r$pkgrel seavgabios-bin=$pkgver-r$pkgrel"
 depends_dev=""
 makedepends="$depends_dev python2 iasl"
diff --git a/main/sems/APKBUILD b/main/sems/APKBUILD
index 93a8b0100aeca8c485f805863a87f50f965d4e02..aebe5c6e0d6bac348bf6fd1d03bcc5e4aef32efe 100644
--- a/main/sems/APKBUILD
+++ b/main/sems/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="SIP Express Media Server, an extensible SIP media server"
 url="http://iptel.org/sems/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 pkgusers="sems"
 pkggroups="sems"
 install="$pkgname.pre-install"
diff --git a/main/serf/APKBUILD b/main/serf/APKBUILD
index 8c6c9c375eacc323a9c81013286bea1763dfbf7a..1dfd80d24134f3f24a0ad382c63523e3c770c8f3 100644
--- a/main/serf/APKBUILD
+++ b/main/serf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="High-Performance Asynchronous HTTP Client Library"
 url="http://serf.apache.org/"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 makedepends="apr-util-dev apr-dev libressl-dev zlib-dev scons chrpath python2"
 subpackages="$pkgname-dev"
 source="https://archive.apache.org/dist/$pkgname/$pkgname-$pkgver.tar.bz2
diff --git a/main/shorewall-core/APKBUILD b/main/shorewall-core/APKBUILD
index 6f80b29fe5645e28b4718c9cc10e3816368d447b..00e97d612ea26a1748185dd53f811d8d73260692 100644
--- a/main/shorewall-core/APKBUILD
+++ b/main/shorewall-core/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Core libraries for Shorewall"
 url="http://www.shorewall.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 # coreutils for install -T
 makedepends="coreutils bash"
diff --git a/main/shorewall/APKBUILD b/main/shorewall/APKBUILD
index 822e2819750a850fbc718b240e32278d69dd2d51..df9857c8f91e2631d4361f5e003254f64bdad5df 100644
--- a/main/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="An iptables front end for firewall configuration"
 url="http://www.shorewall.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="shorewall-core perl iptables iproute2"
 # coreutils for install -T
 makedepends="coreutils bash"
diff --git a/main/shorewall6/APKBUILD b/main/shorewall6/APKBUILD
index 0b03ece8fc893c006f9a6b86d5871abc596a0b8d..49f90ccf39d2019a9ef604f994532e3befbbfec7 100644
--- a/main/shorewall6/APKBUILD
+++ b/main/shorewall6/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Files for the IPV6 Shorewall Firewall"
 url="http://www.shorewall.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="shorewall-core perl ip6tables iproute2"
 # coreutils for install -T
 makedepends="coreutils bash"
diff --git a/main/sipp/APKBUILD b/main/sipp/APKBUILD
index ba083c6620b66c832824b247f8b8146c47e129c3..31b0aca72f772483448942f6e310483fce7eb31c 100644
--- a/main/sipp/APKBUILD
+++ b/main/sipp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=9
 pkgdesc="A test tool / traffic generator for the SIP protocol"
 url="http://sipp.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="linux-headers autoconf automake libressl-dev libpcap-dev ncurses-dev lksctp-tools-dev"
diff --git a/main/sipsak/APKBUILD b/main/sipsak/APKBUILD
index 4156c1e355d082410b2d8cee6b74bf670c15a81f..3775199802f0fce71f17afa30e9889a1fcdd5921 100644
--- a/main/sipsak/APKBUILD
+++ b/main/sipsak/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=9
 pkgdesc="SIP swiss army knife"
 url="http://sipsak.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="libressl-dev c-ares-dev"
 install=""
diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD
index 9471bf99eafe64ffd7ae0a6f0e17d9dc6721a49d..cd7102a7f35c0a01fbf3f19b6642922c95df10be 100644
--- a/main/sircbot/APKBUILD
+++ b/main/sircbot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Minimalistic IRC bot"
 url="https://git.alpinelinux.org/cgit/sircbot/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 pkgusers="sircbot"
 pkggroups="sircbot"
 depends=
diff --git a/main/skytraq-datalogger/APKBUILD b/main/skytraq-datalogger/APKBUILD
index 83a1d8abe8de2404f0bc1a51dcad9d1177b10c3e..35853d5ba05227a23d6f42af0ac5a92c02d8deec 100644
--- a/main/skytraq-datalogger/APKBUILD
+++ b/main/skytraq-datalogger/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Configuration and download tool for GPS data loggers based on Skytraq Venus 5 and 6 chipsets"
 url="http://code.google.com/p/skytraq-datalogger/"
 arch="all"
-license="GNU GPL v2"
+license="GPL-2.0"
 depends=""
 depends_dev="curl-dev"
 makedepends="$depends_dev"
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD
index aac999ec4d69f84f8aaa824b395c23f28c0a7431..108fc31347500e347e78b6968b3058201026d78b 100644
--- a/main/slim/APKBUILD
+++ b/main/slim/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=8
 pkgdesc="Desktop-independent graphical login manager for X11"
 url="https://sourceforge.net/projects/slim.berlios/files/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 subpackages="$pkgname-doc"
 makedepends="libxmu-dev libpng-dev libjpeg-turbo-dev libxft-dev
diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD
index e9665cb5fd08accf4f924fbf37ff3f1aaae49ce8..60f7aeaea452f166be16858a13a660e04151258b 100644
--- a/main/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="Simple NTP client"
 url="https://git.alpinelinux.org/cgit/hosted/sntpc/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
 	sntpc.initd
diff --git a/main/soxr/APKBUILD b/main/soxr/APKBUILD
index fe3e9a0486ed37fe0b5e4ca1df4d4ac41119048c..6b604e738d3ffcc9d4004789ebf53dfafc9a31b5 100644
--- a/main/soxr/APKBUILD
+++ b/main/soxr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="High quality, one-dimensional sample-rate conversion library"
 url="https://sourceforge.net/projects/soxr/"
 arch="all"
-license="LGPL2"
+license="LGPL-2.0"
 depends=""
 depends_dev="cmake"
 makedepends="$depends_dev"
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index 7419a976eb566ca8d05ea95e7ebd8bb1b88ca40e..ec09e806bc5271ae9ce0ba49e1bfe853d0bc4a11 100644
--- a/main/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=8
 pkgdesc="The Powerful #1 Open-Source Spam Filter"
 url="http://search.cpan.org/dist/Mail-SpamAssassin/"
 arch="all"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends="perl-html-parser perl-digest-sha1 perl-netaddr-ip perl-net-dns perl-mail-dkim
 	perl-mime-base64 perl-db_file perl-time-hires perl-libwww"
 cpanmakedepends="$cpandepends"
diff --git a/main/speedtest-cli/APKBUILD b/main/speedtest-cli/APKBUILD
index f13871e7c934711aec59f066f6a0de5b2d496438..9043baf1f11f990a6ab7c183f728893335f029cb 100644
--- a/main/speedtest-cli/APKBUILD
+++ b/main/speedtest-cli/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Command line interface for testing internet bandwidth using speedtest.net"
 url="https://github.com/sivel/speedtest-cli"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python3"
 makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/sivel/speedtest-cli/archive/v$pkgver.tar.gz"
diff --git a/main/spice-gtk/APKBUILD b/main/spice-gtk/APKBUILD
index 0f10333c7fd6af874f5e1e6b1060ec5775ec7b5f..11e69607580d55b4eefd72bcf126af785a03f9a1 100644
--- a/main/spice-gtk/APKBUILD
+++ b/main/spice-gtk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A GTK+ widget for SPICE clients"
 url="http://spice-space.org/page/Spice-Gtk"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="gtk+3.0-dev celt051-dev polkit-dev libxrandr-dev libressl-dev
 	cyrus-sasl-dev gst-plugins-base-dev libjpeg-turbo-dev zlib-dev
diff --git a/main/spice-protocol/APKBUILD b/main/spice-protocol/APKBUILD
index 462e989b93f35c9bd25605c1e7de0e1b28c3d1ed..e2521d1d200e34a77fc11715a2d6e6068b0e233d 100644
--- a/main/spice-protocol/APKBUILD
+++ b/main/spice-protocol/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Spice protocol header files"
 url="http://www.spice-space.org/"
 arch="noarch"
-license="BSD and LGPLv2+"
+license="BSD and LGPL-2.0-or-later"
 depends=""
 makedepends=""
 source="http://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2
diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD
index 891946e680003c0c9376aa245958dd0bcb5932c1..918cf28910b2a9774460df7c4f15e8bc2bcafb1b 100644
--- a/main/spice/APKBUILD
+++ b/main/spice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="Implements the SPICE protocol"
 url="http://www.spice-space.org/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="spice-protocol pixman-dev celt051-dev libxinerama-dev"
 makedepends="$depends_dev alsa-lib-dev libjpeg-turbo-dev libxrandr-dev
diff --git a/main/sprunge/APKBUILD b/main/sprunge/APKBUILD
index b98b3c1351b94cecf4f21962eb0cedb833883d15..f663d800b9bace7c2cbaff3c84c4271243f6af5c 100644
--- a/main/sprunge/APKBUILD
+++ b/main/sprunge/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Helper script to paste things to http://sprunge.us"
 url="http://sprunge.us"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends="curl"
 makedepends=
 install=""
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 82ed3f575d1c60e1baa5d67bb904b8a95e5d1fe6..faaf225b6f588c212737ed605c171007fbee6c5e 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -9,7 +9,7 @@ install="squid.pre-install squid.pre-upgrade"
 pkgusers="squid"
 pkggroups="squid"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="logrotate"
 makedepends="libressl-dev perl-dev autoconf automake heimdal-dev libtool
 	libcap-dev linux-headers"
diff --git a/main/sshpass/APKBUILD b/main/sshpass/APKBUILD
index 5c54b31d9e50d1bdf1dc1b44dbed933ffb4a1314..88e545bce68eb07cec243f19e102899ec68e360c 100644
--- a/main/sshpass/APKBUILD
+++ b/main/sshpass/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Non-interactive SSH authentication utility"
 url="http://sshpass.sourceforge.net/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index abfe53f5ed3cc5a97a589becbebbe93677f1898c..5f663216c031ed98faced06bf26c7acafae88899 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
 subpackages="$pkgname-doc"
 arch="all"
 url="https://packages.debian.org/stable/mail/ssmtp"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="libressl-dev autoconf"
 options="!check"
diff --git a/main/stfl/APKBUILD b/main/stfl/APKBUILD
index 66e996f7f961744210d1a67f642f90263bc4611e..007361d3c94018bce2ba3810b9637f92aeb588cd 100644
--- a/main/stfl/APKBUILD
+++ b/main/stfl/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="The Structured Terminal Forms Language/Library"
 url="http://www.clifford.at/stfl/"
 arch="all"
-license="LGPLv3+"
+license="LGPL-3.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev ncurses-dev"
diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD
index 86dc6476909fd4497f16e1c1af422a40dbb26dc9..fcb38345a6d9c24e77cd6093468c2b16d90cd826 100644
--- a/main/strongswan/APKBUILD
+++ b/main/strongswan/APKBUILD
@@ -9,7 +9,7 @@ url="https://www.strongswan.org/"
 arch="all"
 pkgusers="ipsec"
 pkggroups="ipsec"
-license="GPL2 RSA-MD5 RSA-PKCS11 DES"
+license="GPL-2.0 RSA-MD5 RSA-PKCS11 DES"
 depends="iproute2"
 depends_dev=""
 makedepends="$depends_dev linux-headers python2 sqlite-dev libressl-dev curl-dev
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 554d0543cbea5c958a9bf674fd97829e30d448d7..893a97839eab52b98680aef4ddfb428d00556eea 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="http://subversion.apache.org/"
 arch="all"
-license="apache bsd"
+license="Apache BSD"
 depends=
 makedepends="apr-dev apr-util-dev expat-dev neon-dev libressl-dev zlib-dev
 	e2fsprogs-dev sqlite-dev apache2-dev perl-dev swig serf-dev
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index 79792de7c916b0c1f1173b5071006a2a919a5f99..3ac98c59364d156433e4d5cab337299676b35045 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A compiler that makes it easy to integrate C and C++ code with scripting languages"
 url="http://www.swig.org/"
 arch="all"
-license="GPL3 BSD"
+license="GPL-3.0 BSD"
 depends="guile"
 makedepends="zlib-dev pcre-dev"
 subpackages="$pkgname-doc"
diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD
index 7d5884a6ea0772136acbab98493cb06a85aab1eb..6b410f8dd760ba205e23f4a00400493e0212d243 100644
--- a/main/syslog-ng/APKBUILD
+++ b/main/syslog-ng/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Next generation logging daemon"
 url="http://www.balabit.com"
 arch="all !aarch64"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev="glib-dev eventlog-dev pcre-dev libressl-dev python2-dev hiredis-dev json-c-dev"
 makedepends="$depends_dev"
diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD
index b7cbad953317ae5863fe8c8dd5ac5ccfb08c379b..622f9cdb12e9e42676ada858b3d19d65382730be 100644
--- a/main/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="iA Performance monitoring tools"
 url="http://pagesperso-orange.fr/sebastien.godard/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/taglib/APKBUILD b/main/taglib/APKBUILD
index 6903bdcd9b8a9de0fdcec0b23b90cead879d98e6..f3f4e401bf28bce6cee618725d9aedbacafac0ec 100644
--- a/main/taglib/APKBUILD
+++ b/main/taglib/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="library for reading and editing the meta-data of several popular audio formats."
 url="http://taglib.github.io/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="zlib-dev cmake"
 depends=
 source="http://taglib.github.io/releases/taglib-$pkgver.tar.gz"
diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD
index 9d5b6aceaed27df44f631f8775bcbd5e34d09674..5441ab6621cf72b8ec4ac75e8833631d1a0a0ec2 100644
--- a/main/talloc/APKBUILD
+++ b/main/talloc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A memory pool management library"
 url="http://talloc.samba.org/"
 arch="all"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 replaces="samba-common"
 makedepends="$depends_dev python2-dev libxslt docbook-xsl"
 subpackages="$pkgname-dev py-$pkgname:_py $pkgname-doc"
diff --git a/main/tango-icon-theme/APKBUILD b/main/tango-icon-theme/APKBUILD
index 76e1242d4068fc3c56805d5be18c94178a900316..9a38732c89b338ef9aaef5a4f6b4ee5b12a4ef5b 100644
--- a/main/tango-icon-theme/APKBUILD
+++ b/main/tango-icon-theme/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="The Tango Desktop Project exists to create a consistent user experience"
 url="http://tango.freedesktop.org"
 arch="all"
-license="CCPL-Attribution-ShareAlike-2.5"
+license="CC-BY-SA-2.5"
 makedepends="intltool icon-naming-utils imagemagick-dev imagemagick"
 source="http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
 
diff --git a/main/tcpflow/APKBUILD b/main/tcpflow/APKBUILD
index 9b273f78fa111718e04f2005335a98c5038d2b53..bce3ef12b73216001eb74f77fd8e9080b7bbe170 100644
--- a/main/tcpflow/APKBUILD
+++ b/main/tcpflow/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A Tool for monitoring, capturing and storing TCP connections flows"
 url="https://github.com/simsong/tcpflow"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="libpcap-dev zlib-dev boost-dev libressl-dev autoconf automake"
 install=""
diff --git a/main/tcpproxy/APKBUILD b/main/tcpproxy/APKBUILD
index 4160cbd272bff8f65efa9bfba75862db4a1d8ce4..4d1638f18b7d2bac21b229673f1963bb9e54249e 100644
--- a/main/tcpproxy/APKBUILD
+++ b/main/tcpproxy/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=4
 pkgdesc="Transparent TCP Proxy"
 url="http://www.quietsche-entchen.de/cgi-bin/wiki.cgi/proxies/TcpProxy"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=
 makedepends="ctags linux-headers"
 install=""
diff --git a/main/tdb/APKBUILD b/main/tdb/APKBUILD
index edc73c2c618317334e4b93939fbaf63d3369d8c2..5e82af3460b1651aef3c1b351c16ccb551c5ab38 100644
--- a/main/tdb/APKBUILD
+++ b/main/tdb/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="The tdb library"
 url="http://tdb.samba.org/"
 arch="all"
-license="LGPLv3+"
+license="LGPL-3.0-or-later"
 depends_dev="python2"
 makedepends="$depends_dev python2-dev docbook-xsl"
 subpackages="$pkgname-dev py-$pkgname:_py $pkgname-libs $pkgname-doc"
diff --git a/main/tevent/APKBUILD b/main/tevent/APKBUILD
index 4dc1f4482146b45d6a75ad46c0129a039a4b0bd4..0f68f66e6a7f25a0c7753993308f0b8675ab806a 100644
--- a/main/tevent/APKBUILD
+++ b/main/tevent/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="The tevent library"
 url="http://tevent.samba.org/"
 arch="all"
-license="LGPLv3+"
+license="LGPL-3.0-or-later"
 makedepends="python2-dev talloc-dev"
 replaces="samba"
 subpackages="$pkgname-dev py-$pkgname:_py"
diff --git a/main/the_silver_searcher/APKBUILD b/main/the_silver_searcher/APKBUILD
index 64f39a7245b3d73e5b452de76628e9d52e98445e..356c3d01978530e327329b21f5dc1d043a83eec9 100644
--- a/main/the_silver_searcher/APKBUILD
+++ b/main/the_silver_searcher/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A code searching tool similar to ack, with a focus on speed."
 url="https://geoff.greer.fm/ag/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="pcre-dev xz-dev zlib-dev"
 subpackages="$pkgname-doc
diff --git a/main/thin-provisioning-tools/APKBUILD b/main/thin-provisioning-tools/APKBUILD
index 2814a80e58bdd31e90bb34d1109810974d5321d6..c5d0597b763a7d26e1cedd8791dc94a16b424c49 100644
--- a/main/thin-provisioning-tools/APKBUILD
+++ b/main/thin-provisioning-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A suite of tools for manipulating the metadata of the dm-thin device-mapper target"
 url="https://github.com/jthornber/thin-provisioning-tools"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="expat boost libaio"
 makedepends="expat-dev boost-dev libaio-dev linux-headers autoconf automake libtool"
 install=""
diff --git a/main/thunar-archive-plugin/APKBUILD b/main/thunar-archive-plugin/APKBUILD
index 16f1d5ba4efaee292394c932a774c5dcd113f443..9def4c8dc240ee01f8a0d436350180665ee6f292 100644
--- a/main/thunar-archive-plugin/APKBUILD
+++ b/main/thunar-archive-plugin/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="create and deflate archives in thunar"
 url="http://foo-projects.org/~benny/projects/thunar-archive-plugin/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="gtk+-dev intltool thunar-dev exo-dev"
 install=
diff --git a/main/thunar-vcs-plugin/APKBUILD b/main/thunar-vcs-plugin/APKBUILD
index 4d4e28703acf7bb3c32e21c98205b6a3acaea733..a98afcea8ff88d40f45aed44ebe896dd3653070c 100644
--- a/main/thunar-vcs-plugin/APKBUILD
+++ b/main/thunar-vcs-plugin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="Version Contol System plugin for the Thunar filemanager"
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=
 makedepends="thunar-dev subversion-dev apr-dev util-linux-dev"
 install=""
diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD
index ffe2dd1d9c24569df7e99c530e928fd7450281cf..7e215cc1b33ea8ae9c035554b14bdf7d30eb25b7 100644
--- a/main/thunar/APKBUILD
+++ b/main/thunar/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="File manager for Xfce"
 url="http://thunar.xfce.org"
 arch="all"
-license="GPL2 LGPL2"
+license="GPL-2.0 LGPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
 depends_dev="gtk+2.0-dev glib-dev exo-dev"
diff --git a/main/tig/APKBUILD b/main/tig/APKBUILD
index d91cae1a846e41200fa5fa900230fdef7c82b749..2c47e72416bd29ed2a1d362ce8c5a2eacf8f9360 100644
--- a/main/tig/APKBUILD
+++ b/main/tig/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Text-mode interface for the git revision control system"
 url="http://jonas.nitro.dk/tig"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 options="!check" # Tests are broken
 depends="git"
 makedepends="ncurses-dev xmlto asciidoc git"
diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD
index 131ccdc4fba6a7adcca713ddfc170972e5d7bb58..dbfed45ce47e8904b2ad00793845450af65307e3 100644
--- a/main/tinc/APKBUILD
+++ b/main/tinc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="tinc is a Virtual Private Network (VPN) daemon"
 url="http://www.tinc-vpn.org/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="zlib-dev lzo-dev libressl-dev linux-headers"
 subpackages="$pkgname-doc"
 source="http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 1e5446ed4f8ca0265b0937023d1cfa6e82f0ae95..7d08cb084d4c9720b1eeeaf311ecf74f3dd66a40 100644
--- a/main/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
@@ -8,7 +8,7 @@ pkgusers="tinyproxy"
 pkggroups="tinyproxy"
 url="https://www.banu.com/tinyproxy/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=
 makedepends="asciidoc"
 install="tinyproxy.pre-install"
diff --git a/main/tree/APKBUILD b/main/tree/APKBUILD
index 288cda84cc19266b0eb68737fcc3c91d22f2d700..bd2aba1de8c02e5d2d52bdee5a4f2ed5039e06fe 100644
--- a/main/tree/APKBUILD
+++ b/main/tree/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A recursive directory indented listing of files"
 url="http://mama.indstate.edu/users/ice/tree/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/tslib/APKBUILD b/main/tslib/APKBUILD
index 8339fb732e3280c8e5719d79f278cda794825041..ffcd33f9375704c1c4b76713df7699dbb21328a3 100644
--- a/main/tslib/APKBUILD
+++ b/main/tslib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Touchscreen Access Library"
 arch="all"
 url="https://github.com/kergoth/tslib"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="autoconf automake libtool linux-headers"
 source="https://github.com/kergoth/tslib/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/main/tsocks/APKBUILD b/main/tsocks/APKBUILD
index 8284e5f85bb09be116c01f6f6f3147d558ffcdee..1abf787e17b7d41ef9739837f8a3d1fe49beb693 100644
--- a/main/tsocks/APKBUILD
+++ b/main/tsocks/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A transparent SOCKS proxying library"
 url="http://tsocks.sourceforge.net/"
 arch="x86_64 ppc64le"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends=""
diff --git a/main/ttf-liberation/APKBUILD b/main/ttf-liberation/APKBUILD
index 2fd5687dc7f5d669866f7f362a2e43e8b2478b09..c245ec56071cb070ba02518ac62e69acb610e8b3 100644
--- a/main/ttf-liberation/APKBUILD
+++ b/main/ttf-liberation/APKBUILD
@@ -7,7 +7,7 @@ _narrowver=1.07.4
 pkgrel=1
 pkgdesc="Red Hats Liberation fonts"
 url="https://pagure.io/liberation-fonts/"
-license="custom GPL2"
+license="custom GPL-2.0"
 arch="noarch"
 depends="fontconfig"
 makedepends=""
diff --git a/main/tumbler/APKBUILD b/main/tumbler/APKBUILD
index 07a9c909efa5d89ebf1a1146c54d16a7d5919cfe..78bdf8e7f1326b74e5f7a1dd02da649a1deb97d2 100644
--- a/main/tumbler/APKBUILD
+++ b/main/tumbler/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="D-Bus service for applications to request thumbnails"
 url="http://git.xfce.org/xfce/tumbler/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="gtk+2.0-dev dbus-glib-dev libjpeg-turbo-dev poppler-dev curl-dev"
 install=""
diff --git a/main/txt2man/APKBUILD b/main/txt2man/APKBUILD
index 0d674a0dcbbec1457aa04a25424b75fa39ec16ae..62d05a4ee98d63c7915e142873b14149b1cbc805 100644
--- a/main/txt2man/APKBUILD
+++ b/main/txt2man/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Convert flat ASCII text to man page format"
 url="https://github.com/mvertes/txt2man"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="gawk"
 makedepends=
 subpackages="$pkgname-doc"
diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD
index 373c82c3c7aeb191b3357a5203a85066b8d823d3..c45eed5d8b8fa9d4776b93d8b7040aff3e81d45b 100644
--- a/main/tzdata/APKBUILD
+++ b/main/tzdata/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
 pkgdesc="Timezone data"
 url="https://www.iana.org/time-zones"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 depends=""
 depends_dev=""
 makedepends=""
diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD
index 539b8b18130f82368b09ff83b4267d36d6eb3f2f..1d51b135603327780c188604ac0c8079ed1d23ba 100644
--- a/main/u-boot/APKBUILD
+++ b/main/u-boot/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="u-boot bootloader common files"
 url="http://www.denx.de/wiki/U-Boot/"
 arch="armhf aarch64"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev bc dtc python"
diff --git a/main/udev-init-scripts/APKBUILD b/main/udev-init-scripts/APKBUILD
index e6b36bedaba0926873abd34036ba5e9d40770143..4a96eadf7c861aa0ef38ed7f3790e68f762b6fa2 100644
--- a/main/udev-init-scripts/APKBUILD
+++ b/main/udev-init-scripts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="udev startup scripts for openrc"
 url="https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/udev-init-scripts"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 replaces=udev
 install="$pkgname.post-install $pkgname.post-upgrade"
 options="!check"
diff --git a/main/udisks/APKBUILD b/main/udisks/APKBUILD
index fb063f20806e35c6aa1da5df7e6fbde53f281014..21d1912d9a13eb1ffed2ccb7db399b3b86ac1881 100644
--- a/main/udisks/APKBUILD
+++ b/main/udisks/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Disk Management Service"
 url="http://www.freedesktop.org/wiki/Software/udisks"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="glib-dev polkit-dev parted-dev libgudev-dev sg3_utils-dev
 	dbus-dev dbus-glib-dev lvm2-dev pkgconfig libatasmart-dev
diff --git a/main/udisks2/APKBUILD b/main/udisks2/APKBUILD
index 96115d2daf5b63391d202a72937ae71734a009d6..75ba929e0b59c8d6b8addb3452f013eaee824789 100644
--- a/main/udisks2/APKBUILD
+++ b/main/udisks2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Disk Manager"
 url="http://www.freedesktop.org/wiki/Software/udisks"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev="gobject-introspection-dev polkit-dev libatasmart-dev
 	libgudev-dev acl-dev"
diff --git a/main/ulogd/APKBUILD b/main/ulogd/APKBUILD
index 905b5f9603cb5b19542d01117148754bee36f0e5..2fe64c3d5fafd366087e40920bf6281d34956827 100644
--- a/main/ulogd/APKBUILD
+++ b/main/ulogd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
 url="http://netfilter.org/projects/ulogd/index.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="libmnl-dev libpcap-dev libnetfilter_acct-dev bsd-compat-headers
 	libnfnetlink-dev libnetfilter_conntrack-dev libnetfilter_log-dev
diff --git a/main/umix/APKBUILD b/main/umix/APKBUILD
index 7fa25e5adb8c524c59f61ab673589266a6127807..14940c12c6a209bee6b45ddb7ed6f6ec5039fdb3 100644
--- a/main/umix/APKBUILD
+++ b/main/umix/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=7
 pkgdesc="Program for adjusting soundcard volumes"
 url="http://umix.sf.net"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="linux-headers ncurses-dev"
 install=""
diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index 0525c1c19f86ae4ae30c74f86e2e549755cb32f7..2f785f5ae7d48e24f9b45a43589bd55bb3637e38 100644
--- a/main/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ODBC is an open specification to access Data Sources"
 url="http://www.unixodbc.org/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check"  # No test suite.
 depends=""
 makedepends="readline-dev"
diff --git a/main/upower/APKBUILD b/main/upower/APKBUILD
index 03665f9b52fdcf316f466f5e48191b64b12e50d4..490d40bd1c1f2b91cb55b64c4e569449a3acbb12 100644
--- a/main/upower/APKBUILD
+++ b/main/upower/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Power Management Services"
 url="http://upower.freedesktop.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 makedepends="linux-headers gtk+-dev libgudev-dev libusb-dev polkit-dev dbus-glib-dev libxslt
diff --git a/main/usb-modeswitch/APKBUILD b/main/usb-modeswitch/APKBUILD
index e9cb5a53ccde54cc6d14bf9758efddda8118bde1..1cd917c95e2e2cdd0f4116bfdcb26621582a5721 100644
--- a/main/usb-modeswitch/APKBUILD
+++ b/main/usb-modeswitch/APKBUILD
@@ -6,7 +6,7 @@ _pkgdata=20140529
 pkgdesc="A mode switching tool for controlling flip flop (multiple device) USB gear"
 url="http://www.draisberghof.de/usb_modeswitch/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="libusb-compat-dev coreutils tcl"
 install=
diff --git a/main/usbredir/APKBUILD b/main/usbredir/APKBUILD
index 8ba5a027ca58439bd4d3e78be19bda8eaaf20bf9..d49329811d9075182c5db68545dc7d9dd5c39ece 100644
--- a/main/usbredir/APKBUILD
+++ b/main/usbredir/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="USB network redirection protocol libraries"
 url="http://spice-space.org/page/UsbRedir"
 arch="all"
-license="GPL2+ LGPL2+"
+license="GPL-2.0-or-later LGPL-2.0-or-later"
 depends_dev="libusb-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-server"
diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD
index beb0b74e6ec8a2deab94063f6e808b5ef717cc1e..1d410a1581effa8483832d29e6f02f443217c6c3 100644
--- a/main/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="USB Device Utilities"
 url="http://linux-usb.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends="hwdata-usb"
 makedepends="libusb-dev eudev-dev"
diff --git a/main/userspace-rcu/APKBUILD b/main/userspace-rcu/APKBUILD
index 4de96c8257bf74cf3bc75790ec8d36774b3aba02..f696799a3cca6dad3cdebff6ce509ee5bab0557a 100644
--- a/main/userspace-rcu/APKBUILD
+++ b/main/userspace-rcu/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A userspace RCU (read-copy-update) library"
 url="http://lttng.org/urcu/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev bash perl perl-utils"
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index 74d5a5e4c763252393d3e7fa6f39c55581f524cc..bbc45532c2a280b999987b68efbc1aa3e363a550 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -13,7 +13,7 @@ pkgrel=0
 pkgdesc="Random collection of Linux utilities"
 url="http://git.kernel.org/cgit/utils/util-linux/util-linux.git"
 arch="all"
-license="GPL2 GPL2+ LGPL2+ BSD Public Domain"
+license="GPL-2.0 GPL-2.0-or-later LGPL-2.0-or-later BSD Public-Domain"
 depends="findmnt"
 makedepends_build="autoconf automake libtool"
 makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev"
diff --git a/main/uvncrepeater/APKBUILD b/main/uvncrepeater/APKBUILD
index 36d19007bd3f590869e8b214a2be9c34e929f962..337c039bf994eec75c93c986a0b0404287b8cb6a 100644
--- a/main/uvncrepeater/APKBUILD
+++ b/main/uvncrepeater/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="VNC repeater based on ultravnc repeater"
 url="http://koti.mbnet.fi/jtko/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="openrc>=0.6"
 makedepends=""
 install="$pkgname.pre-install"
diff --git a/main/uwsgi/APKBUILD b/main/uwsgi/APKBUILD
index 39b4a3bf6c64e74390a49253a6503606597eb0c1..dceac3d700820351939ba0d0d76c95a24accfa17 100644
--- a/main/uwsgi/APKBUILD
+++ b/main/uwsgi/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="uWSGI application container server"
 url="http://projects.unbit.it/uwsgi/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="mailcap"
 install="uwsgi.pre-install"
 pkgusers="uwsgi"
diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index b441964c9c62ec4f1f75b8e8b40d0cb4727f5e92..444bcef2bcffc4aa92aebb1e72fb6a3511377fb7 100644
--- a/main/v4l-utils/APKBUILD
+++ b/main/v4l-utils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 url="http://freshmeat.net/projects/libv4l"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="qt-dev libjpeg-turbo-dev argp-standalone linux-headers eudev-dev"
 subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-dvbv5 $pkgname-libs ir_keytable"
 source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
diff --git a/main/v86d/APKBUILD b/main/v86d/APKBUILD
index 061f08455d5732345e1811b923a7296a2931c794..905a1564a1e251b82a5e542da64c1c14e4da4127 100644
--- a/main/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Userspace helper for uvesafb that runs x86 code in an emulated environment"
 url="https://github.com/mjanusz/v86d"
 arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="bash linux-headers"
 source="v86d-$pkgver.tar.gz::https://github.com/mjanusz/v86d/archive/v86d-$pkgver.tar.gz
diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD
index 20667ca3a7810465c8a68eb1d596d0029d0bc79e..6c0cb265e518ef150ed05fd9bb7eab67dc759498 100644
--- a/main/vala/APKBUILD
+++ b/main/vala/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Compiler for the GObject type system"
 url="http://live.gnome.org/Vala"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-doc"
 depends="glib-dev"
 makedepends="libxslt-dev bash glib-dev flex bison"
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index 35342c73e3303277035195a47bed60432bd74fd0..4fc92bae06367db07f3cfce741c6763b7f05fa0a 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A tool to help find memory-management problems in programs"
 url="http://valgrind.org/"
 arch="all !aarch64"
-license="GPL2+"
+license="GPL-2.0-or-later"
 # it seems like busybox sed works but the configure script requires GNU sed
 makedepends="sed paxmark perl bash autoconf automake libtool"
 # from README_PACKAGERS:
diff --git a/main/vanessa_adt/APKBUILD b/main/vanessa_adt/APKBUILD
index 9334a897511ada10ff2f32b69259e252b13152cd..15cfd4541530c104460da6816a10a07bd605fd5f 100644
--- a/main/vanessa_adt/APKBUILD
+++ b/main/vanessa_adt/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Library of abstract data types"
 url="http://horms.net/projects/perdition/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev="vanessa_logger-dev"
 makedepends="$depends_dev"
diff --git a/main/vanessa_logger/APKBUILD b/main/vanessa_logger/APKBUILD
index b5d743a0a6d57e3552ccbb33b4a9be609494a978..7461c1a489694e16d53ca205798bc15b0d5f106d 100644
--- a/main/vanessa_logger/APKBUILD
+++ b/main/vanessa_logger/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Logging library"
 url="http://horms.net/projects/perdition/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/vanessa_socket/APKBUILD b/main/vanessa_socket/APKBUILD
index 3583cc5b67a3abc8f998ce5f30515bdc7abb74c1..d701a2dde5883123b1f3d735681814e9e1216317 100644
--- a/main/vanessa_socket/APKBUILD
+++ b/main/vanessa_socket/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="User space TCP/IP pipe"
 url="http://horms.net/projects/perdition/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=
 depends_dev="popt-dev vanessa_logger-dev"
 makedepends="$depends_dev"
diff --git a/main/vblade/APKBUILD b/main/vblade/APKBUILD
index dc6d34dde12cc584c82429a683b6739c7632c760..dff1e7b5b72ed7592866b04d39ed8c0ee0aa8d4a 100644
--- a/main/vblade/APKBUILD
+++ b/main/vblade/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A virtual AoE blade server"
 url="http://aoetools.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD
index 9a407317804abd8b4c824711649f4fee40ac8bfe..b117bd1252a9141c0610e0a437835716381e9735 100644
--- a/main/vsftpd/APKBUILD
+++ b/main/vsftpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Very secure ftpd"
 url="http://vsftpd.beasts.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="libressl-dev libcap-dev linux-pam-dev linux-headers"
 subpackages="$pkgname-doc"
diff --git a/main/vte/APKBUILD b/main/vte/APKBUILD
index a10844acd8074e153c42b89479946866775e92b1..4d5e3e3fab25b1149a51cae7b952cd30f2ba4c0f 100644
--- a/main/vte/APKBUILD
+++ b/main/vte/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=13
 pkgdesc="Virtual Terminal Emulator library"
 url="http://www.gnome.org"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="suid"
 depends_dev="pango-dev gtk+2.0-dev"
 makedepends="$depends_dev intltool ncurses-dev python2-dev py-gtk-dev"
diff --git a/main/weechat/APKBUILD b/main/weechat/APKBUILD
index cc3034f8bb9e7ae9f8fdcfdd04efef0a61006a6e..d0c7a9c76804e5bd630177a0aa186a689d6f5ded 100644
--- a/main/weechat/APKBUILD
+++ b/main/weechat/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A fast, light, extensible ncurses-based chat client"
 url="http://www.weechat.org"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends_dev="cmake libintl ncurses-dev gnutls-dev libgcrypt-dev curl-dev
 	aspell-dev lua-dev perl-dev python2-dev ruby-dev zlib-dev"
 makedepends="$depends_dev"
diff --git a/main/wget/APKBUILD b/main/wget/APKBUILD
index d544d412406dd2f9dcb0181e9629d47ef6da524c..91026e47c0d055e5b5afb92a90763f64757bf775 100644
--- a/main/wget/APKBUILD
+++ b/main/wget/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A network utility to retrieve files from the Web"
 url="https://www.gnu.org/software/wget/wget.html"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 makedepends="libressl-dev perl"
 subpackages="$pkgname-doc"
diff --git a/main/which/APKBUILD b/main/which/APKBUILD
index a9decf9288ef5a4194f108983f37e0c8a21aa2a7..aaf627c3e4ee1fdfd0239bbf29efefd744801080 100644
--- a/main/which/APKBUILD
+++ b/main/which/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A utility to show the full path of commands"
 url="http://savannah.gnu.org/projects/which"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/wipe/APKBUILD b/main/wipe/APKBUILD
index 140c7934e198c8fc807b5820b10cd28e98acb9fb..fc56665d14f023f352c528289cc62cb51af477fb 100644
--- a/main/wipe/APKBUILD
+++ b/main/wipe/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Secure file wiping utility"
 url="http://wipe.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev linux-headers"
diff --git a/main/wireless-tools/APKBUILD b/main/wireless-tools/APKBUILD
index 49c925019bccd9b87edd1d99efd3518bc1b88516..bdf6d234280f6cdc575cfc29a75da220b3112b5c 100644
--- a/main/wireless-tools/APKBUILD
+++ b/main/wireless-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Open Source wireless tools"
 url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers "
 install=""
diff --git a/main/wv/APKBUILD b/main/wv/APKBUILD
index 4b131238a4b9f46d31a3528c66e733ca2431c87f..2acadc3bef871df9da68623f855a925f33c23bdf 100644
--- a/main/wv/APKBUILD
+++ b/main/wv/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="A library that can load and parse Word 2000, 97, 95 and 6 file formats"
 url="https://sourceforge.net/projects/wvware"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=""
 makedepends="libgsf-dev libpng-dev bzip2-dev coreutils"
diff --git a/main/xautolock/APKBUILD b/main/xautolock/APKBUILD
index f6d968e1c62a1482c4eacbe8ddfb69c9ec055ad9..a67f0523eb5c50470025907ceabffec4d3dc353d 100644
--- a/main/xautolock/APKBUILD
+++ b/main/xautolock/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="An automatic X screen-locker/screen-saver"
 url="ftp://ibiblio.org/pub/Linux/X11/screensavers/"
 arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="imake xorg-server-dev libxscrnsaver-dev xorg-cf-files"
 makedepends="$depends_dev"
diff --git a/main/xclip/APKBUILD b/main/xclip/APKBUILD
index 4fb38fe4350596d86c2a61dc8471a57eb79198be..9aa15a1ffa6e332ea62e1f53f582ab946e2f6eea 100644
--- a/main/xclip/APKBUILD
+++ b/main/xclip/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Command line interface to the X11 clipboard"
 url="https://github.com/astrand/xclip"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="autoconf automake libxmu-dev libx11-dev"
diff --git a/main/xfburn/APKBUILD b/main/xfburn/APKBUILD
index 038c42177ef5d425d13d2511f33ad8204e27248b..24759f0f652b6c9a9c19f2391455caa27e03e243 100644
--- a/main/xfburn/APKBUILD
+++ b/main/xfburn/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="a simple CD/DVD burning tool based on libburnia libraries"
 url="http://goodies.xfce.org/projects/applications/xfburn"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="libburn-dev libisofs-dev libxfce4ui-dev thunar-dev librsvg-dev
 	gst-plugins-base0.10-dev exo-dev"
diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD
index 4bc767af526b5c8a582c0c885dd6e6e5d1b2b038..9da9df2f970863525e3c5f8b229319a189241cf4 100644
--- a/main/xfce4-appfinder/APKBUILD
+++ b/main/xfce4-appfinder/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Xfce application finder"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="hicolor-icon-theme"
 makedepends="thunar-dev gtk+-dev libxfce4ui-dev garcon-dev"
 subpackages="$pkgname-lang"
diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD
index 3b27e688ea5d1fd41201542477f5770a015ac38e..4c7b4c7b96c6590475b7b14b5e6727a51ae000dd 100644
--- a/main/xfce4-battery-plugin/APKBUILD
+++ b/main/xfce4-battery-plugin/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="A battery monitor plugin for the Xfce panel"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="xfce4-panel-dev libxfce4ui-dev perl-xml-parser intltool
 	linux-headers"
 install=
diff --git a/main/xfce4-clipman-plugin/APKBUILD b/main/xfce4-clipman-plugin/APKBUILD
index da4752fc7a9b075a12d704c41b26849f829e8369..74d15223f51eb6dc3a25d50147f3093f1904d959 100644
--- a/main/xfce4-clipman-plugin/APKBUILD
+++ b/main/xfce4-clipman-plugin/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Clipboard manager plugin for the Xfce panel"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="libxfce4ui-dev xfce4-panel-dev libunique-dev libxtst-dev exo-dev"
 install=""
diff --git a/main/xfce4-cpufreq-plugin/APKBUILD b/main/xfce4-cpufreq-plugin/APKBUILD
index e17b252f6f618f8e214505f0e2b377f98d554dcd..3202c42130ed2f9150abd5a1d5cba938fab7eb47 100644
--- a/main/xfce4-cpufreq-plugin/APKBUILD
+++ b/main/xfce4-cpufreq-plugin/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="CPU frequency plugin for the Xfce4 panel"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="xfce4-panel-dev libxfce4ui-dev"
 install=
diff --git a/main/xfce4-cpugraph-plugin/APKBUILD b/main/xfce4-cpugraph-plugin/APKBUILD
index 3305804380fb702c22252fa5b8224c693498ec9d..57ddbbf861b751cb744bed94412b0fa7969e63d7 100644
--- a/main/xfce4-cpugraph-plugin/APKBUILD
+++ b/main/xfce4-cpugraph-plugin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="CPU monitor for the Xfce panel"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="libxfce4ui-dev xfce4-panel-dev"
 install=""
diff --git a/main/xfce4-dev-tools/APKBUILD b/main/xfce4-dev-tools/APKBUILD
index 57c89f79ecb5135ac51aaab341f10bee7dc2bcb7..ee5006eadcf7b84d50726ddfbd14011e41e969b3 100644
--- a/main/xfce4-dev-tools/APKBUILD
+++ b/main/xfce4-dev-tools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Xfce developer tools"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="automake autoconf make intltool pkgconfig libtool gtk-doc glib-dev"
 makedepends=
 source="http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/xfce4-dev-tools-$pkgver.tar.bz2"
diff --git a/main/xfce4-mixer/APKBUILD b/main/xfce4-mixer/APKBUILD
index 7d8ecfa4a2c1c4dc8f5e41db649a9f4442c1cf3d..82d7d27da8497b724ccbe81434fea930d5d3ab64 100644
--- a/main/xfce4-mixer/APKBUILD
+++ b/main/xfce4-mixer/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="The volume control plugin for the Xfce panel"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="hicolor-icon-theme"
 makedepends="xfce4-panel-dev gst-plugins-base0.10-dev libxfce4ui-dev
 	libunique-dev keybinder-dev"
diff --git a/main/xfce4-notifyd/APKBUILD b/main/xfce4-notifyd/APKBUILD
index 4f8cab781d0e592a59bc84dbcee950a1294d49ab..fe16ee6e7ee6b2008475eeac1cf0580ee0aa21ff 100644
--- a/main/xfce4-notifyd/APKBUILD
+++ b/main/xfce4-notifyd/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="notification daemon for the xfce desktop"
 url="http://spuriousinterrupt.org/projects/xfce4-notifyd"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="hicolor-icon-theme"
 makedepends="gtk+-dev libxfce4util libxfce4ui-dev libsexy-dev xfconf-dev
 	dbus-glib-dev libglade-dev libnotify-dev"
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD
index 5ea5aaee1a764103f26cbb41b0f028fff483c1ae..f0bb1c19fb63cb1b32c94a69c8bdb829e83aba1f 100644
--- a/main/xfce4-panel/APKBUILD
+++ b/main/xfce4-panel/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 depends_dev="libxfce4util-dev gtk+2.0-dev gtk+3.0-dev"
diff --git a/main/xfce4-power-manager/APKBUILD b/main/xfce4-power-manager/APKBUILD
index bef210d27c33fb287a525deab976ac70d4a98288..4ac9b7c9c7425131c45e0fad97599a086b16f85a 100644
--- a/main/xfce4-power-manager/APKBUILD
+++ b/main/xfce4-power-manager/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Power management for the Xfce desktop environment"
 url="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends="polkit"
 depends_dev="xfconf-dev xfce4-panel-dev dbus-glib-dev libnotify-dev
 	libxrandr-dev libxfce4ui-dev"
diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD
index 9beff52ade7c5867c08fcb4395ae2632911bbd54..7cec821fe87fc82619115203ab92b36fdeb666cf 100644
--- a/main/xfce4-screenshooter/APKBUILD
+++ b/main/xfce4-screenshooter/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="screenshot application for Xfce4"
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-doc $pkgname-lang"
 depends=
 makedepends="xfce4-panel-dev hicolor-icon-theme libsoup-dev libxfce4ui-dev
diff --git a/main/xfce4-session/APKBUILD b/main/xfce4-session/APKBUILD
index 35288013321d9e35359d1373e2fd839d1787f744..8e16b290443c34aacc4a0c600bdaafb844951cae 100644
--- a/main/xfce4-session/APKBUILD
+++ b/main/xfce4-session/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A session manager for Xfce"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme iceauth dbus-x11"
 depends_dev="libxfce4ui-dev xfconf-dev"
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD
index 1b095e9fb9117520ba3e7c2eb76af3efeb1025c7..b254b75da3f9f0fb040301f16a190f13c80e9964 100644
--- a/main/xfce4-settings/APKBUILD
+++ b/main/xfce4-settings/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Settings manager for xfce"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 subpackages="$pkgname-lang"
 makedepends="libxfce4ui-dev exo-dev libxi-dev libxrandr-dev libxklavier-dev
diff --git a/main/xfce4-taskmanager/APKBUILD b/main/xfce4-taskmanager/APKBUILD
index 4338749d07133d63659f05fc3f7b05c2cff7988f..a278faaace0be55b1f7298a606c0c1a44b2ee765 100644
--- a/main/xfce4-taskmanager/APKBUILD
+++ b/main/xfce4-taskmanager/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="a simple taskmanager for the Xfce Desktop Environment"
 url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 makedepends="libxfce4ui-dev libxmu-dev"
 subpackages="$pkgname-lang"
diff --git a/main/xfce4-terminal/APKBUILD b/main/xfce4-terminal/APKBUILD
index 3d7cef0d71cc0ff3911307e689a6bcd5239b8a38..301556abc1685c263a3087a424dfd7a7ee922f56 100644
--- a/main/xfce4-terminal/APKBUILD
+++ b/main/xfce4-terminal/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 url="https://xfce.org/projects/terminal/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-doc $pkgname-lang"
 depends="startup-notification hicolor-icon-theme"
 makedepends="exo-dev vte-dev libxfce4ui-dev"
diff --git a/main/xfce4-volumed/APKBUILD b/main/xfce4-volumed/APKBUILD
index 0f7946be8ffb08cd22f3563678fcd155eb31eadf..7a19456fb0b35320fd28e7789b9d56a0cdcddc33 100644
--- a/main/xfce4-volumed/APKBUILD
+++ b/main/xfce4-volumed/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Daemon to add additional functionality to the volume keys of the keyboard"
 url="https://launchpad.net/xfce4-volumed"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends="xfce4-mixer"
 makedepends="xfconf-dev libnotify-dev gst-plugins-base0.10-dev keybinder-dev"
 install=""
diff --git a/main/xfce4-whiskermenu-plugin/APKBUILD b/main/xfce4-whiskermenu-plugin/APKBUILD
index c33761c3c68b673b23265774a51d5d28ee866d77..07a0bab0de2b4840eaeb4807edffe16448dd8e5d 100644
--- a/main/xfce4-whiskermenu-plugin/APKBUILD
+++ b/main/xfce4-whiskermenu-plugin/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="alternate application launcher for Xfce"
 url="https://gottcode.org/xfce4-whiskermenu-plugin/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev cmake libxfce4ui-dev libxfce4util-dev exo-dev
diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD
index fdb83a53fa90fc3a4a26018d5318ba50de892d40..cd298da73cbec177824dc4925083c9c6271039c3 100644
--- a/main/xfconf/APKBUILD
+++ b/main/xfconf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Hierarchical configuration system for Xfce"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="!check"  # Requires running dbus daemon.
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD
index 3e39ceed85cae2747be936af73c45658d27df383..109004e7366c81d55f94d616bd2eb46204ef94b0 100644
--- a/main/xfdesktop/APKBUILD
+++ b/main/xfdesktop/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A desktop manager for Xfce"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-doc $pkgname-lang"
 depends="hicolor-icon-theme"
 makedepends="garcon-dev thunar-dev libxfce4ui-dev libwnck-dev libnotify-dev
diff --git a/main/xfwm4-themes/APKBUILD b/main/xfwm4-themes/APKBUILD
index 8733debc9913cb9c559f23a03c4bdb038b2b4830..179b7787370996c77b8516a89df6a90a0ae28f7f 100644
--- a/main/xfwm4-themes/APKBUILD
+++ b/main/xfwm4-themes/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A set of additionnal themes for the Xfce window manager"
 url="https://xfce.org/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="xfwm4"
 makedepends=
 options="!strip"
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD
index b8118a65e2c53d950e66d24103a6a3e80a284ff8..44113f78397b08eabb3b4eea5f8f5fe251312aea 100644
--- a/main/xfwm4/APKBUILD
+++ b/main/xfwm4/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
 url="https://xfce.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="hicolor-icon-theme"
 subpackages="$pkgname-lang"
 makedepends="libxfce4ui-dev libwnck-dev libxrandr-dev libxcomposite-dev
diff --git a/main/xmlto/APKBUILD b/main/xmlto/APKBUILD
index 974e60ec905ced11d028b514bf206624db68fd84..8931d66bf79864caf0acff7b5f468fdda5ae0fe7 100644
--- a/main/xmlto/APKBUILD
+++ b/main/xmlto/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Convert xml to many other formats"
 url="https://pagure.io/xmlto/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="libxslt perl-yaml-syck perl-test-pod bash docbook-xsl"
 depends_dev=
 makedepends="$depends_dev bash"
diff --git a/main/xrdp/APKBUILD b/main/xrdp/APKBUILD
index 52188bacf16ad274745a52a39d31acd3154abcf5..66deb1fc83bd79d15c73e10ee8aa26b17fbec815 100644
--- a/main/xrdp/APKBUILD
+++ b/main/xrdp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="An open source RDP server"
 url="http://www.xrdp.org/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev autoconf automake libtool libressl-dev libx11-dev
diff --git a/main/yaboot/APKBUILD b/main/yaboot/APKBUILD
index 3c805c9e6f8ef238a2318f5437b913d1ee36f79c..092f67d7afcefd83df862ed95feec4378fe4870f 100644
--- a/main/yaboot/APKBUILD
+++ b/main/yaboot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A bootloader for openfirmware-based machines (new-world macintosh, as well as ibm rs/6000, pseries and openpower)"
 url="http://yaboot.ozlabs.org/"
 arch="powerpc"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/yeahconsole/APKBUILD b/main/yeahconsole/APKBUILD
index 25be5016189c17bbe42227e0f3365b75f28eb14e..5846f1d575cfb6a434cb999370a8e6626a993e1d 100644
--- a/main/yeahconsole/APKBUILD
+++ b/main/yeahconsole/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Drop-down X terminal emulator wrapper"
 url="http://phrat.de/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libx11-dev"
diff --git a/main/zd1211-firmware/APKBUILD b/main/zd1211-firmware/APKBUILD
index ac81d9b54f1fb27cfa90f3958dd248eba081b69c..b76becc525257cf3ab763fa5202d666360a38120 100644
--- a/main/zd1211-firmware/APKBUILD
+++ b/main/zd1211-firmware/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
 url="https://sourceforge.net/projects/zd1211/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends=""
diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD
index bb2a482558f4a1252b1e474d51322226ae2085f1..6c8d93a8fc395ff6bc1a0d49663c633641dcc0ea 100644
--- a/main/zeromq/APKBUILD
+++ b/main/zeromq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="The ZeroMQ messaging library and tools"
 url="http://www.zeromq.org/"
 arch="all"
-license="LGPLv3+ with exceptions"
+license="LGPL-3.0-or-later with exceptions"
 makedepends="util-linux-dev libsodium-dev
 	perl python2 asciidoc xmlto autoconf automake
 	"
diff --git a/main/zmap/APKBUILD b/main/zmap/APKBUILD
index 68b4f9ffccdc2617542313ca37c64a4a65b1c99d..9c188bc180b47b8ea99f027b9a78bdf514cabbaf 100644
--- a/main/zmap/APKBUILD
+++ b/main/zmap/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A high performance internet scanner"
 url="https://www.zmap.io/"
 arch="all"
-license="Apache-2"
+license="Apache-2.0"
 depends=""
 depends_dev=""
 makedepends="linux-headers cmake flex byacc json-c-dev gengetopt
diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD
index a2491139cb26d032abbd2d9c93660815e9625918..e7afe1f237d13d466bef9751101f203c3c639239 100644
--- a/main/znc/APKBUILD
+++ b/main/znc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="An advanced IRC bouncer"
 url="http://znc.in"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 makedepends="perl-dev libressl-dev cyrus-sasl-dev python2-dev c-ares-dev swig
 	gettext-dev tcl-dev autoconf automake python3-dev"
 pkgusers="$pkgname"
diff --git a/testing/accountsservice/APKBUILD b/testing/accountsservice/APKBUILD
index 629d33fea09e3c425fc9a61ef3d5941760342a5e..ad3fdd83faea3cf18178ea50fc5627fa0f72e71c 100644
--- a/testing/accountsservice/APKBUILD
+++ b/testing/accountsservice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="D-Bus interface for user account query and manipulation"
 url="http://www.freedesktop.org/software/accountsservice/"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends=""
 depends_dev="glib-dev gobject-introspection-dev polkit-dev"
 makedepends="$depends_dev intltool gnome-doc-utils"
diff --git a/testing/agg/APKBUILD b/testing/agg/APKBUILD
index 80a091b0d4fee8a4afd3d7f010d51bb2bc5b496b..3d72b6a50e58339e338d6027d129d2dd55398a94 100644
--- a/testing/agg/APKBUILD
+++ b/testing/agg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Anti-Grain Geometry (AGG) is a general purpose graphical toolkit written completely in standard and platform independent C++."
 url="http://www.antigrain.com"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 options="!check"
 makedepends="autoconf automake libgfortran libtool sdl-dev"
 install=""
diff --git a/testing/alttab/APKBUILD b/testing/alttab/APKBUILD
index fa854a48f0ec440e8d5428d24026aeb228b307b9..b61a7ffd39dcbf6528af7e3b5c752eb8994ad5e0 100644
--- a/testing/alttab/APKBUILD
+++ b/testing/alttab/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="X11 window switcher designed for minimalistic window managers or standalone X11 session"
 url="https://github.com/sagb/alttab"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="libx11 libxft libxrender libpng fts"
 makedepends="libx11-dev libxft-dev uthash-dev libxrender-dev libpng-dev fts-dev"
 install=""
diff --git a/testing/amule/APKBUILD b/testing/amule/APKBUILD
index 19fa543d17e2081c1ea0fccc718b2d2cffb1834e..83586f2222e88cd00dfaa48bb006fad635283cc3 100644
--- a/testing/amule/APKBUILD
+++ b/testing/amule/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="An eMule-like client for the eD2k and Kademlia networks"
 url="http://www.amule.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="bison crypto++-dev gd-dev geoip-dev libsm-dev libupnp-dev wxgtk2.8-dev"
 subpackages="$pkgname-lang $pkgname-doc"
 source="http://amule.sourceforge.net/tarballs/${_pkgname}${pkgver}.tar.bz2"
diff --git a/testing/apache2-mod-authnz-external/APKBUILD b/testing/apache2-mod-authnz-external/APKBUILD
index 8f36bb79ad7309f33fccf469a6088f96077d5e3c..0299abaddafcf3a8c32cf2c39220aecaf791b63f 100644
--- a/testing/apache2-mod-authnz-external/APKBUILD
+++ b/testing/apache2-mod-authnz-external/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Apache module for external authentication"
 url="https://code.google.com/p/mod-auth-external/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="apache2"
 makedepends="apache2-dev"
 install=""
diff --git a/testing/apache2-mod-perl/APKBUILD b/testing/apache2-mod-perl/APKBUILD
index 78d71540f608513b2c230a868f4863cf7e7e8cbe..2a72f5d7a0eeadf633e681c97a362a6415bed407 100644
--- a/testing/apache2-mod-perl/APKBUILD
+++ b/testing/apache2-mod-perl/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Perl Module for Apache2"
 url="http://perl.apache.org/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="apache2"
 depends_dev="$pkgname"
 makedepends="apache2-dev perl-dev perl-linux-pid apr-dev apr-util-dev"
diff --git a/testing/apt-dater-host/APKBUILD b/testing/apt-dater-host/APKBUILD
index eef272209ddd44ba1c040b18fc32585a3fb28512..adc245dcdd06c572bba8081aedff0e4698dbb3fd 100644
--- a/testing/apt-dater-host/APKBUILD
+++ b/testing/apt-dater-host/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
 pkgdesc="Host helper application for apt-dater"
 url="https://github.com/DE-IBH/apt-dater-host"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 checkdepends="bats checkbashisms"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/DE-IBH/$pkgname/archive/v$pkgver.tar.gz
diff --git a/testing/apt-dater/APKBUILD b/testing/apt-dater/APKBUILD
index 312d38bbd43c5491368f6dfb247ecb0e0a1c4f5f..d88cfbecc1c6f5cc4bd0f18cf218c06698ba4d2e 100644
--- a/testing/apt-dater/APKBUILD
+++ b/testing/apt-dater/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="terminal-based remote package update manager"
 url="https://github.com/DE-IBH/apt-dater"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="lockfile-progs screen openssh-client"
 makedepends="automake autoconf popt-dev glib-dev ncurses-dev tcl-dev libconfig-dev libxml2-dev"
 install=""
diff --git a/testing/aqemu/APKBUILD b/testing/aqemu/APKBUILD
index eb370ed8667bce7c8c77e5d277cf1ef9b53fc670..702c343a04ddd007b1436d30ce018de9fefd98af 100644
--- a/testing/aqemu/APKBUILD
+++ b/testing/aqemu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="GUI for virtual machines using QEMU as the backend"
 url="https://sourceforge.net/projects/aqemu/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="qemu"
 makedepends="cmake libvncserver-dev bzip2 qt5-qtbase-dev glib-dev"
 install=""
diff --git a/testing/argon2/APKBUILD b/testing/argon2/APKBUILD
index b8ba82cf77debabc213f8d500044a4aba8f6d93e..41397d2b8ef397a3afda2a1ad9d851c0c42db3a9 100644
--- a/testing/argon2/APKBUILD
+++ b/testing/argon2/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="The password hash Argon2, winner of PHC"
 url="https://github.com/P-H-C/phc-winner-argon2"
 arch="all !armhf"
-license="ASL 2.0 CC0 1.0"
+license="Apache-2.0 CC0-1.0"
 subpackages="$pkgname-dev libargon2"
 source="$pkgname-$pkgver.tar.gz::https://github.com/P-H-C/$_pkgname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
diff --git a/testing/arp-scan/APKBUILD b/testing/arp-scan/APKBUILD
index 0216489d1b96684f1eec34406d0147b92ce71132..d0c57b08e5034a0962311c2f47e96413599fbca9 100644
--- a/testing/arp-scan/APKBUILD
+++ b/testing/arp-scan/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The ARP scanner"
 url="https://github.com/royhills/arp-scan"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 depends=""
 makedepends="libpcap-dev autoconf automake libtool"
 install=""
diff --git a/testing/artifactory-oss/APKBUILD b/testing/artifactory-oss/APKBUILD
index 31b9a5626a183e759ebaac7a476c91a3be2802b8..4269b876e904d25f19007cc098587fa4e01a210d 100644
--- a/testing/artifactory-oss/APKBUILD
+++ b/testing/artifactory-oss/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Open source Maven repository manager"
 url="https://www.jfrog.com/open-source/"
 arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
 depends="jetty-runner openjdk8-jre-base"
 makedepends="unzip zip"
 install="$pkgname.pre-install $pkgname.post-install"
diff --git a/testing/atool/APKBUILD b/testing/atool/APKBUILD
index 05622ab9e097b41a0b892bec415b12fc1f99652f..c1cbe76b4cb1821b20f5f844a7f6ffec8406e514 100644
--- a/testing/atool/APKBUILD
+++ b/testing/atool/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="a Perl script for managing file archives of various types"
 url="http://nongnu.org/atool"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="perl"
 depends_dev=""
 makedepends="perl"
diff --git a/testing/aufs-util/APKBUILD b/testing/aufs-util/APKBUILD
index 3a7b38578b93308458e88117243b49e4232a36ba..5cf35e0d08c862d7d254dd830b63521ec76d3b34 100644
--- a/testing/aufs-util/APKBUILD
+++ b/testing/aufs-util/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Utilities for aufs"
 url="http://aufs.sourceforge.net/"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev linux-headers"
diff --git a/testing/autocutsel/APKBUILD b/testing/autocutsel/APKBUILD
index 2365984a3b502e6ad6c4ffc6603997389da68947..b42427cd61ab61621de8a9c810c3b2e942090c3c 100644
--- a/testing/autocutsel/APKBUILD
+++ b/testing/autocutsel/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="automated xcutsel"
 url="http://www.nongnu.org/autocutsel/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libx11-dev libxaw-dev"
 source="https://github.com/sigmike/autocutsel/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
 
diff --git a/testing/aws-cli/APKBUILD b/testing/aws-cli/APKBUILD
index 4928d42f934a906438ea1e7d14dcdf6c947d422e..20c2b79467edb44bd8a4fcf5b154f5225173fedb 100644
--- a/testing/aws-cli/APKBUILD
+++ b/testing/aws-cli/APKBUILD
@@ -8,7 +8,7 @@ _libname=${pkgname/-/}
 pkgdesc="Universal Command Line Interface for Amazon Web Services"
 url="https://github.com/aws/aws-cli"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 provides=$_libname
 depends="$_python groff py3-botocore py3-jmespath py3-s3transfer py3-docutils py3-colorama py3-yaml py3-rsa"
 makedepends="$_python-dev py-setuptools"
diff --git a/testing/beard/APKBUILD b/testing/beard/APKBUILD
index 65b62cbd52eef903ae2a1c91514349e0f84df61e..ae6801ad1a89f9e0f2c7c31011ef6fdfa02a52d1 100644
--- a/testing/beard/APKBUILD
+++ b/testing/beard/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Simple hibernation daemon"
 url="https://github.com/ahills/beard"
 arch="noarch"
-license="Public Domain"
+license="Public-Domain"
 depends="pm-utils"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ahills/beard/archive/v$pkgver.tar.gz"
diff --git a/testing/biblatex/APKBUILD b/testing/biblatex/APKBUILD
index 4bd579e9634d7ca4f1fb3308523fca41fd80c4c4..9af1209a6fd1f21892ae905c611ebb17384c8cde 100644
--- a/testing/biblatex/APKBUILD
+++ b/testing/biblatex/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Sophisticated Bibliographies in LaTeX"
 url="https://www.ctan.org/pkg/biblatex"
 arch="noarch"
-license="LPPL1.3"
+license="LPPL-1.3"
 depends="texlive-luatex"
 makedepends="bash perl"
 source="$pkgname-$pkgver.tar.gz::https://github.com/plk/biblatex/archive/v$pkgver.tar.gz"
diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD
index 8cd142fd01e2708bd7e806ea48c3eb3f1325f5b9..011028c9385c6ae2bc0dd763d062437aef10c2e0 100644
--- a/testing/bird/APKBUILD
+++ b/testing/bird/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="BIRD Internet Routing Daemon"
 url="http://bird.network.cz/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="bison flex ncurses-dev readline-dev linux-headers"
 install=""
diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD
index 4f9e004a349fc2a199234d3abac779638b0a0754..ecbcc124742c0a1ab2c25e0452c020998ebd72dd 100644
--- a/testing/blender/APKBUILD
+++ b/testing/blender/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="3D Creation/Animation/Publishing System"
 url="http://www.blender.org/"
 arch=""
-license="GPL2"
+license="GPL-2.0"
 depends="blender-shared=$pkgver-r$pkgrel"
 makedepends="cmake libx11-dev jpeg-dev zlib-dev libpng-dev freetype-dev python3-dev
 	openimageio-dev opencolorio-dev glew-dev openal-soft-dev ffmpeg-dev
diff --git a/testing/bobcat/APKBUILD b/testing/bobcat/APKBUILD
index 5cba65aa261735581ed2d961fc85f85bc9e898f1..25bef27efa64ae948fad4f3124407ad70ec65807 100644
--- a/testing/bobcat/APKBUILD
+++ b/testing/bobcat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Brokken's Own Base Classes And Templates"
 url="https://fbb-git.github.io/bobcat/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
 makedepends="icmake bash yodl"
 subpackages="$pkgname-doc $pkgname-dev"
diff --git a/testing/buildbot-slave/APKBUILD b/testing/buildbot-slave/APKBUILD
index 15864b252509589c54bdb9138589adbe6de86397..1a5354023ac25c14885234e29d1199bdcbe48a0d 100644
--- a/testing/buildbot-slave/APKBUILD
+++ b/testing/buildbot-slave/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Buildbot slave daemon"
 url="http://buildbot.net/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2 py-twisted"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/capstone/APKBUILD b/testing/capstone/APKBUILD
index 1268e31d22ee41fd9c0e5deb7e1bf56a4d62b7e0..2967a12b620de9ac10db7c5244b3b61b2224d124 100644
--- a/testing/capstone/APKBUILD
+++ b/testing/capstone/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="The Ultimate Disassembler"
 url="http://www.capstone-engine.org"
 arch="all"
-license="LGPLv2"
+license="LGPL-2.0"
 depends=""
 depends_dev="$pkgname"
 makedepends="cmake"
diff --git a/testing/catcodec/APKBUILD b/testing/catcodec/APKBUILD
index 9416da757daa097b9ab162ad29c1807a61697f54..7edb4b27e8900b0ec480bb96f884236765adaa22 100644
--- a/testing/catcodec/APKBUILD
+++ b/testing/catcodec/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Decodes and encodes sample catalogues for OpenTTD"
 url="http://www.openttd.org/en/download-catcodec"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends=""
diff --git a/testing/celery/APKBUILD b/testing/celery/APKBUILD
index de34d601076ba3defa00c1b4676b8f81cbca1afa..2d7d4e27abacd8723b8ce680abcbb91007172398 100644
--- a/testing/celery/APKBUILD
+++ b/testing/celery/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
 pkgdesc="Official Python low-level client for Elasticsearch"
 url="http://www.celeryproject.org/"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="py-urllib3 py-redis py-vine py-kombu py-billiard"
 makedepends="python3-dev"
 install="$pkgname.pre-install"
diff --git a/testing/checkpolicy/APKBUILD b/testing/checkpolicy/APKBUILD
index 65caffab0a2cd2438c422486f5f5be1ce70251bc..924ba2665846aca899122bd82a4d4d1460b3d373 100644
--- a/testing/checkpolicy/APKBUILD
+++ b/testing/checkpolicy/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="SELinux policy checker"
 url="http://www.selinuxproject.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libsepol-dev bison flex-dev"
 subpackages="$pkgname-doc"
 source="https://github.com/SELinuxProject/selinux/archive/checkpolicy-$pkgver.tar.gz
diff --git a/testing/clapf/APKBUILD b/testing/clapf/APKBUILD
index aa3651a99450c3cdcb81c713a5e9a664c45e0a1b..60607ac52bc199052ed5b4a96be4f0d725fe392c 100644
--- a/testing/clapf/APKBUILD
+++ b/testing/clapf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="clapf is an open source email content filter application"
 url="http://clapf.org"
 arch="all"
-license="as-is"
+license="AS-IS"
 depends="clamav-db"
 depends_dev="gsl-dev mysql-dev clamav-dev zlib-dev bzip2-dev"
 makedepends="$depends_dev autoconf automake"
diff --git a/testing/closure-compiler/APKBUILD b/testing/closure-compiler/APKBUILD
index e488f617e7909eb538a3bd316f4c1d5003e28f6f..9d31d60b4b03226c136f8f8047532c2f311d4d94 100644
--- a/testing/closure-compiler/APKBUILD
+++ b/testing/closure-compiler/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A JavaScript checker and optimizer"
 url="https://developers.google.com/closure/compiler/"
 arch="noarch !s390x"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="openjdk8-jre-base"
 source="$pkgname-$pkgver-jar.tar.gz::http://dl.google.com/$pkgname/compiler-$pkgver.tar.gz
 	$pkgname"
diff --git a/testing/cloudfoundry-cli/APKBUILD b/testing/cloudfoundry-cli/APKBUILD
index aba93faff94a506dfe5d3453f4387e32aea4bc8a..b3215cf18ec8edf4b730ff1dd60294f4f1d5a361 100644
--- a/testing/cloudfoundry-cli/APKBUILD
+++ b/testing/cloudfoundry-cli/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A CLI for Cloud Foundry written in Go"
 url="https://github.com/cloudfoundry/cli"
 arch="all"
-license="Apache 2.0"
+license="Apache-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev go bash"
diff --git a/testing/cntlm/APKBUILD b/testing/cntlm/APKBUILD
index cb82deba81a0b45c9e0ddbc7f8b6acadf914e516..e6ec9591229116f744b05eb9a6f6f977a0eb6e38 100644
--- a/testing/cntlm/APKBUILD
+++ b/testing/cntlm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="NTLM Session Response / NTLMv2 authenticating HTTP proxy"
 url="http://cntlm.sourceforge.net/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends=""
 install=""
diff --git a/testing/colord-gtk/APKBUILD b/testing/colord-gtk/APKBUILD
index 7fbb52cdedf1d439288d96060cc6f69550d767ad..5fca22e5ae80e397a5f617ab0ab4ecd7c1c1608a 100644
--- a/testing/colord-gtk/APKBUILD
+++ b/testing/colord-gtk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="GTK support library for colord"
 url="https://www.freedesktop.org/software/colord/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="intltool glib-dev gtk+3.0-dev colord-dev"
 subpackages="$pkgname-dev"
 source="https://www.freedesktop.org/software/colord/releases/colord-gtk-$pkgver.tar.xz"
diff --git a/testing/colord/APKBUILD b/testing/colord/APKBUILD
index 63fa14020565ab98f14c8817682746789e6d7f88..63dd1e1fdcb13d188e0820990c966a57b315ed90 100644
--- a/testing/colord/APKBUILD
+++ b/testing/colord/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="System daemon for managing color devices"
 url="http://www.freedesktop.org/software/colord"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="dconf-dev dbus-dev gobject-introspection-dev sqlite-dev
 	polkit-dev libgudev-dev"
diff --git a/testing/colormake/APKBUILD b/testing/colormake/APKBUILD
index bc1ea4d079339e6b6aeb46116f74813ccce2113c..836f02f365929e86ea271dfe9de29a52860d8490 100644
--- a/testing/colormake/APKBUILD
+++ b/testing/colormake/APKBUILD
@@ -7,7 +7,7 @@ _sha=93dd19b5143b124208caab5e9b6d57b5e6ec02cb
 pkgdesc="A simple wrapper around make to colorize the output"
 url="http://bre.klaki.net/programs/colormake"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 checkdepends="make"
 depends="bash less perl"
 subpackages="$pkgname-doc"
diff --git a/testing/consul/APKBUILD b/testing/consul/APKBUILD
index fb106d87314b3e8d234e0f6a1118bbc2a228951b..6fa759aabcc8d1711584705b1ac5ba15d98daa4d 100644
--- a/testing/consul/APKBUILD
+++ b/testing/consul/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A tool for service discovery, monitoring and configuration"
 url="https://www.consul.io/"
 arch="all !aarch64"
-license="MPL 2.0"
+license="MPL-2.0"
 depends=""
 makedepends="go bash"
 install="$pkgname.pre-install"
diff --git a/testing/containerd/APKBUILD b/testing/containerd/APKBUILD
index 01e4e378383a090e6dca9d569720d57f3a00fe3e..deacb753516a6707d3c9632b167b66f2016d4d5a 100644
--- a/testing/containerd/APKBUILD
+++ b/testing/containerd/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="An open and reliable container runtime"
 url="https://containerd.io/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 makedepends="go linux-headers btrfs-progs-dev protobuf-dev"
 source="containerd-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz
 	"
diff --git a/testing/copyq/APKBUILD b/testing/copyq/APKBUILD
index 9bc2c9d095382bea5630cfd2ff9706888f6d48e4..a38ddfb49a53cf8610f0e15bd719aeeeac0bdc7e 100644
--- a/testing/copyq/APKBUILD
+++ b/testing/copyq/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Clipboard manager with searchable and editable history"
 url="https://github.com/hluk/CopyQ"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="cmake qt5-qtscript-dev qt5-qttools-dev qt5-qtsvg-dev 
 	libxfixes-dev libxtst-dev"
 options="!check" #upstream does not provide check
diff --git a/testing/cpd/APKBUILD b/testing/cpd/APKBUILD
index ff115b1b86bd010cf9cc0f7502c567d6891d7cb5..6124efb2809ecb60627e03722899006d19692ab9 100644
--- a/testing/cpd/APKBUILD
+++ b/testing/cpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="C++ implementation of the Coherent Point Drift point set registration algorithm."
 url="https://github.com/gadomski/cpd"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="cmake eigen-dev fgt-dev"
 install=""
 subpackages="$pkgname-dev"
diff --git a/testing/cpiped/APKBUILD b/testing/cpiped/APKBUILD
index 0c33db69eae33f4ec866f32bf84f7b306d172e9d..178f312a825b4d83f30a4c0daaf6551ec46225be 100644
--- a/testing/cpiped/APKBUILD
+++ b/testing/cpiped/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Captures an audio stream and outputs it to a pipe"
 url="https://github.com/b-fitzpatrick/cpiped"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 options="!check"
 depends=""
 makedepends="alsa-lib-dev"
diff --git a/testing/cpupower/APKBUILD b/testing/cpupower/APKBUILD
index 8fe7573a9f2dae34ef5684f4fe4a580f48170f76..a32573f07c21f663f3b826aebe9cb4ce76dbeb6b 100644
--- a/testing/cpupower/APKBUILD
+++ b/testing/cpupower/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=$_kpkgrel
 pkgdesc="Linux kernel tool to examine and tune power saving related features of your processor"
 url="http://www.kernel.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends_dev="pciutils-dev readline-dev"
 makedepends="$depends_dev bash linux-headers"
 subpackages="$pkgname-doc $pkgname-dev"
diff --git a/testing/createrepo_c/APKBUILD b/testing/createrepo_c/APKBUILD
index 8624fc8ecdbc1a085a9980ab96c883805cf4a8be..f61aae92a5b3d621e3a193b217707187dc5be894 100644
--- a/testing/createrepo_c/APKBUILD
+++ b/testing/createrepo_c/APKBUILD
@@ -18,7 +18,7 @@ pkgrel=1
 pkgdesc="C implementation of createrepo"
 url="https://github.com/rpm-software-management/createrepo_c/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="
 	bash-completion
 	bzip2-dev
diff --git a/testing/criu/APKBUILD b/testing/criu/APKBUILD
index 5b0afc4ea6e97b625b0b756c12906734e6cc736b..72bd53f1c93b6916c8dd88a79e7eedf97b1ea6bc 100644
--- a/testing/criu/APKBUILD
+++ b/testing/criu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A Checkpoint/Restore utility for Linux in Userspace"
 url="http://criu.org"
 arch="x86_64"
-license="GPL2"
+license="GPL-2.0"
 makedepends="xmlto asciidoc python protobuf-c-dev protobuf-dev libaio-dev libnl3-dev
 	py-protobuf libcap-dev perl"
 subpackages="$pkgname-dev $pkgname-doc py-$pkgname:_py:noarch"
diff --git a/testing/crypto++/APKBUILD b/testing/crypto++/APKBUILD
index 6c2d22b9c2bf0da75a9dc4261aaa1b059021854f..6dbc27d7d83db6a48974c02b7eaf14708c0d86ce 100644
--- a/testing/crypto++/APKBUILD
+++ b/testing/crypto++/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A free C++ class library of cryptographic schemes"
 url="http://www.cryptopp.com"
 arch="all"
-license="Boost"
+license="BSL-1.0"
 depends=""
 depends_dev="$pkgname"
 makedepends=""
diff --git a/testing/ctorrent-dnh/APKBUILD b/testing/ctorrent-dnh/APKBUILD
index e4af307b10053286fdfd8b58c35e8baaa16d0f8b..2c0ac9c66a3114c937cac278939c71dd7157efba 100644
--- a/testing/ctorrent-dnh/APKBUILD
+++ b/testing/ctorrent-dnh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Enhanced CTorrent is a BitTorrent client for unix-like environments"
 url="http://www.rahul.net/dholmes/ctorrent/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 source="http://www.rahul.net/dholmes/ctorrent/${pkgname}${pkgver}.tar.gz
 	unistd.patch"
 builddir="$srcdir/${pkgname}${pkgver}"
diff --git a/testing/daemontools/APKBUILD b/testing/daemontools/APKBUILD
index d21ce8be1faa337467598b0ad72beb768efbb6d8..302d2e2de61247ea9f9f43b184b3f4aa21fc0ca8 100644
--- a/testing/daemontools/APKBUILD
+++ b/testing/daemontools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Collection of tools for managing UNIX services"
 url="http://cr.yp.to/daemontools.html"
 arch="all"
-license="public-domain"
+license="Public-Domain"
 depends=
 # The makefile need GNU cat for 'cat -v'
 makedepends="coreutils"
diff --git a/testing/dante/APKBUILD b/testing/dante/APKBUILD
index e26ab0b358296a196b8ae8d2a0d2bf53494f44a3..bd889d1223a13ce2cebd6a027bc667c8ef490662 100644
--- a/testing/dante/APKBUILD
+++ b/testing/dante/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Dante is SOCKS server and a SOCKS client"
 url="http://www.inet.no/dante/index.html"
 arch="all"
-license="BSD/CMU"
+license="BSD CMU"
 depends=""
 depends_dev=""
 makedepends="bison flex"
diff --git a/testing/darktable/APKBUILD b/testing/darktable/APKBUILD
index bdfa4bcc00615f1f659a07ae8a2190004d7490cd..c47985496518ebba79670c73866b74e95a540c8c 100644
--- a/testing/darktable/APKBUILD
+++ b/testing/darktable/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="an open source photography workflow application and raw developer"
 url="https://www.darktable.org/"
 arch="x86 x86_64 aarch64"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="
 	cmake
diff --git a/testing/deluge/APKBUILD b/testing/deluge/APKBUILD
index a32a14722fc25cdea2be8d4f9f941aea3b01c7bd..fe3b7dd50eeec30fa4d7e757ca7802fef9940a83 100644
--- a/testing/deluge/APKBUILD
+++ b/testing/deluge/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A lightweight, Free Software, cross-platform BitTorrent client"
 url="http://deluge-torrent.org"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="libtorrent-rasterbar<1.1.0 librsvg py-cffi py-chardet py-cryptography
 	py-enum34 py-gtk py-mako py-openssl py-setuptools py-six py-twisted
 	py-xdg xdg-utils"
diff --git a/testing/dep/APKBUILD b/testing/dep/APKBUILD
index 5ac1f3ceb4313f397c5598fc866b1849d3f716f4..5440620740c322611ed5bb05a6ed384161becd5f 100644
--- a/testing/dep/APKBUILD
+++ b/testing/dep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Go dependency management tool"
 url="https://github.com/golang/dep"
 arch="all"
-license="BSD3"
+license="BSD-3-Clause"
 makedepends="go"
 source="$pkgname-$pkgver.tar.gz::https://github.com/golang/$pkgname/archive/v$pkgver.tar.gz"
 builddir="$srcdir"/$pkgname-$pkgver
diff --git a/testing/dnsenum/APKBUILD b/testing/dnsenum/APKBUILD
index 2b7ac29849f3ae889d1092473ca4feec22d85474..7abf1a9d8c08687f4d62cdbb5c8eecddc26cf06c 100644
--- a/testing/dnsenum/APKBUILD
+++ b/testing/dnsenum/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A tool to enumerate DNS info about domains"
 url="https://github.com/fwaeytens/dnsenum"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="perl-net-ip perl-net-dns perl-net-netmask perl-xml-writer perl-string-random"
 source="$pkgname-$pkgver.tar.gz::https://github.com/fwaeytens/dnsenum/archive/$pkgver.tar.gz"
 builddir="$srcdir"/$pkgname-$pkgver
diff --git a/testing/dnssec-tools/APKBUILD b/testing/dnssec-tools/APKBUILD
index 42cd5b4ebd074dae04facc44287689dfa138c109..798547fb0a9530ff619218dbddb24eb2b617be00 100644
--- a/testing/dnssec-tools/APKBUILD
+++ b/testing/dnssec-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Set of tools that will help ease the deployment of DNSSEC"
 url="https://www.dnssec-tools.org/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="autoconf automake bind-dev libtool libressl-dev perl-graphviz perl-crypt-openssl-random
 	     perl-net-dns perl-net-dns-sec perl-xml-simple perl-dev sed chrpath"
 source="http://dev.alpinelinux.org/archive/dnssec-tools/dnssec-tools-$pkgver.tar.gz"
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index f7774fb8fbfb4db8c025c3864e9e8168f618501a..d1dcf146e7d18af0d74f17c0e73cfb75271f3f8c 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -9,7 +9,7 @@ url="http://dspam.nuclearelephant.com/"
 pkgusers="dspam"
 pkggroups="dspam"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 install="$pkgname.pre-install"
 makedepends="postgresql-dev sqlite-dev mariadb-dev autoconf automake libtool"
diff --git a/testing/dstat/APKBUILD b/testing/dstat/APKBUILD
index 2fa0dff095d23c3b2d35ab4202cd551ac15a29c3..7ad3ef7cad7f06bc191feb64a9bcf57578a10ab7 100644
--- a/testing/dstat/APKBUILD
+++ b/testing/dstat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A versatile resource statistics tool"
 url="http://dag.wieers.com/home-made/dstat/"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2"
 depends_dev="python2-dev"
 makedepends="$depends_dev"
diff --git a/testing/dynagen/APKBUILD b/testing/dynagen/APKBUILD
index a5a2e07348ef8d3a18e489a5a8744739c60567df..bad28d6670dfd848d50ec89ae60b93c40357b6e0 100644
--- a/testing/dynagen/APKBUILD
+++ b/testing/dynagen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Dynagen is a front-end for use with the Dynamips Cisco router emulator"
 url="http://www.dynagen.org/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="dynamips python2"
 source="http://downloads.sourceforge.net/dyna-gen/${pkgname}-${pkgver}.tar.gz
 	etc-path.patch"
diff --git a/testing/ecasound/APKBUILD b/testing/ecasound/APKBUILD
index 0e31e18d86e545b735f143185d59b9557bd341a8..55441f72ed446733a7623b0cbda1609a720fdea4 100644
--- a/testing/ecasound/APKBUILD
+++ b/testing/ecasound/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Textmode multitrack audio processing"
 url="https://ecasound.seul.org/ecasound/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="alsa-lib-dev readline-dev ncurses-dev
 	mpg123-dev lame-dev libsndfile-dev libsamplerate-dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/eigen/APKBUILD b/testing/eigen/APKBUILD
index b2b216911c21f0fc065cea50972157d4e5232e71..491aabfd398ab5e1dfb56e8709fb023b97304f89 100644
--- a/testing/eigen/APKBUILD
+++ b/testing/eigen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Eigen is a C++ template library for linear algebra"
 url="http://eigen.tuxfamily.org/index.php?title=Main_Page"
 arch="noarch"
-license="MPL2"
+license="MPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/testing/ejabberd/APKBUILD b/testing/ejabberd/APKBUILD
index b69d8fb0a17cf98fef2605cfd670a3c513a0bc59..e9ec369ae110805f93b67d9b93eceeffd0ba6350 100644
--- a/testing/ejabberd/APKBUILD
+++ b/testing/ejabberd/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="An erlang jabber server"
 url="http://www.ejabberd.im"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 _erl_deps="erlang-asn1 erlang-crypto erlang-eldap erlang-mnesia
 	erlang-public-key erlang-sasl erlang-ssl erlang-syntax-tools
 	"
diff --git a/testing/emby/APKBUILD b/testing/emby/APKBUILD
index 7ca170bcd8d26811634d54ddc1061acb0d2b68af..235cf452d476d3874a3bd12952bd322899538eed 100644
--- a/testing/emby/APKBUILD
+++ b/testing/emby/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Bring together your videos, music, photos, and live television"
 url="http://emby.media"
 arch="x86_64 x86"
-license="GPL2"
+license="GPL-2.0"
 depends="ffmpeg mono imagemagick sqlite"
 pkgusers=$pkgname
 pkggroups=$pkgname
diff --git a/testing/esptool/APKBUILD b/testing/esptool/APKBUILD
index 3d6fac4f8ec4341989e00229aaf67e5a089aabd4..26368cdaf2ea17042913022a7d30904105ab7c21 100644
--- a/testing/esptool/APKBUILD
+++ b/testing/esptool/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="ESP8266 and ESP32 serial bootloader utility"
 url="https://github.com/themadinventor/esptool"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends="python2 py-serial py-setuptools"
 makedepends="python2-dev"
 install=""
diff --git a/testing/etcd/APKBUILD b/testing/etcd/APKBUILD
index 9715dab78202a81351abba789065d756395fce63..354b0ff31dac7200b01be3060464b54299f42e33 100644
--- a/testing/etcd/APKBUILD
+++ b/testing/etcd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A highly-available key value store for shared configuration and service discovery"
 url="https://github.com/coreos/etcd"
 arch="x86_64 ppc64le"
-license="ASL 2.0"
+license="Apache-2.0"
 makedepends="go bash"
 options="!strip"
 install="$pkgname.pre-install"
diff --git a/testing/evolution-ews/APKBUILD b/testing/evolution-ews/APKBUILD
index 0de6d4d1004a4c923f3edc7f23bb701a61334eb9..f547199a74d8bae09c2b4a3b9906bd3b02119ed3 100644
--- a/testing/evolution-ews/APKBUILD
+++ b/testing/evolution-ews/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="MS Exchange integration through Exchange Web Services"
 url="https://wiki.gnome.org/Apps/Evolution/EWS"
 arch="x86 x86_64 ppc64le"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends="evolution"
 makedepends="cmake
 	gtk-doc intltool glib-dev gettext-dev gnome-common
diff --git a/testing/fatback/APKBUILD b/testing/fatback/APKBUILD
index 0350677a492f9f523f1f1222fc49a26d65e5a646..7aaff958e502e49d216b28ae4f0235f3a68696f1 100644
--- a/testing/fatback/APKBUILD
+++ b/testing/fatback/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A tool for recovering files from FAT file systems"
 url="http://fatback.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="flex-dev"
 install=""
diff --git a/testing/fatresize/APKBUILD b/testing/fatresize/APKBUILD
index 07e7dc4083cc3110b1498c400c9d4c2ae3e31abe..e56b0319ab3d5144f3045b8e39e8f1ff0bd19885 100644
--- a/testing/fatresize/APKBUILD
+++ b/testing/fatresize/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The FAT16/FAT32 non-destructive resizer."
 url="https://sourceforge.net/projects/fatresize/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="automake autoconf parted-dev e2fsprogs-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
diff --git a/testing/ffcall/APKBUILD b/testing/ffcall/APKBUILD
index 4cd914dbb83cee4487c1f0b544a08168fcd6de64..5b32f235bbc1cbd0b8509e7bf4d5c36b3b4fcdf9 100644
--- a/testing/ffcall/APKBUILD
+++ b/testing/ffcall/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="C library for implementing foreign function calls in embedded interpreters"
 url="http://www.gnu.org/software/libffcall/"
 arch="all !x86 !armhf"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/testing/fgt/APKBUILD b/testing/fgt/APKBUILD
index d0fe24302e37181cc586cf07368fdc747185a2ab..a25704ca55df81b3e529980d6ed3b5f52ea2d32c 100644
--- a/testing/fgt/APKBUILD
+++ b/testing/fgt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="C++ library for fast Gauss transforms."
 url="https://github.com/gadomski/fgt"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="cmake eigen-dev"
 install=""
 subpackages="$pkgname-dev"
diff --git a/testing/filebeat/APKBUILD b/testing/filebeat/APKBUILD
index cdcb3f0b4dc1a7fa82351d984d1bef2e4993787d..afbda665357e2966bdf76127f3383e07e8a2b229 100644
--- a/testing/filebeat/APKBUILD
+++ b/testing/filebeat/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Lightweight Shipper for Logs"
 pkgusers="root"
 url="https://www.elastic.co/products/beats"
 arch="all !armhf !aarch64"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="go"
 install=""
diff --git a/testing/filezilla/APKBUILD b/testing/filezilla/APKBUILD
index 9f7c1db3726e7e2c4df07738bcbbbeaac265cb0b..50126bcf0c876801e381c858b4e9fdd6136e90f3 100644
--- a/testing/filezilla/APKBUILD
+++ b/testing/filezilla/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="FTP Client"
 url="http://filezilla-project.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libfilezilla-dev wxgtk-dev libidn-dev nettle-dev gnutls-dev
 	pugixml-dev xdg-utils gtk+2.0-dev sqlite-dev"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/testing/flawfinder/APKBUILD b/testing/flawfinder/APKBUILD
index bcdfc5f70d7c2176e9d805951271a3832afcbfbe..69ecf74b279d206a895e2833ba7fcf60092f91c1 100644
--- a/testing/flawfinder/APKBUILD
+++ b/testing/flawfinder/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Examines C/C++ source code for security flaws"
 url="http://www.dwheeler.com/flawfinder/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2"
 makedepends="python2-dev py-setuptools"
 subpackages="$pkgname-doc"
diff --git a/testing/flickcurl/APKBUILD b/testing/flickcurl/APKBUILD
index 15d6b73282be53fda8230ad126a64d15874a77cc..356242e88980bfbe0c5a2dafa24c5750455171a8 100644
--- a/testing/flickcurl/APKBUILD
+++ b/testing/flickcurl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="C library for the Flickr API"
 url="http://librdf.org/flickcurl/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="curl-dev libxml2-dev raptor2-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz"
diff --git a/testing/fontforge/APKBUILD b/testing/fontforge/APKBUILD
index 1194fc1c31dcf85195ee23c971540dc7dbc468c4..0e0c8391e7650f2e04ec7d0a5ed212bfdc77a46a 100644
--- a/testing/fontforge/APKBUILD
+++ b/testing/fontforge/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="FontForge is a free (libre) font editor for Windows, Mac OS X and GNU+Linux."
 url="https://github.com/fontforge/fontforge"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 source="https://github.com/fontforge/$pkgname/releases/download/$pkgver/$pkgname-dist-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-2.0.$pkgver"
 makedepends="autoconf automake libtool jpeg-dev tiff-dev libpng-dev giflib-dev libxt-dev freetype-dev libltdl libxml2-dev libuninameslist-dev libspiro-dev python-dev pango-dev cairo-dev coreutils"
diff --git a/testing/fuse3/APKBUILD b/testing/fuse3/APKBUILD
index 0ffa325e748f9d0fe73bf85b455b0ca9c2590477..ef842de8bac20482597d1cafba80e724272f4f44 100644
--- a/testing/fuse3/APKBUILD
+++ b/testing/fuse3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
 url="https://github.com/libfuse/libfuse/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="!fuse"
 makedepends="gettext-dev linux-headers meson eudev-dev"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/fwknop/APKBUILD b/testing/fwknop/APKBUILD
index 8ecd8226f99e32204af585ead259848bd87b01fd..6aada2e300ea1b435327a5687a765874fc36a484 100644
--- a/testing/fwknop/APKBUILD
+++ b/testing/fwknop/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="A Single Packet Authorization (SPA) implementation"
 url="http://www.cipherdyne.org/fwknop/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="iptables"
 depends_dev=""
 makedepends="$depends_dev libpcap-dev iptables gpgme-dev"
diff --git a/testing/gatling/APKBUILD b/testing/gatling/APKBUILD
index 3e205a0821660ef7ba0179b724995006e3a9e09b..b91a3620a3ab78fd31b5e96f9fbd2a768404ad45 100644
--- a/testing/gatling/APKBUILD
+++ b/testing/gatling/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="High performance web server"
 url="https://www.fefe.de/gatling/"
 arch="x86_64 x86 ppc64le"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="libressl-dev libowfat-dev zlib-dev"
diff --git a/testing/gdnsd/APKBUILD b/testing/gdnsd/APKBUILD
index 5eef74583523afdc97655250a9e071fb7921cbc8..5e1b3509e8d434e5cb4775de6ad9809221d2732f 100644
--- a/testing/gdnsd/APKBUILD
+++ b/testing/gdnsd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Geographic Authoritative DNS server"
 url="https://github.com/gdnsd/gdnsd/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="userspace-rcu-dev libev-dev libcap-dev ragel autoconf automake libtool"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/geos/APKBUILD b/testing/geos/APKBUILD
index d0db782891b76ffbaea9bf9db64d01e0b9c06eeb..4714384aabe1c67d85f6f21374f9f5134f203c55 100644
--- a/testing/geos/APKBUILD
+++ b/testing/geos/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="GEOS is a library providing OpenGIS and JTS spatial operations in C++."
 url="http://trac.osgeo.org/geos/"
 arch="x86 x86_64"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=""
 depends_dev=""
 makedepends="swig python2-dev $depends_dev"
diff --git a/testing/getmail/APKBUILD b/testing/getmail/APKBUILD
index 69dcbd42eb7b1a7f1093e1651834fc6e81ed071d..c8e95eaaa3f0d1a5077e0bcfa1061c474fbd587b 100644
--- a/testing/getmail/APKBUILD
+++ b/testing/getmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="POP3, IMAP4, and SDPS mail retriever with Maildir delivery"
 url="http://pyropus.ca/software/getmail/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev"
diff --git a/testing/ginger/APKBUILD b/testing/ginger/APKBUILD
index 3ef3a78748ce88d1fc543f6d6905a8e33b42a6fe..8e0a248dcaddc1efc0a9f9a6c032cd7fc3d5b1a1 100644
--- a/testing/ginger/APKBUILD
+++ b/testing/ginger/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="WoK plugin for host management"
 url="http://kimchi-project.github.io/ginger"
 arch=""
-license="APACHE LGPL2.1"
+license="Apache LGPL-2.1"
 depends="py2-configobj py2-pyparted wok"
 makedepends="automake autoconf libtool
 	python2-dev gettext-dev pyflakes libxslt"
diff --git a/testing/gingerbase/APKBUILD b/testing/gingerbase/APKBUILD
index c2f4bcd29368ed3faade4d6c3c80a0e9653e1b38..35cf0d4d23e89b7d5848919ab785061f8938ddfb 100644
--- a/testing/gingerbase/APKBUILD
+++ b/testing/gingerbase/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Gingerbase: basic host management for WoK"
 url="http://kimchi-project.github.io/gingerbase/"
 arch="noarch"
-license="AGPL2.1"
+license="AGPL-2.1"
 depends="py2-configobj py2-pyparted wok"
 makedepends="automake autoconf libtool
 	python2-dev gettext-dev pyflakes libxslt"
diff --git a/testing/git-cola/APKBUILD b/testing/git-cola/APKBUILD
index ee2b16f8049ac1b30f529c1d679606145dbf6c67..352820bc7a2e5728b50b4a0613e14eba346e57cb 100644
--- a/testing/git-cola/APKBUILD
+++ b/testing/git-cola/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A GUI application for git built on Python & Qt5"
 url="https://git-cola.github.io"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python3 py3-qtpy"
 checkdepends="py3-nose"
 makedepends="python3-dev py3-qtpy"
diff --git a/testing/git-review/APKBUILD b/testing/git-review/APKBUILD
index a1bdc404aaf3e06e3d4186bb4d6666d90b4a1557..fbd01d2a6619bcac5b1adcd373bbc044db1904e3 100644
--- a/testing/git-review/APKBUILD
+++ b/testing/git-review/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A git command for submitting branches to Gerrit"
 url="https://github.com/openstack-infra/git-review"
 arch="noarch"
-license="APACHE2.0"
+license="Apache-2.0"
 depends="git python3 py3-requests py3-idna py3-urllib3 py3-chardet py3-certifi"
 makedepends="python3-dev"
 subpackages="$pkgname-doc"
diff --git a/testing/go-bindata/APKBUILD b/testing/go-bindata/APKBUILD
index 7c7cbcb9b9b2eadd31242a80b383c915834ef74b..f00b35b81d7de28eec682992f16081b632260991 100644
--- a/testing/go-bindata/APKBUILD
+++ b/testing/go-bindata/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A small utility which generates Go code from any file"
 url="https://github.com/jteeuwen/go-bindata"
 arch="all"
-license="CC0 1.0"
+license="CC0-1.0"
 depends=""
 makedepends="go"
 install=""
diff --git a/testing/goobook/APKBUILD b/testing/goobook/APKBUILD
index dde3f0e46af57389ee11a870754cd40d30469b5a..1ccf66eb9a6a41fccf71e9188e4527aef6f888be 100644
--- a/testing/goobook/APKBUILD
+++ b/testing/goobook/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Access Google contacts from the command line"
 url="https://gitlab.com/goobook/goobook"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="py-httplib2 py-asn1 py-rsa py-asn1-modules py-six"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname}:_py2 py3-${pkgname}:_py3"
diff --git a/testing/googler/APKBUILD b/testing/googler/APKBUILD
index 47bd2e523dad6ae3d9b718d2a0e26ceeafaee40f..2cc20a9c8154285172796acad5777f4818e7d49d 100644
--- a/testing/googler/APKBUILD
+++ b/testing/googler/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Google Search, Google Site Search, Google News from the terminal."
 url="https://github.com/jarun/googler"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="python3"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/jarun/${pkgname}/archive/v${pkgver}.tar.gz"
diff --git a/testing/gosu/APKBUILD b/testing/gosu/APKBUILD
index d0c7fb6beccf0865638faf634e6f653308132469..3bd928cb318b63f3872bf876acc9ffe87ef7ef1b 100644
--- a/testing/gosu/APKBUILD
+++ b/testing/gosu/APKBUILD
@@ -15,7 +15,7 @@ pkgrel=0
 pkgdesc="Simple Go-based setuid+setgid+setgroups+exec"
 url="https://github.com/tianon/gosu"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev coreutils go"
diff --git a/testing/gpa/APKBUILD b/testing/gpa/APKBUILD
index d5516d98bf91db8022ef90610072364cdce7b22c..366d0d42b4b67fc381e9807315bc77a63a5e4e4a 100644
--- a/testing/gpa/APKBUILD
+++ b/testing/gpa/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A graphical user interface for the GnuPG"
 url="https://www.gnupg.org/related_software/gpa/"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 depends=""
 makedepends="gpgme-dev gtk+2.0-dev"
 install=""
diff --git a/testing/gpg-remailer/APKBUILD b/testing/gpg-remailer/APKBUILD
index d7dc08f1cf46fbcde70047ad1216e8c5e2f9ed5c..889d2fc71ea0722150f234ad7b4c81ada235cfee 100644
--- a/testing/gpg-remailer/APKBUILD
+++ b/testing/gpg-remailer/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Decrypt GPG messages and re-encrypt them to a well-defined group"
 url="https://fbb-git.github.io/gpg-remailer/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="gnupg mailutils"
 makedepends="icmake bash yodl bobcat-dev"
 subpackages="$pkgname-doc"
diff --git a/testing/gutenprint/APKBUILD b/testing/gutenprint/APKBUILD
index 26ace89031061cbd6db1e3cd521cf4c9c19d61dc..3be01c0dce674f790d00faa7eaf21fd02cc706ce 100644
--- a/testing/gutenprint/APKBUILD
+++ b/testing/gutenprint/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Printer Drivers Package"
 url="http://gimp-print.sourceforge.net/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev cups-dev tiff-dev libjpeg-turbo-dev libpng-dev
diff --git a/testing/hamlib/APKBUILD b/testing/hamlib/APKBUILD
index 17ef3c4aba561a7b5fde33bc6667425d783052fb..81e88738e136a1304f137792fd6e640bded2860b 100644
--- a/testing/hamlib/APKBUILD
+++ b/testing/hamlib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library to control radio transceivers and receivers"
 url="http://www.hamlib.org/"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev linux-headers perl-dev python-dev swig tcl-dev chrpath"
diff --git a/testing/handbrake/APKBUILD b/testing/handbrake/APKBUILD
index f47b419dda26206f6c6bf083550222c342fa2778..52ca7494cf3915243d5d68c731a1f3e5bb7a684f 100644
--- a/testing/handbrake/APKBUILD
+++ b/testing/handbrake/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="Handbrake video transcoder"
 url="https://handbrake.fr"
 arch="x86_64 x86 armhf ppc64le"
-license="GPL2"
+license="GPL-2.0"
 makedepends="yasm autoconf libtool zlib-dev libbz2 libogg-dev libtheora-dev
 	libvorbis-dev libsamplerate-dev fribidi-dev freetype-dev
 	tinyxml-dev fontconfig-dev libass-dev intltool glib-dev dbus-glib-dev
diff --git a/testing/handlebars/APKBUILD b/testing/handlebars/APKBUILD
index d376fe243b275a6ff41cab6d2c496e3b278d6116..de6a3817d07bbbeb307dd9225e8172d700e759b7 100644
--- a/testing/handlebars/APKBUILD
+++ b/testing/handlebars/APKBUILD
@@ -8,7 +8,7 @@ _mustachespec_ver="1.1.3"
 _handlebarsspec_ver="4.0.5-p1"
 pkgdesc="C implementation of handlebars.js"
 url="https://github.com/jbboehr/handlebars.c"
-license="LGPLv2.1+"
+license="LGPL-2.1-or-later"
 arch="all"
 makedepends="autoconf automake bison check-dev flex json-c-dev libtool lmdb-dev
 	pcre-dev talloc-dev yaml-dev"
diff --git a/testing/hexer/APKBUILD b/testing/hexer/APKBUILD
index ba71db9d31bcb8c57e198b6a38229eb63c9534ef..bbb0aafc02f4fe722c25555b3f5a3fbdab254ba0 100644
--- a/testing/hexer/APKBUILD
+++ b/testing/hexer/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="LAS and OGR hexagonal density and boundary surface generation"
 url="https://github.com/hobu/hexer"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check"
 depends="gdal"
 makedepends="cmake gdal-dev"
diff --git a/testing/hfst/APKBUILD b/testing/hfst/APKBUILD
index beab64f9ce29cf76b5fc54b3e46705c2c73edda3..1115702ff9b74ac1880ca1dd9384193b55b56cd1 100644
--- a/testing/hfst/APKBUILD
+++ b/testing/hfst/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Helsinki Finite-State Transducer Technology toolkit"
 url="http://www.ling.helsinki.fi/kieliteknologia/tutkimus/$pkgname/"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev python2 bison python2-dev swig"
diff --git a/testing/hping3/APKBUILD b/testing/hping3/APKBUILD
index 6f688cd2dd259a242e181a0425cc94c6b149100c..eb1a4bc4d57d0e2885798765b7774926bd54ad82 100644
--- a/testing/hping3/APKBUILD
+++ b/testing/hping3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
 pkgdesc="A ping-like TCP/IP packet assembler/analyzer"
 url="http://www.hping.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 makedepends="libpcap-dev tcl-dev"
 subpackages="$pkgname-doc"
diff --git a/testing/httrack/APKBUILD b/testing/httrack/APKBUILD
index 3456d3a3f177f61ff811895a418dc4aa85585cca..acb7338287b20a268a483b45b159bcebbc981839 100644
--- a/testing/httrack/APKBUILD
+++ b/testing/httrack/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Website Copier - Free Software Offline Browser"
 url="http://www.httrack.com/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="zlib-dev openssl-dev libtool"
 source="http://mirror.httrack.com/historical/${pkgname}-${pkgver}.tar.gz"
 subpackages="$pkgname-doc"
diff --git a/testing/i2c-tools/APKBUILD b/testing/i2c-tools/APKBUILD
index 56d0d1ab4ba3d17a60fe08ed4c4b00f0a6359a86..ea2d61d46dc8cd053d5339a8cef3b892fe831e97 100644
--- a/testing/i2c-tools/APKBUILD
+++ b/testing/i2c-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Tools for monitoring I2C devices"
 url="http://www.lm-sensors.org/wiki/I2CTools"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=
 depends_dev=""
 makedepends="$depends_dev linux-headers py-setuptools python2-dev"
diff --git a/testing/icingaweb2-module-businessprocess/APKBUILD b/testing/icingaweb2-module-businessprocess/APKBUILD
index c528ac66966aaf30c781d0111da42d4698cdc19a..fe1bf8eab649f15293c543e61b003f3b8476f46e 100644
--- a/testing/icingaweb2-module-businessprocess/APKBUILD
+++ b/testing/icingaweb2-module-businessprocess/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Manage Business Processes in Icinga Web 2"
 url="http://www.icinga.org"
 arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
 _php=php7
 depends="icingaweb2-module-director"
 pkggroups="icingaweb2"
diff --git a/testing/icingaweb2-module-fileshipper/APKBUILD b/testing/icingaweb2-module-fileshipper/APKBUILD
index 93cbce174feefb6c9b5db0382e10cbdff645a828..6288c20da80be3bdc703a354623ec2629f0a5618 100644
--- a/testing/icingaweb2-module-fileshipper/APKBUILD
+++ b/testing/icingaweb2-module-fileshipper/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Provide CSV, JSON, XML and YAML files as an Import Source for the Icinga Director"
 url="http://www.icinga.org"
 arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
 _php=php7
 depends="icingaweb2-module-director ${_php}-xml"
 pkggroups="icingaweb2"
diff --git a/testing/icingaweb2-module-generictts/APKBUILD b/testing/icingaweb2-module-generictts/APKBUILD
index c0581c092ef385217b8efc3193cf7cae9506cb98..9a59b2ea3838c79cfa8c3071e4dd0bd6a6a49db0 100644
--- a/testing/icingaweb2-module-generictts/APKBUILD
+++ b/testing/icingaweb2-module-generictts/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Generic ticket system integration into Icinga web 2"
 url="http://www.icinga.org"
 arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
 _php=php7
 depends="icingaweb2-module-director"
 pkggroups="icingaweb2"
diff --git a/testing/icingaweb2-module-pnp/APKBUILD b/testing/icingaweb2-module-pnp/APKBUILD
index 5f98581d0632d79a3b8ef238ba88b6744a2feed8..cabf4ceaf49edb8bb7a9dd2338b916adba189955 100644
--- a/testing/icingaweb2-module-pnp/APKBUILD
+++ b/testing/icingaweb2-module-pnp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Integrate PNP graphs into Icinga Web 2"
 url="http://www.icinga.org"
 arch="noarch !armhf"
-license="GPL2"
+license="GPL-2.0"
 _php=php7
 depends="icingaweb2-module-director"
 pkggroups="icingaweb2"
diff --git a/testing/icmake/APKBUILD b/testing/icmake/APKBUILD
index 566778fa359b353fb24a1d57adc282d408ff104f..1a3173364e7207f9f92177c673bbf1cadcec6924 100644
--- a/testing/icmake/APKBUILD
+++ b/testing/icmake/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Make utility using a C-like grammar"
 url="https://fbb-git.github.io/icmake/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="bash"
 subpackages="$pkgname-doc"
 source="icmake-$pkgver.tar.gz::https://github.com/fbb-git/icmake/archive/$pkgver.tar.gz"
diff --git a/testing/idris/APKBUILD b/testing/idris/APKBUILD
index 2cfcdd4f5172926a145936f78b4ca65a87ffd08f..9863c29580afa3c4a740de38192495a409b443b3 100644
--- a/testing/idris/APKBUILD
+++ b/testing/idris/APKBUILD
@@ -9,7 +9,7 @@ url="http://www.idris-lang.org"
 # Note: same as ghc, if it gets ported elsewhere this should run too.
 # armhf: disabled due to build failure
 arch="x86_64"
-license="BSD3"
+license="BSD-3-Clause"
 depends="gmp-dev gcc"
 makedepends="ghc cabal libffi-dev ncurses-dev zlib-dev"
 subpackages="$pkgname-doc"
diff --git a/testing/infiniband-diags/APKBUILD b/testing/infiniband-diags/APKBUILD
index 1634f9c2a3b16f904a8d5d8cb0ea37dfcf987b06..81532c2e05d3a6ffe061d88e0e115e2ee8d4e1d5 100644
--- a/testing/infiniband-diags/APKBUILD
+++ b/testing/infiniband-diags/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Various infiniband diagnostic tools"
 url="https://www.openfabrics.org/index.php/openfabrics-software.html"
 arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
 depends=""
 depends_dev="opensm-dev libibmad-dev glib-dev eudev-dev"
 makedepends="$depends_dev"
diff --git a/testing/iprange/APKBUILD b/testing/iprange/APKBUILD
index 95df9459676eb98c83f4e81387563d9eb8011113..895d60a6c196f4fc0b2b008155db23021817d29a 100644
--- a/testing/iprange/APKBUILD
+++ b/testing/iprange/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="manages IP ranges (part of FireHOL)"
 url="https://github.com/firehol/iprange"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 install=""
 subpackages="$pkgname-doc"
diff --git a/testing/irclog2html/APKBUILD b/testing/irclog2html/APKBUILD
index 408b70950727ae23df0ee847baaf1024a82a993b..e82313a83bc059f72787f22de84cd60e0f7deae6 100644
--- a/testing/irclog2html/APKBUILD
+++ b/testing/irclog2html/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Script to convert IRC logs to HTML and other formats"
 url="http://mg.pov.lt/irclog2html/"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python3"
 makedepends="python3-dev"
 source="https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/jabber-roster/APKBUILD b/testing/jabber-roster/APKBUILD
index c4db10c2fc583205b517fb17214be02fb3dfd4ee..a459a44f17fc8dfa9eea51264dec392dd2a8b1a3 100644
--- a/testing/jabber-roster/APKBUILD
+++ b/testing/jabber-roster/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A Python tool for listing your Jabber roster contacts"
 url="https://github.com/kparal/jabber-roster"
 arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
 depends_dev="py-xmpp"
 makedepends="python2-dev py-setuptools"
 source="https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/jo/APKBUILD b/testing/jo/APKBUILD
index 01b0de4b514a644e035a25fbe83df386c3f8bc42..5f12a203718e74cb0df9f9b642f27326d7e05696 100644
--- a/testing/jo/APKBUILD
+++ b/testing/jo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="JSON output from a shell"
 url="https://github.com/jpmens/jo/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-doc"
 source="https://github.com/jpmens/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
 
diff --git a/testing/kexec-tools/APKBUILD b/testing/kexec-tools/APKBUILD
index fab9be8f8197a9dd958351c4322500e3f97303f2..34735101b841f4bd3a59fb59b44473af3de6045b 100644
--- a/testing/kexec-tools/APKBUILD
+++ b/testing/kexec-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Directly boot into a new kernel over a currently running one"
 url="https://kernel.org/pub/linux/utils/kernel/kexec/"
 arch="x86_64"
-license="GPL2"
+license="GPL-2.0"
 depends="xz zlib"
 makedepends="zlib-dev xz-dev linux-headers"
 subpackages="$pkgname-doc"
diff --git a/testing/keychain/APKBUILD b/testing/keychain/APKBUILD
index ac081672d81a546437b124f16a1e64dbc793bce1..7aa5328c2a6e7518fa124ccebe77dc7824c63939 100644
--- a/testing/keychain/APKBUILD
+++ b/testing/keychain/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="keychain ssh-agent front-end"
 url="http://www.funtoo.org/Keychain"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/testing/kimchi/APKBUILD b/testing/kimchi/APKBUILD
index 6330a1422faa79c8c8d6d3d887fbc4f2dea0332a..b08831c1fb081dc4ddd78d191ce270e33e8e74d6 100644
--- a/testing/kimchi/APKBUILD
+++ b/testing/kimchi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An HTML5 management interface for KVM"
 url="https://github.com/kimchi-project/kimchi"
 arch="noarch"
-license="APACHE LGPL2.1"
+license="Apache LGPL-2.1"
 depends="
 	python2
 	py-ipaddr
diff --git a/testing/knot-resolver/APKBUILD b/testing/knot-resolver/APKBUILD
index 01c9f704a410745b3477bf6ffc0a5f51592fb68f..6e5e92ef334333ce0dba7547c8b7284f44c2d126 100644
--- a/testing/knot-resolver/APKBUILD
+++ b/testing/knot-resolver/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Minimalistic caching DNS resolver implementation"
 url="https://www.knot-resolver.cz/"
 # luajit is not available for disabled arches
 arch="all !s390x"
-license="GPLv3"
+license="GPL-3.0"
 depends="lua5.1-sec lua5.1-socket"
 depends_dev="knot-dev libuv-dev luajit-dev"
 makedepends="$depends_dev"
diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD
index ff129c4dd746c04c8a017c5d8321106611b97ad6..b90ef45192ff5a8feb52f3e4fff3a5e67e03f807 100644
--- a/testing/kubernetes/APKBUILD
+++ b/testing/kubernetes/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Container Cluster Manager for Docker"
 url="http://kubernetes.io/"
 arch="x86_64"
-license="APACHE"
+license="Apache"
 options="!check !nostrip"
 depends="bash"
 makedepends="bash coreutils findutils go linux-headers rsync"
diff --git a/testing/ladspa/APKBUILD b/testing/ladspa/APKBUILD
index 6d2ba1c76c378b117a46c5fbb630b90c9568e6c1..583cde5a6adf341312c7b311641d27c30d7783d8 100644
--- a/testing/ladspa/APKBUILD
+++ b/testing/ladspa/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Linux Audio Developer's Simple Plug-in API, examples and tools"
 url="http://www.ladspa.org/"
 arch="all"
-license="LGPL2"
+license="LGPL-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/testing/laszip/APKBUILD b/testing/laszip/APKBUILD
index 11efa0e306204c881e1acdf4ea656794dd621195..bab0790c309ff199fc640d810ceccaf6c4727084 100644
--- a/testing/laszip/APKBUILD
+++ b/testing/laszip/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="LASzip point cloud compression library"
 url="https://github.com/laszip/laszip"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check"
 makedepends="cmake"
 install=""
diff --git a/testing/lazperf/APKBUILD b/testing/lazperf/APKBUILD
index de53e5364b8dec16b516ee56a4732927bf161709..a272ce56978a2743d232596dd2c690cb19621cd3 100644
--- a/testing/lazperf/APKBUILD
+++ b/testing/lazperf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Alternative LAZ implementation for C++ and JavaScript"
 url="https://github.com/hobu/laz-perf"
 arch="all !armhf"  # armhf: io_test segfaults
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="cmake"
 install=""
 subpackages="$pkgname-dev"
diff --git a/testing/lbzip2/APKBUILD b/testing/lbzip2/APKBUILD
index 9728d377699193c1e39b800e31d1dbc2b344216c..1a9d3c613275606d493520fbbcb3209ae278b31a 100644
--- a/testing/lbzip2/APKBUILD
+++ b/testing/lbzip2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A parallel bzip2 compression utility"
 url="http://lbzip2.org"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="http://archive.lbzip2.org/$pkgname-$pkgver.tar.gz"
 
diff --git a/testing/libbson/APKBUILD b/testing/libbson/APKBUILD
index d63fc96df54a7e1a385b788327943be9f2fed704..d9a6273570b13a9f12ef26f38216d0782cced683 100644
--- a/testing/libbson/APKBUILD
+++ b/testing/libbson/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="routines related to building, parsing, and iterating BSON documents"
 url="https://github.com/mongodb/libbson"
 arch="all"
-license="Apache2"
+license="Apache-2.0"
 depends=
 depends_dev=
 makedepends="$depends_dev autoconf automake libtool"
diff --git a/testing/libcli/APKBUILD b/testing/libcli/APKBUILD
index f3fdf55a0b9600a1d42ee888d776aa425d03773f..1af049e8aa759e69bf59085d3928f6b7de735ae6 100644
--- a/testing/libcli/APKBUILD
+++ b/testing/libcli/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="A library for including a Cisco-like command-line interface"
 url="https://github.com/dparrish/libcli"
 arch="all"
 options="!check"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 source="$pkgname-$pkgver.tar.gz::https://github.com/dparrish/libcli/archive/v$pkgver.tar.gz
 	gcc-5.2-fix.patch"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/libcypher-parser/APKBUILD b/testing/libcypher-parser/APKBUILD
index 4be75d2db98e394eb6c10c9ec9c565ee0d498393..dfed1492e4272fbabffb368e32e7115d7ae5b092 100644
--- a/testing/libcypher-parser/APKBUILD
+++ b/testing/libcypher-parser/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Parsing library for the Cypher query language"
 url="https://github.com/cleishm/libcypher-parser"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev automake autoconf libtool check-dev doxygen pkgconfig"
diff --git a/testing/libdwarf/APKBUILD b/testing/libdwarf/APKBUILD
index 04c778b363ecb6f6e1fe185c8a20e5aed50663ee..b8409c204f46c0304e8409da5d6780788334e0e1 100644
--- a/testing/libdwarf/APKBUILD
+++ b/testing/libdwarf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Parsing library for DWARF2 and later debugging file format"
 url="http://www.prevanders.net/dwarf.html"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="elfutils-dev"
 subpackages="$pkgname-dev dwarf-tools dwarf-tools-doc"
 source="http://www.prevanders.net/$pkgname-$pkgver.tar.gz"
diff --git a/testing/libfilezilla/APKBUILD b/testing/libfilezilla/APKBUILD
index a63550856d2a1560669205b4026262c558618d2d..9d52c257aae9c39b2a4323e9de21606952dc2251 100644
--- a/testing/libfilezilla/APKBUILD
+++ b/testing/libfilezilla/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="C++ library, offering some basic functionality to build high-performing, platform-independent programs"
 url="http://filezilla-project.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="cppunit-dev"
 subpackages="$pkgname-dev"
 source="http://download.filezilla-project.org/libfilezilla/libfilezilla-$pkgver.tar.bz2"
diff --git a/testing/libgeotiff/APKBUILD b/testing/libgeotiff/APKBUILD
index b63a80f925a70b5fe50ad9aeb8cfa484944100d5..f4e6e9bc9816f2fdf8bd72fc97b185710e6f35d9 100644
--- a/testing/libgeotiff/APKBUILD
+++ b/testing/libgeotiff/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="TIFF based interchange format for georeferenced raster imagery."
 url="https://trac.osgeo.org/geotiff"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 options="!check"
 makedepends="autoconf automake libtool tiff-dev proj4-dev"
 install=""
diff --git a/testing/libgnomecanvas/APKBUILD b/testing/libgnomecanvas/APKBUILD
index ff8fbfe53d0b2f4574910016dbb84d2f443be44f..56db20ca0d37bb09c7338bf6f6cd008db5d98ee3 100644
--- a/testing/libgnomecanvas/APKBUILD
+++ b/testing/libgnomecanvas/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="GNOME Canvas library"
 url="http://www.gnome.org/"
 arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
 makedepends="intltool libart-lgpl-dev glib-dev pango-dev gtk+2.0-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
diff --git a/testing/libibmad/APKBUILD b/testing/libibmad/APKBUILD
index 5ede3c6095b2e9b0c4b6ef1b771aa30b7382f079..4e6f43b8625d1baa7c3f87a6213503cee556075c 100644
--- a/testing/libibmad/APKBUILD
+++ b/testing/libibmad/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Generic InfiniBand MAD handling library"
 url="https://www.openfabrics.org/index.php/openfabrics-software.html"
 arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
 depends_dev="libibumad-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev"
diff --git a/testing/libibumad/APKBUILD b/testing/libibumad/APKBUILD
index 830e9eae8f74a300b7dc9cff5ea2040ec7a0a5f3..afc9f18b11e898d51f5769f6fe8d49e4498d6c9c 100644
--- a/testing/libibumad/APKBUILD
+++ b/testing/libibumad/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Interface to ib_umad module (user_mad) library. (InfiniBand)"
 url="https://www.openfabrics.org/index.php/openfabrics-software.html"
 arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
 depends=""
 depends_dev=""
 makedepends=""
diff --git a/testing/libieee1284/APKBUILD b/testing/libieee1284/APKBUILD
index f2e1fef085b6f9d39862e5aecad14e43e8fe217b..f9dde3f8a0b1fcd700da7accaadf3039091d604c 100644
--- a/testing/libieee1284/APKBUILD
+++ b/testing/libieee1284/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A cross-platform library for parallel port access"
 url="http://cyberelk.net/tim/libieee1284"
 arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
 depends_dev="py-$pkgname"
 makedepends="file python2-dev"
 subpackages="$pkgname-dev $pkgname-doc py-$pkgname:_py"
diff --git a/testing/libimobiledevice/APKBUILD b/testing/libimobiledevice/APKBUILD
index 28016d9196fd3c0b4e24cecfcacf1475704879f4..7aeb12633a6288837fc2a3d31676b92ebf5b4620 100644
--- a/testing/libimobiledevice/APKBUILD
+++ b/testing/libimobiledevice/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
 arch="all"
-license="GPL2 LGPL2.1"
+license="GPL-2.0 LGPL-2.1"
 makedepends="gnutls-dev libressl-dev libgcrypt-dev libusbmuxd-dev 
 	libtasn1-dev libplist-dev libtool automake autoconf"
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/libmdf/APKBUILD b/testing/libmdf/APKBUILD
index 35ecc8abd6d65e87cdfb7eaaac5abcef53f6c1cb..995d6759dec90be52c310b7e82f4a46c5535ee94 100644
--- a/testing/libmdf/APKBUILD
+++ b/testing/libmdf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Millistream Data Feed API library"
 url="https://millistream.com"
 arch="all"
-license="LGPL3"
+license="LGPL-3.0"
 depends=""
 makedepends="libressl-dev zlib-dev"
 install=""
diff --git a/testing/libmodbus/APKBUILD b/testing/libmodbus/APKBUILD
index 3b51df7f65bf6706da17face4d0a1c7e3dfed61a..3951feeaa17e81515f6ef42e4cdd8ed1d460d0d1 100644
--- a/testing/libmodbus/APKBUILD
+++ b/testing/libmodbus/APKBUILD
@@ -8,7 +8,7 @@ url="http://libmodbus.org/"
 source="http://libmodbus.org/releases/$pkgname-$pkgver.tar.gz"
 
 arch="all"
-license="LGPL-3"
+license="LGPL-3.0"
 depends=""
 makedepends="linux-headers"
 install=""
diff --git a/testing/libneo4j-client/APKBUILD b/testing/libneo4j-client/APKBUILD
index 346191bbfa63b355b30b4803a14b6103014978bc..c87262e11ba6bd4f44a2a6058b189edd4c05db7a 100644
--- a/testing/libneo4j-client/APKBUILD
+++ b/testing/libneo4j-client/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Client library for the Neo4j graph database"
 url="https://github.com/cleishm/libneo4j-client"
 arch="x86_64 aarch64 ppc64le"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="openssl"
 depends_dev="libressl-dev"
 makedepends="$depends_dev automake autoconf libtool check-dev doxygen pkgconfig fts fts-dev libedit-dev libcypher-parser-dev"
diff --git a/testing/libpipeline/APKBUILD b/testing/libpipeline/APKBUILD
index e26cc306a8a63dcf5e739f15d684dc0d18e5487b..5872c22c0ae7a3a071692a571c93ced2ad09d146 100644
--- a/testing/libpipeline/APKBUILD
+++ b/testing/libpipeline/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="C pipeline manipulation library"
 url="http://libpipeline.nongnu.org/"
 arch="all"
-license="GPL-3+"
+license="GPL-3.0-or-later"
 checkdepends="check-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://download.savannah.nongnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz"
diff --git a/testing/libplist/APKBUILD b/testing/libplist/APKBUILD
index f7ff87e6bd7c26bcd71004f52f765502e7dfe19c..dfac474f47e1bfba59d09ae57ca3d3aea82fb49f 100644
--- a/testing/libplist/APKBUILD
+++ b/testing/libplist/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A library to handle Apple Property List format in binary or XML "
 url="http://www.libimobiledevice.org/"
 arch="all"
-license="GPL2 LGPL2.1"
+license="GPL-2.0 LGPL-2.1"
 makedepends="automake autoconf libtool cython-dev"
 subpackages="$pkgname-dev py2-$pkgname:_py"
 options="!check"
diff --git a/testing/librtlsdr/APKBUILD b/testing/librtlsdr/APKBUILD
index 0939112d1022f02fa8a2c019eb0a4e47202d1da9..d621a3fd7cdd2f17f532bc43bf04146c51a87b10 100644
--- a/testing/librtlsdr/APKBUILD
+++ b/testing/librtlsdr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Software defined radio receiver for Realtek RTL2832U"
 url="https://osmocom.org/projects/sdr/wiki/rtl-sdr"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="libusb-dev"
 makedepends="$depends_dev cmake"
diff --git a/testing/libselinux/APKBUILD b/testing/libselinux/APKBUILD
index b58af9ac4eae3bf91b230243fe06e53c7f5e6508..6e70975b295ebf987174b81811364b0a63adb26a 100644
--- a/testing/libselinux/APKBUILD
+++ b/testing/libselinux/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="SELinux library and simple utilities"
 url="https://github.com/SELinuxProject/selinux/wiki"
 arch="all"
-license="Public Domain"
+license="Public-Domain"
 depends=""
 depends_dev=""
 # we need coreutils for ln --relative
diff --git a/testing/libsemanage/APKBUILD b/testing/libsemanage/APKBUILD
index fbfdac7242c2e5aa945a8004127ba64284840a40..c2f7ea163bf8a5b6117978897dbd69ecdbcba6f4 100644
--- a/testing/libsemanage/APKBUILD
+++ b/testing/libsemanage/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="SELinux binary policy manipulation library"
 url="https://github.com/SELinuxProject/selinux/wiki"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libselinux-dev libsepol-dev bzip2-dev ustr-dev bison flex audit-dev"
diff --git a/testing/libsepol/APKBUILD b/testing/libsepol/APKBUILD
index a04850ced04329fdfb5d16f7e530187078213a2f..d8310350ac8e5658653995cf74de404b650afd62 100644
--- a/testing/libsepol/APKBUILD
+++ b/testing/libsepol/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="SELinux binary policy manipulation library"
 url="https://github.com/SELinuxProject/selinux/wiki"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev="bsd-compat-headers"
 makedepends="$depends_dev flex-dev coreutils"
diff --git a/testing/libsigsegv/APKBUILD b/testing/libsigsegv/APKBUILD
index e3a2a88e2d3876ffe9b68bb0254d46d6992fdd38..8108b4f8986706d5e99af5c77f545d6bd0df223e 100644
--- a/testing/libsigsegv/APKBUILD
+++ b/testing/libsigsegv/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Page fault detection library"
 url="http://www.gnu.org/software/libsigsegv/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-dev"
 source="http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-$pkgver.tar.gz
 	0001-Avoid-use-of-glibc-internal-macros.patch
diff --git a/testing/libsmi/APKBUILD b/testing/libsmi/APKBUILD
index 0ce3cf9fbbf92804738023b2f8ab5f78d8f510ed..b9534c836da6b0430fb659ea0225547f821b697a 100644
--- a/testing/libsmi/APKBUILD
+++ b/testing/libsmi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library to access SMI management information"
 url="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
 arch="all"
-license="GPLv2+ BSD"
+license="GPL-2.0-or-later BSD"
 depends=""
 makedepends="$depends_dev"
 install=""
diff --git a/testing/libspatialite/APKBUILD b/testing/libspatialite/APKBUILD
index 514fcbcc2680106618649c0a79623b78133b8237..1f6a0c9e03fea1ec3736d4a49ed6d539f35b799f 100644
--- a/testing/libspatialite/APKBUILD
+++ b/testing/libspatialite/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="SpatiaLite extends the SQLite core to support fully fledged Spatial SQL capabilities."
 url="https://www.gaia-gis.it/fossil/libspatialite/index"
 arch="x86 x86_64"
-license="MPLv1.1"
+license="MPL-1.1"
 options="!check"
 makedepends="geos-dev sqlite-dev proj4-dev zlib-dev libxml2-dev"
 install=""
diff --git a/testing/libspiro/APKBUILD b/testing/libspiro/APKBUILD
index 7c74f960b81e7859184e3c5055ef7fe1360256c3..f392274e2a274554ec4c4e1d30617b364db223ef 100644
--- a/testing/libspiro/APKBUILD
+++ b/testing/libspiro/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Spiro is the creation of Raph Levien. It simplifies the drawing of beautiful curves."
 url="https://github.com/fontforge/libspiro"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 source="https://github.com/fontforge/$pkgname/releases/download/$pkgver/$pkgname-dist-$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgver"
 makedepends="autoconf automake libtool"
diff --git a/testing/libtbb/APKBUILD b/testing/libtbb/APKBUILD
index 0fba84c0be13bdb8f74c8e284e1bb00dca45c7c6..5fed6e17aef1c29f120bcd568d36eb7c91521c8a 100644
--- a/testing/libtbb/APKBUILD
+++ b/testing/libtbb/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Intel® TBB, a widely used C++ template library for task parallelism"
 url="https://threadingbuildingblocks.org"
 arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-debug $pkgname-dev $pkgname-doc"
 source="https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/${_pkgverstr}_src.tgz"
 
diff --git a/testing/libuninameslist/APKBUILD b/testing/libuninameslist/APKBUILD
index 7ea628b4d381803cf55977d55b3dd18662be149a..2dbdce277445bae40fe6ecf0eaa83d9bfce5ec8b 100644
--- a/testing/libuninameslist/APKBUILD
+++ b/testing/libuninameslist/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Library of Unicode names and annotation data"
 url="https://github.com/fontforge/libuninameslist"
 arch="all"
-license="BSD3"
+license="BSD-3-Clause"
 source="https://github.com/fontforge/$pkgname/releases/download/$pkgver/$pkgname-dist-$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgver"
 makedepends="autoconf automake libtool"
diff --git a/testing/libupnpp/APKBUILD b/testing/libupnpp/APKBUILD
index b04deae24594cf05f9c5d25df344800e97fda118..80c32a1793b9d9f6d15cc6d228677a41be540006 100644
--- a/testing/libupnpp/APKBUILD
+++ b/testing/libupnpp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="a C++ wrapper for libupnp"
 url="https://opensourceprojects.eu/p/libupnpp"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 options="!check"
 depends=""
 makedepends="curl-dev expat-dev libupnp-dev"
diff --git a/testing/libusbmuxd/APKBUILD b/testing/libusbmuxd/APKBUILD
index 27184f446305ffb98f5ad0db1b2d95dd7399f785..7ccfe83b7ed190a097709d80efb4c677e4acb096 100644
--- a/testing/libusbmuxd/APKBUILD
+++ b/testing/libusbmuxd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends="libplist libusb"
 makedepends="libplist-dev libusb-dev"
 subpackages="$pkgname-dev"
diff --git a/testing/libxml++-2.6/APKBUILD b/testing/libxml++-2.6/APKBUILD
index bd9d062c939ebc440bd71e2dda8112a7e6ecc03f..5112afd7227da5606b62bb36814a6bcb28ba3a12 100644
--- a/testing/libxml++-2.6/APKBUILD
+++ b/testing/libxml++-2.6/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="libbxml++ is a C++ wrapper for the libxml XML parser library."
 url="http://libxmlplusplus.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libxml2-dev glibmm-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://download.gnome.org/sources/$_pkgname/${pkgver%.[0-9]*}/$_pkgname-$pkgver.tar.xz"
diff --git a/testing/libxml++/APKBUILD b/testing/libxml++/APKBUILD
index 1a5f2811f9959e33acec0effcf5dc77d47fef02f..d75b9b0be1d3b67dadcf7281d793a9302a5f2b81 100644
--- a/testing/libxml++/APKBUILD
+++ b/testing/libxml++/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="libbxml++ is a C++ wrapper for the libxml XML parser library."
 url="http://libxmlplusplus.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libxml2-dev glibmm-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://download.gnome.org/sources/$pkgname/${pkgver%.[0-9]*}/$pkgname-$pkgver.tar.xz"
diff --git a/testing/lightdm/APKBUILD b/testing/lightdm/APKBUILD
index 3f2bd5252c67307531afaf26e500da82f669acc1..21d908b278096181bd00e75c9ee2f39c871a9aba 100644
--- a/testing/lightdm/APKBUILD
+++ b/testing/lightdm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=7
 pkgdesc="A cross-desktop display manager"
 url="http://www.freedesktop.org/wiki/Software/LightDM"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="dbus xinit accountsservice"
 depends_dev="glib-dev libxklavier-dev libx11-dev"
 makedepends="$depends_dev linux-pam-dev gtk+3.0-dev libxext-dev
diff --git a/testing/linuxconsoletools/APKBUILD b/testing/linuxconsoletools/APKBUILD
index d53cc5fe4c97e98cc9dc86cb010f8bc44ed6dd98..cc763799e5f9c666db1f6ce7abf7d80f2b05426a 100644
--- a/testing/linuxconsoletools/APKBUILD
+++ b/testing/linuxconsoletools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Tools for connecting joysticks & legacy devices to the kernels input subsystem"
 url="http://sourceforge.net/projects/linuxconsole/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 makedepends="linux-headers sdl-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/linuxconsole/linuxconsoletools-$pkgver.tar.bz2"
diff --git a/testing/litespeed/APKBUILD b/testing/litespeed/APKBUILD
index bb97e77374c310134bcb4c0b7172422e1f3b0477..4238a7b0be65925f59bf0052f85ca544221d25de 100644
--- a/testing/litespeed/APKBUILD
+++ b/testing/litespeed/APKBUILD
@@ -9,7 +9,7 @@ _php=php7
 pkgdesc="High-performance, lightweight, open source HTTP server"
 url="https://open.litespeedtech.com"
 arch="all !aarch64 !ppc64le"
-license="GPL3"
+license="GPL-3.0"
 pkgusers=litespeed
 pkggroups=litespeed
 depends="$_php-$pkgname $_php-bcmath $_php-json $_php-mcrypt $_php-session"
diff --git a/testing/lizardfs/APKBUILD b/testing/lizardfs/APKBUILD
index dd794ee7a37e0a158c979897f664a355d0d98166..2508211207208e283cfca02b8853fcae69171b1d 100644
--- a/testing/lizardfs/APKBUILD
+++ b/testing/lizardfs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="a highly reliable, scalable and efficient distributed file system"
 url="https://github.com/lizardfs/lizardfs/"
 arch=""
-license="GPLv3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev boost-dev cmake fuse-dev zlib-dev asciidoc python2"
diff --git a/testing/logstash/APKBUILD b/testing/logstash/APKBUILD
index d875bcbc047dc8ce58da4b0e3876f0fcbba85fde..76a3bffb6319373764ea928ffffc223f59740d21 100644
--- a/testing/logstash/APKBUILD
+++ b/testing/logstash/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A flexible, open source, data collection, parsing and enrichment pipeline"
 url="http://logstash.net"
 arch="noarch"
-license="apache"
+license="Apache"
 depends="openjdk8-jre-base java-jffi-native libc6-compat bash"
 makedepends="$depends_dev"
 install="$pkgname.pre-install"
diff --git a/testing/lshell/APKBUILD b/testing/lshell/APKBUILD
index 68237ebf6d790a05c1ededf342ea448f2bacf89e..771fc7b5e161fe84879e5e35de383d997f57f5dd 100644
--- a/testing/lshell/APKBUILD
+++ b/testing/lshell/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Python-based limited Shell"
 url="http://ghantoos.org/limited-shell-lshell"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/lttng-tools/APKBUILD b/testing/lttng-tools/APKBUILD
index 24f807372695c7f50a6689d07b3ba62b2007e4c1..08e344eae665ac89b7f713cdacfdaa7d897ebc7d 100644
--- a/testing/lttng-tools/APKBUILD
+++ b/testing/lttng-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="LTTng 2.0 control and utility programs"
 url="https://lttng.org"
 arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
 depends="babeltrace"
 depends_dev="popt-dev libxml2-dev userspace-rcu-dev lttng-ust-dev kmod-dev
 	util-linux-dev"
diff --git a/testing/lua-uuid/APKBUILD b/testing/lua-uuid/APKBUILD
index 897abae789821bcb45d35b399616f87bd2e071d3..db36ccae0a34280a5b131ab9fbc51a16874bd518 100644
--- a/testing/lua-uuid/APKBUILD
+++ b/testing/lua-uuid/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A pure Lua uuid generator (modified from a Rackspace module)"
 url="http://tieske.github.io/uuid/"
 arch="noarch"
-license="Apache 2.0"
+license="Apache-2.0"
 depends=""
 makedepends=""
 install=""
diff --git a/testing/luakit/APKBUILD b/testing/luakit/APKBUILD
index 2c284cb799ae7aac26b897a0a2f3440feec34f9e..a44946d6d45cd6522cf27ce485296f9ae40a31f3 100644
--- a/testing/luakit/APKBUILD
+++ b/testing/luakit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Fast, small, webkit based browser framework extensible by Lua"
 url="https://github.com/luakit/luakit"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="lua5.1-filesystem lua5.1-luassert"
 depends_dev=""
 makedepends="webkit2gtk-dev luajit-dev"
diff --git a/testing/lxqt-build-tools/APKBUILD b/testing/lxqt-build-tools/APKBUILD
index a988a8ea2181382bf74ad1014d1952a67f1dc046..ec204af7249a4c95dfe3938c1deac77d0b460c7a 100644
--- a/testing/lxqt-build-tools/APKBUILD
+++ b/testing/lxqt-build-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Various packaging tools and scripts for LXQt applications"
 url="http://lxqt.org"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends=""
 makedepends="cmake qt5-qttools-dev"
 install=""
diff --git a/testing/lzlib/APKBUILD b/testing/lzlib/APKBUILD
index d5edd0eedf3166974f3203f85d3c74038197dc43..5c7cf825e6cf0b524f1ee3741ab4994b20a8b5bd 100644
--- a/testing/lzlib/APKBUILD
+++ b/testing/lzlib/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Lzlib is a data compression library"
 url="http://www.nongnu.org/lzip/lzlib.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="http://download.savannah.gnu.org/releases/lzip/$pkgname/$pkgname-$pkgver.tar.gz"
 
diff --git a/testing/mailutils/APKBUILD b/testing/mailutils/APKBUILD
index a2244b2bcdedd2edb4b58c6416e969074639bbf5..fdb388e540b10fbb4fdf372d648e29893b93f8e6 100644
--- a/testing/mailutils/APKBUILD
+++ b/testing/mailutils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="GNU swiss army knife of electronic mail handling"
 url="https://mailutils.org/"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 replaces="mailx"
 depends_dev="$pkgname-libs=$pkgver-r$pkgrel"
 makedepends="readline-dev libtool"
diff --git a/testing/man-db/APKBUILD b/testing/man-db/APKBUILD
index 466e5be5866b3d9f2b8637b6480bdd30268da100..c766f48809e6e6dde8c52da34e186840523d2f5b 100644
--- a/testing/man-db/APKBUILD
+++ b/testing/man-db/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="The man command and related utilities for examining on-line help files"
 url="http://www.nongnu.org/man-db/"
 arch="all"
-license="GPL-2+"
+license="GPL-2.0-or-later"
 depends="groff less"
 makedepends="db-dev gettext-dev libpipeline-dev zlib-dev"
 subpackages="$pkgname-lang $pkgname-doc"
diff --git a/testing/mapnik/APKBUILD b/testing/mapnik/APKBUILD
index 80c8cab2e4c2c337d8d1e921a1c962a3b5deb293..6f85b8fe7c2af610a9e47bd6e40987e363beaf34 100644
--- a/testing/mapnik/APKBUILD
+++ b/testing/mapnik/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An open source toolkit for developing mapping applications"
 url="http://mapnik.org/"
 arch="x86_64 ppc64le"
-license="LPGL2+"
+license="LPGL-2.0-or-later"
 depends="boost boost-regex freetype zlib harfbuzz postgresql-client sqlite-libs cairo libpng libjpeg tiff libwebp libxml2 proj4 gdal icu"
 depends_dev=""
 makedepends="$depends_dev python scons boost-dev freetype-dev zlib-dev harfbuzz-dev postgresql-dev sqlite-dev cairo-dev libpng-dev tiff-dev libwebp-dev libxml2-dev proj4-dev gdal-dev icu-dev"
diff --git a/testing/mblaze/APKBUILD b/testing/mblaze/APKBUILD
index f3289bfd2026b1d9b20eb7de69deb9b8408b2d8c..36d9aebadd96b45310568f24f815921f9e097d5b 100644
--- a/testing/mblaze/APKBUILD
+++ b/testing/mblaze/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Unix utilities to deal with Maildir"
 url="https://github.com/chneukirchen/mblaze"
 arch="all"
-license="public domain"
+license="Public-Domain"
 depends=""
 depends_dev=""
 makedepends=""
diff --git a/testing/mednafen/APKBUILD b/testing/mednafen/APKBUILD
index 4879362b8f1986ea09d633cd41ea666c0551dacd..780a5be822a1554f9e74211a0dc3b86c83ede44d 100644
--- a/testing/mednafen/APKBUILD
+++ b/testing/mednafen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A command-line multi-system emulator"
 url="http://mednafen.sourceforge.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="alsa-lib-dev libsndfile-dev mesa-dev glu-dev paxmark sdl-dev zlib-dev"
 subpackages="$pkgname-lang"
diff --git a/testing/meep/APKBUILD b/testing/meep/APKBUILD
index 7b81fd7df15d04bdbab90176e227a7ccb9994a84..a8c080752bf7854fe881b6a5c144dd7d85b1657d 100644
--- a/testing/meep/APKBUILD
+++ b/testing/meep/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="free finite-difference time-domain (FDTD) simulation software package developed at MIT to model electromagnetic systems"
 url="http://ab-initio.mit.edu/wiki/index.php/Meep"
 arch="x86_64 x86 ppc64le"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev harminv-dev openblas-dev libctl-dev guile-dev
diff --git a/testing/megatools/APKBUILD b/testing/megatools/APKBUILD
index 8a42c05cb0a53b3ebd54f3cd4dad06c0b5b93722..f6420827394e099be3373a13a3c8a5945c5c50d4 100644
--- a/testing/megatools/APKBUILD
+++ b/testing/megatools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Megatools is a collection of programs for accessing Mega.nz service from a command line of your desktop or server."
 url="https://megatools.megous.com"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="curl-dev glib-dev libressl-dev gmp-dev asciidoc"
 subpackages="$pkgname-doc"
 source="https://megatools.megous.com/builds/megatools-1.9.98.tar.gz libressl.patch"
diff --git a/testing/meld/APKBUILD b/testing/meld/APKBUILD
index 8591494393d95bf6d34ee455a1456b322bc21865..6b0406be1882e41bb00753e1ae088b3a94af845f 100644
--- a/testing/meld/APKBUILD
+++ b/testing/meld/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A visual diff and merge tool"
 url="http://meldmerge.org"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="dconf gtksourceview gsettings-desktop-schemas py-gobject3"
 makedepends="intltool itstool libxml2-utils"
 subpackages="$pkgname-lang $pkgname-doc"
diff --git a/testing/mhddfs/APKBUILD b/testing/mhddfs/APKBUILD
index 6137447ad4ce8a9810cbafe9413420d5a8fa8441..b229d29081822771ccf3c1c575a1550826475c09 100644
--- a/testing/mhddfs/APKBUILD
+++ b/testing/mhddfs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A fuse-based file system for unifying several mount points into one."
 url="http://mhddfs.uvw.ru"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="fuse"
 depends_dev="fuse-dev attr-dev"
 makedepends="$depends_dev"
diff --git a/testing/mlocate/APKBUILD b/testing/mlocate/APKBUILD
index a63cecbf74d360afa95d580e9992c50753f3c483..228d82d3bc2e3dd7c81f4e6b92b83d50e8bc2189 100644
--- a/testing/mlocate/APKBUILD
+++ b/testing/mlocate/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=7
 pkgdesc="A utility for finding files by name quickly"
 url="https://pagure.io/mlocate"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="suid !check"
 checkdepends="bash"
 pkggroups="locate"
diff --git a/testing/mongo-c-driver/APKBUILD b/testing/mongo-c-driver/APKBUILD
index d5aae215e5df97d4ff51f5b102ca48a89ff67fc7..10e8af4314c56574af45475b78884af2dfeab3a8 100644
--- a/testing/mongo-c-driver/APKBUILD
+++ b/testing/mongo-c-driver/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Client library written in C for MongoDB"
 url="https://github.com/mongodb/mongo-c-driver"
 arch="all"
-license="Apache2"
+license="Apache-2.0"
 depends=
 depends_dev=
 makedepends="$depends_dev autoconf automake libbson-dev libtool"
diff --git a/testing/mongo-php7-driver/APKBUILD b/testing/mongo-php7-driver/APKBUILD
index 7688b4a6cd069679437c7f8188ddc77041226526..5475eb009bef63085d84d4a5f3ac3f79772d8424 100644
--- a/testing/mongo-php7-driver/APKBUILD
+++ b/testing/mongo-php7-driver/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
 pkgdesc="Low-level PHP driver for MongoDB"
 url="https://github.com/mongodb/mongo-php-driver"
 arch="all"
-license="Apache2"
+license="Apache-2.0"
 makedepends="autoconf automake libressl-dev pkgconfig
 	mongo-c-driver pcre-dev ${_php}-dev bash"
 options="!check" #fails, is attended
diff --git a/testing/mongo-php7-library/APKBUILD b/testing/mongo-php7-library/APKBUILD
index 88931af84922daf869d58995cde5222229ed0e0a..31c6bb87e683c9432dafd509b4661aa7ea18a57f 100644
--- a/testing/mongo-php7-library/APKBUILD
+++ b/testing/mongo-php7-library/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="High-level abstraction around the lower-level drivers for PHP"
 url="https://github.com/mongodb/mongo-php-library"
 arch="noarch"
-license="Apache2"
+license="Apache-2.0"
 makedepends="$depends_dev mongo-${_php}-driver"
 subpackages="$pkgname-doc"
 options="!check"
diff --git a/testing/mopidy/APKBUILD b/testing/mopidy/APKBUILD
index 0eccfa40b8844e1d3afd2290e47a7a130ced7e43..7f3b699683a004b415023145fb31b14e3173ec68 100644
--- a/testing/mopidy/APKBUILD
+++ b/testing/mopidy/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Mopidy is an extensible music server"
 url="http://www.mopidy.com/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python py-pykka py-tornado gst-plugins-base gst-plugins-good
 	gst-plugins-ugly py-gst py-setuptools py-libxml2 py-requests
 	py-six
diff --git a/testing/most/APKBUILD b/testing/most/APKBUILD
index d5e9c879350a5b58d883a77cab105212ffaf207a..65e28eb92ae7c47c57067f398e62aaa95bcaff3c 100644
--- a/testing/most/APKBUILD
+++ b/testing/most/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A terminal pager similar to more and less"
 url="ftp://space.mit.edu/pub/davis/most"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=
 makedepends="slang-dev ncurses-dev"
diff --git a/testing/motion/APKBUILD b/testing/motion/APKBUILD
index a044f7fa7308c2ec5cca7dd5ff2f8bb02a6372c6..3f54b0cd1eff369596212313eb88bc6bf3a21bef 100644
--- a/testing/motion/APKBUILD
+++ b/testing/motion/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Detect if a significant part of the picture has changed (e.g. from a we
 url="https://motion-project.github.io"
 arch="all"
 options="!check"
-license="GPL2"
+license="GPL-2.0"
 pkgusers="motion"
 pkggroups="motion"
 depends="jpeg v4l-utils ffmpeg"
diff --git a/testing/msgpuck/APKBUILD b/testing/msgpuck/APKBUILD
index 3f04e6c9b87136cbfc7335f8e78696cd40aa1c8c..d2c6491a6507981af860a82215e908f94a764ad3 100644
--- a/testing/msgpuck/APKBUILD
+++ b/testing/msgpuck/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A simple and efficient MsgPack binary serialization library"
 url="https://github.com/rtsisyk/msgpuck"
 arch="all !x86"
-license="BSD-2"
+license="BSD-2-Clause"
 makedepends="cmake doxygen"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/rtsisyk/$pkgname/archive/$pkgver.tar.gz
diff --git a/testing/mtd-utils/APKBUILD b/testing/mtd-utils/APKBUILD
index 4582db88abca94588adf0e1ee7742b28cb9cd806..1cb02196f3b203ac8b7011f1f8c54dbd90a9bd77 100644
--- a/testing/mtd-utils/APKBUILD
+++ b/testing/mtd-utils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Utilities for handling MTD devices, and for dealing with FTL, NFTL JFFS2, etc."
 url="http://www.linux-mtd.infradead.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="linux-headers lzo-dev util-linux-dev zlib-dev acl-dev"
 subpackages="$pkgname-doc"
 source="ftp://ftp.infradead.org/pub/mtd-utils/$pkgname-$pkgver.tar.bz2"
diff --git a/testing/mu/APKBUILD b/testing/mu/APKBUILD
index 63a257b34d6b27f4db09caab04de956dee192f1e..47631e9a1c41b6158bacc5e00fb91241fb33ae31 100644
--- a/testing/mu/APKBUILD
+++ b/testing/mu/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A collection of utilities for indexing and searching Maildirs"
 arch="x86 x86_64 ppc64le"
 url="http://www.djcbsoftware.nl/code/mu"
-license="GPL3"
+license="GPL-3.0"
 depends="sqlite"
 makedepends="xapian-core-dev gmime-dev sqlite-dev autoconf automake libtool"
 install=""
diff --git a/testing/mxml/APKBUILD b/testing/mxml/APKBUILD
index e636c4b554d9d617712d01157f5c7b75840b90dc..507720f8de4f26f3d67fa9bb48db521c9de6707c 100644
--- a/testing/mxml/APKBUILD
+++ b/testing/mxml/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Small XML library that you can use to read and write XML files"
 url="http://www.msweet.org/projects.php?Z3"
 arch="all"
-license="LGPLv2"
+license="LGPL-2.0"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/michaelrsweet/$pkgname/releases/download/v2.11/$pkgname-$pkgver.tar.gz"
 
diff --git a/testing/ncmpcpp/APKBUILD b/testing/ncmpcpp/APKBUILD
index c276c373579e6e771fd71eb247daef4bbf341ddb..2617eb1b9521f4baac34c942a62a39229abafefc 100644
--- a/testing/ncmpcpp/APKBUILD
+++ b/testing/ncmpcpp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An almost exact clone of ncmpc with some new features."
 url="http://rybczak.net/ncmpcpp"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="boost-dev readline-dev curl-dev libmpdclient-dev
diff --git a/testing/ndpi/APKBUILD b/testing/ndpi/APKBUILD
index f6cd542836774b877b1906950a4cef49e0e7f08d..6708c56537b4a43cf53bc1c5ac36cf0e944df146 100644
--- a/testing/ndpi/APKBUILD
+++ b/testing/ndpi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Open Source Deep Packet Inspection Software Toolkit"
 url="https://github.com/ntop/nDPI"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="autoconf automake libpcap-dev libtool"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ntop/nDPI/archive/$pkgver.tar.gz"
diff --git a/testing/neomutt/APKBUILD b/testing/neomutt/APKBUILD
index c4f0ac97e93874c905f04381443874f9d117b9e9..5a623bc3eebd52a557d81745fe754d4788285f3c 100644
--- a/testing/neomutt/APKBUILD
+++ b/testing/neomutt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Mutt with miscellaneous fixes and feature patches"
 url="https://www.neomutt.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="automake autoconf cyrus-sasl-dev gdbm-dev gettext-dev
diff --git a/testing/netdata/APKBUILD b/testing/netdata/APKBUILD
index a7d7065361c763fbe558b7896f9ea9378a89e724..52d68118f0fa7f83405db2efb735225a3ed951ee 100644
--- a/testing/netdata/APKBUILD
+++ b/testing/netdata/APKBUILD
@@ -5,7 +5,7 @@ pkgver=1.9.0
 pkgrel=0
 pkgdesc="Real-time performance monitoring"
 url="https://github.com/firehol/netdata"
-license="GPL3+"
+license="GPL-3.0-or-later"
 arch="all"
 depends="bash"
 makedepends="zlib-dev e2fsprogs-dev"
diff --git a/testing/netdisco/APKBUILD b/testing/netdisco/APKBUILD
index 1508391cbde58ed4e7ec4183ca8bb1fb3397eda9..1407b475e89dad027fd5a4167aa563d9baf9ba16 100644
--- a/testing/netdisco/APKBUILD
+++ b/testing/netdisco/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
 pkgdesc="An open source web-based network management tool."
 url="http://search.cpan.org/dist/App-Netdisco/"
 arch="noarch"
-license="bsd"
+license="BSD"
 cpandepends="perl-dancer-plugin-passphrase perl-data-printer perl-plack perl-ldap
 	perl-file-sharedir perl-starman perl-socket6 perl-json-xs perl-netaddr-mac
 	perl-anyevent perl-uri perl-dancer-plugin-dbic perl-template-plugin-csv
diff --git a/testing/netsink/APKBUILD b/testing/netsink/APKBUILD
index a45e1eed9d1b0263354cf2b6069bdc46ea66d8a6..588865de9cd7a6cfb108c5d2b504077f950c5ebd 100644
--- a/testing/netsink/APKBUILD
+++ b/testing/netsink/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A Network Sinkhole for Isolated Malware Analysis"
 url="https://github.com/shendo/netsink"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2 py-dnslib py-setuptools"
 makedepends="python2-dev"
 source="https://files.pythonhosted.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/netsurf/APKBUILD b/testing/netsurf/APKBUILD
index 4c6d28c1370a0d6a883886ce4f7d0cd444995cff..2d2d30e65445f32e25d6021a81de1039cf3a8e1e 100644
--- a/testing/netsurf/APKBUILD
+++ b/testing/netsurf/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="NetSurf is a free, open source web browser."
 url="http://www.netsurf-browser.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="curl-dev libressl-dev doxygen flex bison libwebp-dev lcms2-dev
diff --git a/testing/nimble/APKBUILD b/testing/nimble/APKBUILD
index c3b37cd411aa561b5d88d86bd9de5a48104f8054..e4f075b7aab1f6820c3eea494f5adb56cbca0556 100644
--- a/testing/nimble/APKBUILD
+++ b/testing/nimble/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Package manager for the Nim programming language"
 url="https://github.com/nim-lang/nimble"
 arch="all"
-license="BSD3"
+license="BSD-3-Clause"
 depends="nim"
 source="$pkgname-$pkgver.tar.gz::https://github.com/nim-lang/$pkgname/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/nitro/APKBUILD b/testing/nitro/APKBUILD
index 41cfe88d7197a5ccc4590131c2001e9ccef90850..d4db9b91d818b53799d018b1d29ff434b38ebbb5 100644
--- a/testing/nitro/APKBUILD
+++ b/testing/nitro/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="The Nitro NITF project"
 url="https://github.com/hobu/nitro"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="cmake linux-headers"
 install=""
diff --git a/testing/node-closurecompiler-externs/APKBUILD b/testing/node-closurecompiler-externs/APKBUILD
index 389929415e4d3672acd49a83380e387f30bd000a..9537fc6e2bb19cfd65ec5edd879fd4f31d4a9ab4 100644
--- a/testing/node-closurecompiler-externs/APKBUILD
+++ b/testing/node-closurecompiler-externs/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="A collection of node.js externs for use with Closure Compiler"
 url="https://github.com/dcodeIO/node.js-closure-compiler-externs"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="nodejs"
 source="$pkgname-$pkgver.tar.gz::https://github.com/dcodeIO/$_pkgname/archive/$pkgver.tar.gz
 	domain.js-fix-type-annotations.patch"
diff --git a/testing/nomp/APKBUILD b/testing/nomp/APKBUILD
index c40b452d1249903df856efdbc5ee7d24511328dc..592747b005baa57b6f677b579e3d0b6dcb3099f6 100644
--- a/testing/nomp/APKBUILD
+++ b/testing/nomp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="Ncurses OpenVAS Manager Protocol"
 url="https://github.com/git-rep/nomp"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libressl-dev libxml++-dev ncurses-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/git-rep/$pkgname/archive/v$pkgver.tar.gz
 make-path.patch"
diff --git a/testing/nototools/APKBUILD b/testing/nototools/APKBUILD
index ccd2d6ead7197705eeddffb9ba8986bbc3e5600c..ae5fadb4930d20583e11d1e0e706714069f25e2a 100644
--- a/testing/nototools/APKBUILD
+++ b/testing/nototools/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Noto fonts support tools and scripts"
 url="https://www.google.com/get/noto/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2"
 makedepends="python2-dev py-setuptools"
 install=""
diff --git a/testing/numactl/APKBUILD b/testing/numactl/APKBUILD
index 8ce695a01f314e5a698ea8f4b3f9df16c271da8e..21b0d04286d49434c105dfcff57526fdde984b74 100644
--- a/testing/numactl/APKBUILD
+++ b/testing/numactl/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Simple NUMA policy support"
 url="https://github.com/numactl/numactl"
 # ARM lacks the __NR_migrate_pages syscall
 arch="all !armhf"
-license="GPL2 LGPL2"
+license="GPL-2.0 LGPL-2.0"
 makedepends="autoconf automake libtool linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 options="!check"
diff --git a/testing/nzbget/APKBUILD b/testing/nzbget/APKBUILD
index 3a7c0ea02e33352fc2be0e10bd3c44c7aadbb90e..100ab40c96f2f76ca9eaa14cd99a03cd240e5b9d 100644
--- a/testing/nzbget/APKBUILD
+++ b/testing/nzbget/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Usenet downloader"
 url="http://nzbget.net"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libxml2-dev ncurses-dev libressl-dev"
 subpackages="$pkgname-doc"
 source="https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver-src.tar.gz"
diff --git a/testing/oath-toolkit/APKBUILD b/testing/oath-toolkit/APKBUILD
index 9d2db6a565a0ebf765651e883d19c5838147a4af..ecbc16321f175b11e91cb03c29907e578e6e06ec 100644
--- a/testing/oath-toolkit/APKBUILD
+++ b/testing/oath-toolkit/APKBUILD
@@ -32,14 +32,14 @@ package() {
 
 liboath() {
 	pkgdesc="A shared and static C library for OATH handling."
-	license="LGPL2.1+"
+	license="LGPL-2.1-or-later"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/liboath.so* "$subpkgdir"/usr/lib
 }
 
 libpskc() {
 	pkgdesc="Library for Portable Symmetric Key Container"
-	license="LGPL2.1+"
+	license="LGPL-2.1-or-later"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libpskc.so* "$subpkgdir"/usr/lib
 }
@@ -49,14 +49,14 @@ libpskc() {
 oathtool() {
 	depends="oath-toolkit-liboath"
 	pkgdesc="A command line tool for generating and validating OTPs."
-	license="GPLv3.0+"
+	license="GPL-3.0-or-later"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/oathtool "$subpkgdir"/usr/bin
 }
 
 pam_oath() {
         depends="oath-toolkit-liboath"
-	license="GPL3.0+"
+	license="GPL-3.0-or-later"
 	pkgdesc="A PAM module for pluggable login authentication for OATH."
 	mkdir -p "$subpkgdir"/lib/security
 	mv "$pkgdir"/usr/lib/security/pam_oath.so "$subpkgdir"/lib/security
diff --git a/testing/obs-studio/APKBUILD b/testing/obs-studio/APKBUILD
index 7fdcca0a7c8f82f6f4ffd01763a4a71dc2ea3262..d58c66ce51ac119c7ae4d6e4c79b7eca02a6a905 100644
--- a/testing/obs-studio/APKBUILD
+++ b/testing/obs-studio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Free and open source software for live streaming and screen recording"
 url="https://obsproject.com/"
 arch="all !aarch64 !armhf !ppc64le"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 makedepends="cmake ffmpeg-dev libxinerama-dev
 	qt5-qtbase-dev qt5-x11extras-dev x264-dev fontconfig-dev
diff --git a/testing/octave/APKBUILD b/testing/octave/APKBUILD
index f8de66737dd1d85bd4854a976ce0cad4566ab1d8..5c5590a25d571761d806cdfde857f049d070ac96 100644
--- a/testing/octave/APKBUILD
+++ b/testing/octave/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations"
 url="https://www.gnu.org/software/octave/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 subpackages="$pkgname-doc"
 makedepends="autoconf automake bison curl fftw-dev fltk-dev fontconfig-dev
diff --git a/testing/ofono/APKBUILD b/testing/ofono/APKBUILD
index c9287be0bdd6c0ab29ad6a343ecc13fe7212171d..ba30a876e879e0b6048bd48100b6ef6bd7689473 100644
--- a/testing/ofono/APKBUILD
+++ b/testing/ofono/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications"
 url="https://01.org/ofono"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="bluez mobile-broadband-provider-info"
 makedepends="glib-dev dbus-dev eudev-dev
 	linux-headers bsd-compat-headers libexecinfo-dev
diff --git a/testing/opencc/APKBUILD b/testing/opencc/APKBUILD
index 518ef39dd8370834ab57e3b2282d783accb996b1..736f32cd2b2181ce36469eae0c7703dde2aa3cfd 100644
--- a/testing/opencc/APKBUILD
+++ b/testing/opencc/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Open Chinese Convert"
 url="http://opencc.byvoid.com/"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 makedepends="cmake doxygen python"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-ver.$pkgver.tar.gz::https://github.com/BYVoid/$_pkgname/archive/ver.$pkgver.tar.gz"
diff --git a/testing/openconnect/APKBUILD b/testing/openconnect/APKBUILD
index 9b855bb5d23ce6ab723a3023fdd23cd68bb96754..c029bb25bb585b1349930ac8d9ebd65c9f6d34fa 100644
--- a/testing/openconnect/APKBUILD
+++ b/testing/openconnect/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
 url="http://www.infradead.org/openconnect/"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends="vpnc iproute2"
 makedepends="autoconf automake intltool gnutls-dev libxml2-dev 
 	krb5-dev lz4-dev libproxy-dev linux-headers stoken-dev
diff --git a/testing/opensm/APKBUILD b/testing/opensm/APKBUILD
index b3070aeef8faaa7161441aee09fc877ef4a1c7a0..7b01b04c7601f561f561d9b14d57b9cce7f92ef6 100644
--- a/testing/opensm/APKBUILD
+++ b/testing/opensm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="OpenSM InfiniBand subnet manager"
 url="https://www.openfabrics.org/index.php/openfabrics-software.html"
 arch="x86 x86_64 ppc64le"
-license="GPL2 BSD"
+license="GPL-2.0 BSD"
 depends=""
 depends_dev="libibumad-dev"
 makedepends="$depends_dev bison flex"
diff --git a/testing/openssh-askpass/APKBUILD b/testing/openssh-askpass/APKBUILD
index 76109697ce008f510108cdcdd1598ca12f4d1fb5..7ce2373a43d59c81e8c52cd7718d61a3f75e3913 100644
--- a/testing/openssh-askpass/APKBUILD
+++ b/testing/openssh-askpass/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A passphrase dialog for OpenSSH and GTK"
 url="http://www.openssh.org/portable.html"
 arch="all"
-license="as-is"
+license="AS-IS"
 depends="openssh-client"
 options="!check"
 makedepends="gtk+2.0-dev"
diff --git a/testing/opensubdiv/APKBUILD b/testing/opensubdiv/APKBUILD
index 34cf31b9e888cab9aa47afcf47affaf3f1bc7d1a..80841645c30a18eef7e0dc1a21284019facc1aaa 100644
--- a/testing/opensubdiv/APKBUILD
+++ b/testing/opensubdiv/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="An Open-Source subdivision surface library"
 url="http://graphics.pixar.com/opensubdiv"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends=""
 makedepends="cmake glew-dev glfw-dev doxygen py-docutils libxcursor-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tutorials $pkgname-tools"
diff --git a/testing/openttd-opengfx/APKBUILD b/testing/openttd-opengfx/APKBUILD
index 886188a9aa4279a9b8e75e7e3a4dd5bb4dbfeca8..c4ece6a0717f962c9a073709c462fd29c27e7578 100644
--- a/testing/openttd-opengfx/APKBUILD
+++ b/testing/openttd-opengfx/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Free graphics set for OpenTTD"
 url="http://openttd.org/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 source="https://binaries.openttd.org/extra/opengfx/$pkgver/opengfx-$pkgver-all.zip"
diff --git a/testing/openttd/APKBUILD b/testing/openttd/APKBUILD
index ba266486935518c69408b35a563431f16998dcd1..757c7ec316ccdc8ea7115585fc4802de220e3d51 100644
--- a/testing/openttd/APKBUILD
+++ b/testing/openttd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Open source simulation game based upon Transport Tycoon Deluxe"
 url="http://openttd.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="libpng-dev zlib-dev sdl-dev lzo-dev xz-dev freetype-dev fontconfig-dev"
 subpackages="$pkgname-doc $pkgname-lang::noarch"
diff --git a/testing/opmsg/APKBUILD b/testing/opmsg/APKBUILD
index 8863d73c90e78375d2099b0fa761c4fa1975ce02..fdfd82dfa6b7f11afb8d87afacbe44e70f388daf 100644
--- a/testing/opmsg/APKBUILD
+++ b/testing/opmsg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="opmsg gpg-like encryption system"
 url="https://github.com/stealth/opmsg"
 arch="all"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends=""
 makedepends="libressl-dev"
 install=""
diff --git a/testing/ossec-hids/APKBUILD b/testing/ossec-hids/APKBUILD
index 9575d870216967d2b6008c5cc1507a0799825a3e..5577eeb86ccdef65348ebc0b20bf5fbdc3fe6902 100644
--- a/testing/ossec-hids/APKBUILD
+++ b/testing/ossec-hids/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Open Source Host-based Intrusion Detection System"
 url="http://www.ossec.net/"
 arch="all !aarch64 !armhf"
-license="GPL3"
+license="GPL-3.0"
 depends="inotify-tools procps"
 makedepends="linux-headers inotify-tools-dev findutils file"
 install="$pkgname.pre-install"
diff --git a/testing/ostinato/APKBUILD b/testing/ostinato/APKBUILD
index e85c94e5428bf0f3d37e4c06951f4c506129a16d..d35fbdfd2ae583256b322394a6f1800694489cbb 100644
--- a/testing/ostinato/APKBUILD
+++ b/testing/ostinato/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Packet/Traffic Generator and Analyzer"
 url="http://www.ostinato.org/"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 options="!check" # make test does nothing
 makedepends="qt-dev protobuf-dev libpcap-dev paxmark"
 subpackages="$pkgname-drone $pkgname-gui"
diff --git a/testing/otrs/APKBUILD b/testing/otrs/APKBUILD
index 1c148aec3ae9c991827723de68611335b530169d..fa2132c39b3811955b9c57dd4a754e0849eabca6 100644
--- a/testing/otrs/APKBUILD
+++ b/testing/otrs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Flexible Open Source Service Management Software"
 url="http://www.otrs.org/"
 arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
 pkgusers="otrs"
 pkggroups="www-data"
 depends="perl perl-archive-zip perl-crypt-eksblowfish perl-crypt-ssleay
diff --git a/testing/p0f/APKBUILD b/testing/p0f/APKBUILD
index 305df31285cdc104f94dfca02c50d8a8f9b7083c..8b02ec0569d384bcb3a44c890696181c69832cda 100644
--- a/testing/p0f/APKBUILD
+++ b/testing/p0f/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Passive traffic fingerprinting tool"
 url="http://lcamtuf.coredump.cx/p0f3/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="bash libpcap-dev"
 subpackages="$pkgname-doc"
 source="http://lcamtuf.coredump.cx/p0f3/releases/$pkgname-$pkgver.tgz
diff --git a/testing/pacparser/APKBUILD b/testing/pacparser/APKBUILD
index 6955f5973abd668756dc3af250e23f776fc1fd17..0ded41ab80c3e626c105b4a7f1c1e05c685e3842 100644
--- a/testing/pacparser/APKBUILD
+++ b/testing/pacparser/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="A library to parse proxy auto-config (PAC) files"
 url="http://pacparser.manugarg.com"
 # x86, armhf: https://github.com/pacparser/pacparser/issues/77
 arch="x86_64"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends=""
 makedepends="bash python2-dev"
 subpackages="py-$pkgname:pymod $pkgname-doc $pkgname-dev"
diff --git a/testing/pam_sqlite3/APKBUILD b/testing/pam_sqlite3/APKBUILD
index 01a88d5a67dee25a0884628f3317985416552e7a..18413eecfe92255493f87be4bd52773876874629 100644
--- a/testing/pam_sqlite3/APKBUILD
+++ b/testing/pam_sqlite3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="pam_sqlite3"
 url="https://github.com/HormyAJP/pam_sqlite3"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="linux-pam"
 makedepends="linux-pam-dev sqlite-dev bsd-compat-headers"
 install=""
diff --git a/testing/pass/APKBUILD b/testing/pass/APKBUILD
index 8e55e6caf93ea817fee34dce030f4987edf5a22b..f29fe7728848d70574b7c7a70a772cc800b3a60f 100644
--- a/testing/pass/APKBUILD
+++ b/testing/pass/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Stores, retrieves, generates, and synchronizes passwords securely"
 url="http://zx2c4.com/projects/password-store/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="bash tree"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/testing/pastebinc/APKBUILD b/testing/pastebinc/APKBUILD
index bf6a53353da7f975ca2ddc4f168ff184df002d34..de726f5db7a88a5d064aadba672c6eeab74aa321 100644
--- a/testing/pastebinc/APKBUILD
+++ b/testing/pastebinc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="utility to pipe data into a paste on pastebin.com or a similar site"
 url="https://github.com/jthomerson/pastebinc"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=
 depends_dev=
 makedepends="wget glib-dev curl-dev"
diff --git a/testing/pcsxr/APKBUILD b/testing/pcsxr/APKBUILD
index 56b52846ef2be4bde4c6c84547c11938d50ed156..05afac69a13fca4c1ac253b44225e6092f4a9cd3 100644
--- a/testing/pcsxr/APKBUILD
+++ b/testing/pcsxr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Sony PlayStation emulator"
 url="https://pcsxr.codeplex.com/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="libtxc_dxtn"
 makedepends="autoconf automake libglade-dev libtool gtk+2.0-dev sdl-dev mesa-dev
 	libxv-dev libxtst-dev nasm libxxf86vm-dev"
diff --git a/testing/pdfcrack/APKBUILD b/testing/pdfcrack/APKBUILD
index f8ee72c4af804e64d128ed9d885206f7e346ef1c..2b57a10bd1cbbfea4c630618ead7d8332936f001 100644
--- a/testing/pdfcrack/APKBUILD
+++ b/testing/pdfcrack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Command line, password recovery tool for PDF-files."
 url="http://pdfcrack.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 source="$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/peervpn/APKBUILD b/testing/peervpn/APKBUILD
index facb2cf7fbff515e2360be9e56b4efcd9b7533d0..16512487fc862bb5d3a8181ec6479951c9e91cd7 100644
--- a/testing/peervpn/APKBUILD
+++ b/testing/peervpn/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="PeerVPN builds virtual ethernet networks between multiple computers"
 url="https://peervpn.net"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="libressl zlib"
 makedepends="$depends libressl-dev zlib-dev linux-headers"
 install=""
diff --git a/testing/pelican/APKBUILD b/testing/pelican/APKBUILD
index 802521ecfb891998b4ff8fff432a7b1c72b292a2..a91306569b89f9e6bcb2de8a89fef00e8d872348 100644
--- a/testing/pelican/APKBUILD
+++ b/testing/pelican/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A tool to generate a static blog from reStructuredText or Markdown input files."
 url="https://pypi.python.org/pypi/pelican/"
 arch="noarch"
-license="AGPL3"
+license="AGPL-3.0"
 depends="bash py-feedgenerator py-pygments py-docutils py-blinker py-unidecode
 		py-markdown py-jinja2 py-dateutil"
 makedepends="python2-dev py-setuptools python3-dev"
diff --git a/testing/percona-toolkit/APKBUILD b/testing/percona-toolkit/APKBUILD
index ecb30740f33f07415d95db5b8673f3fb456b7eb5..1b01ca679a85dee230523878317192575a909764 100644
--- a/testing/percona-toolkit/APKBUILD
+++ b/testing/percona-toolkit/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Toolkit for MySQL/MariaDB"
 url="https://www.percona.com/software/database-tools/percona-toolkit/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl perl-time-hires perl-dbd-mysql bash"
 subpackages="$pkgname-doc"
 source="https://www.percona.com/downloads/$pkgname/$pkgver/source/tarball/$pkgname-$pkgver.tar.gz"
diff --git a/testing/perl-glib-ex-objectbits/APKBUILD b/testing/perl-glib-ex-objectbits/APKBUILD
index 99298860666508a36f729a200fc6a0d90bdb9f18..b00c9458e56814ebe116dfeffd8ef19ff8f630fc 100644
--- a/testing/perl-glib-ex-objectbits/APKBUILD
+++ b/testing/perl-glib-ex-objectbits/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Helpers for Glib objects."
 url="http://search.cpan.org/dist/Glib-Ex-ObjectBits/"
 arch="noarch"
-license="gpl_3"
+license="GPL-3.0"
 cpandepends="perl-devel-globaldestruction perl-glib"
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/testing/perl-session-storage-secure/APKBUILD b/testing/perl-session-storage-secure/APKBUILD
index e86d40dc282a0036b9974b9a70a945fabd80e8da..1be2376b5d1489dc9051949fcf73425d13d0d757 100644
--- a/testing/perl-session-storage-secure/APKBUILD
+++ b/testing/perl-session-storage-secure/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Encrypted, expiring, compressed, serialized session data with integrity"
 url="http://search.cpan.org/dist/Session-Storage-Secure/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends="perl-moox-types-mooselike perl-crypt-rijndael perl-string-compare-constanttime perl-moo perl-crypt-urandom perl-sereal-decoder perl-namespace-clean perl-crypt-cbc perl-math-random-isaac-xs perl-sereal-encoder"
 cpanmakedepends=""
 cpancheckdepends="perl-number-tolerant perl-test-deep perl-test-fatal"
diff --git a/testing/perl-snmp-info/APKBUILD b/testing/perl-snmp-info/APKBUILD
index dcc10bcb632af821d6ea440adac2648a6d7eaa47..13a00611bdaf2d2d4b3c82871500e24c9ccefa18 100644
--- a/testing/perl-snmp-info/APKBUILD
+++ b/testing/perl-snmp-info/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="OO Interface to Network devices and MIBs through SNMP"
 url="http://search.cpan.org/dist/SNMP-Info/"
 arch="noarch"
-license="bsd"
+license="BSD"
 cpandepends="net-snmp-perl"
 cpanmakedepends=""
 cpancheckdepends=""
diff --git a/testing/perl-test-api/APKBUILD b/testing/perl-test-api/APKBUILD
index 3b0f17bae9b3ca0b6565a789ccd877ffb2d84781..aed9d34b4b9f8a6f931d4b55a3450513baf50cf3 100644
--- a/testing/perl-test-api/APKBUILD
+++ b/testing/perl-test-api/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Test a list of subroutines provided by a module"
 url="http://search.cpan.org/dist/Test-API/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends=""
 cpanmakedepends=""
 cpancheckdepends=""
diff --git a/testing/perl-test-roo/APKBUILD b/testing/perl-test-roo/APKBUILD
index 03b8f963f9bb8e09e8fa41822ab0ad8743c1f1fa..ee75538cd952bbe312dd861d873c9b03ae318071 100644
--- a/testing/perl-test-roo/APKBUILD
+++ b/testing/perl-test-roo/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Composable, reusable tests with roles and Moo"
 url="http://search.cpan.org/dist/Test-Roo/"
 arch="noarch"
-license="apache_2_0"
+license="Apache-2.0"
 cpandepends="perl-moox-types-mooselike perl-moo perl-sub-install perl-strictures"
 cpanmakedepends=""
 cpancheckdepends="perl-capture-tiny"
diff --git a/testing/perl-www-curl/APKBUILD b/testing/perl-www-curl/APKBUILD
index 885cc588e096c2393962666bb156cf72af5ff039..2b7189da1a0a22019381a75a69628304cf4f7d00 100644
--- a/testing/perl-www-curl/APKBUILD
+++ b/testing/perl-www-curl/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="Perl extension interface for libcurl"
 url="http://search.cpan.org/dist/WWW-Curl/"
 arch="all"
-license="mit"
+license="MIT"
 cpandepends=""
 cpanmakedepends="   "
 depends="$cpandepends"
diff --git a/testing/php7-couchbase/APKBUILD b/testing/php7-couchbase/APKBUILD
index 3db9a4ecd477812cfb959c9015fbb5323ba81ad6..f112d4e0ba1e230b2aabe7e0062092e563b2c5d5 100644
--- a/testing/php7-couchbase/APKBUILD
+++ b/testing/php7-couchbase/APKBUILD
@@ -9,7 +9,7 @@ _phpver=${_phpver%%-*}
 pkgdesc="PHP$_phpver extension for Couchbase"
 url="http://pecl.php.net/package/couchbase"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="php$_phpver-common php$_phpver-json"
 makedepends="php$_phpver-dev autoconf libcouchbase-dev zlib-dev"
 source="$pkgname-$pkgver.tgz::http://pecl.php.net/get/$_pkgreal-$pkgver.tgz"
diff --git a/testing/physlock/APKBUILD b/testing/physlock/APKBUILD
index 466b1ddd08012ec8b3828a209a82985b6e227d17..1c8a72ef558a80a511f472ebb11f619d4f40ecf7 100644
--- a/testing/physlock/APKBUILD
+++ b/testing/physlock/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Lightweight linux console locking tool"
 url="https://github.com/muennich/physlock"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="linux-headers"
 depends=""
 install=""
diff --git a/testing/pixiewps/APKBUILD b/testing/pixiewps/APKBUILD
index 4f11c661d2be2fef2f6251bc89d4e71d747ca3d8..6c23728d60287a41586468f395024b7c56aebfaf 100644
--- a/testing/pixiewps/APKBUILD
+++ b/testing/pixiewps/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An offline WPS bruteforce utility"
 url="https://github.com/wiire/pixiewps"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 source="$pkgname-$pkgver.tar.gz::https://github.com/wiire/$pkgname/archive/v$pkgver.tar.gz
 make-bindir.patch"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/platformio-core/APKBUILD b/testing/platformio-core/APKBUILD
index 9bc92d36c574d00a30411ef9bd16119ace0a7006..691ca37b83cf33f2d5c1de479ca2d3b49934841a 100644
--- a/testing/platformio-core/APKBUILD
+++ b/testing/platformio-core/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An open source ecosystem for IoT development"
 url="http://platformio.org"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python py-bottle py-click5 py-lockfile py-serial
 	py-requests py-colorama py-semanticversion"
 makedepends="python-dev py-setuptools"
diff --git a/testing/plzip/APKBUILD b/testing/plzip/APKBUILD
index 15250d11c30a5003ebfed472bda304507bc9a9ed..2688509018cb0bfb958140354386784ea8232c1f 100644
--- a/testing/plzip/APKBUILD
+++ b/testing/plzip/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Plzip is a massively parallel lossless data compressor"
 url="http://www.nongnu.org/lzip/plzip.html"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="lzlib"
diff --git a/testing/policycoreutils/APKBUILD b/testing/policycoreutils/APKBUILD
index c1dd807d5ac2fef3a2b70cec6581f278fdeb2d57..0888ad4b7a042790968ae82631922c81e0873ef5 100644
--- a/testing/policycoreutils/APKBUILD
+++ b/testing/policycoreutils/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="SELinux policy core utilities"
 url="http://www.selinuxproject.org"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="libsepol libselinux libsemanage gettext linux-pam python audit-libs"
 depends_dev=""
 makedepends="$depends_dev fts-dev libsepol-dev libselinux-dev libsemanage-dev gawk bsd-compat-headers linux-headers gettext-dev linux-pam-dev libcap-ng-dev coreutils python audit-dev"
diff --git a/testing/postgis/APKBUILD b/testing/postgis/APKBUILD
index d4ca4a3cfe6f62f27d4e5102af381b6eb8721570..d74c219535ddb124f589c8d5e26ab6dbe747d09d 100644
--- a/testing/postgis/APKBUILD
+++ b/testing/postgis/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="PostGIS is a spatial database extender for PostgreSQL object-relational database."
 url="http://postgis.net"
 arch="x86_64"
-license="GPL2"
+license="GPL-2.0"
 depends="postgresql geos gdal proj4 perl"
 depends_dev="postgresql-dev geos-dev gdal-dev libxml2-dev proj4-dev perl-dev"
 makedepends="$depends_dev"
diff --git a/testing/pwsafe/APKBUILD b/testing/pwsafe/APKBUILD
index 1b73db11075b7d3a560edbe5cc1292053f9af90c..78e222a32e1c8a6fbdb1a31cc9e70bfcb5a8e409 100644
--- a/testing/pwsafe/APKBUILD
+++ b/testing/pwsafe/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=7
 pkgdesc="Password database"
 url="http://nsd.dyndns.org/pwsafe/"
 arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
 makedepends="ncurses-dev libressl-dev libxmu-dev readline-dev"
 subpackages="$pkgname-doc"
 source="http://nsd.dyndns.org/pwsafe/releases/pwsafe-$pkgver.tar.gz"
diff --git a/testing/py-actdiag/APKBUILD b/testing/py-actdiag/APKBUILD
index c56867f8e6d91bc2a3ce2eb47609bf498847e9a5..4cf95913d4a463cc31bb01d1642a943d472de0f4 100644
--- a/testing/py-actdiag/APKBUILD
+++ b/testing/py-actdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="actdiag generate activity-diagram image file from spec-text file"
 url="https://pypi.python.org/pypi/actdiag"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-pillow py-funcparserlib py-blockdiag"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-ansi2html/APKBUILD b/testing/py-ansi2html/APKBUILD
index ca675054954cfcefaba17fc0acf5c02826861420..a78c02cc08a7733f71051687951e5a3bcc628920 100644
--- a/testing/py-ansi2html/APKBUILD
+++ b/testing/py-ansi2html/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Convert text with ANSI color codes to HTML"
 url="http://github.com/ralphbean/ansi2html/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2 py-setuptools py-six"
 depends_dev=""
 makedepends="python2-dev"
diff --git a/testing/py-application/APKBUILD b/testing/py-application/APKBUILD
index 660429e5062fedc9fb32a3e3134bf20714765dab..6e5fe9e81b4fb33b2a21928e03ea6342b34a0c93 100644
--- a/testing/py-application/APKBUILD
+++ b/testing/py-application/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Basic building blocks for python applications"
 url="http://pypi.python.org/pypi/python-application"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="python2"
 makedepends="python2-dev py-setuptools"
 install=""
diff --git a/testing/py-apsw/APKBUILD b/testing/py-apsw/APKBUILD
index 8f36a6bd8edaf68cdce757c0abc18a2ad8e62fd0..a252ce27a6c6eff375f2655528278866400c04ea 100644
--- a/testing/py-apsw/APKBUILD
+++ b/testing/py-apsw/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Another Python SQLite Wrapper"
 url="https://github.com/rogerbinns/apsw/"
 arch="all"
-license="ZLIB"
+license="zlib"
 makedepends="python2-dev python3-dev py-setuptools sqlite-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3 $pkgname-doc"
 source="$pkgname-$pkgver-$_pkgrel.tar.gz::https://github.com/rogerbinns/apsw/archive/$pkgver-$_pkgrel.tar.gz"
diff --git a/testing/py-argcomplete/APKBUILD b/testing/py-argcomplete/APKBUILD
index ad871a0dda172c8d468ae5002252407cfcee4dce..077c110177a26963a501f849c821935d0ad4e172 100644
--- a/testing/py-argcomplete/APKBUILD
+++ b/testing/py-argcomplete/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Easy, extensible command line tab completion of arguments for your Python script"
 url="https://github.com/kislyuk/argcomplete"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 install=""
diff --git a/testing/py-arrow/APKBUILD b/testing/py-arrow/APKBUILD
index 0ea7866a9b05cd954413322176742adaa4aa376e..b8ba979b74b2d8ade1952eb86ff44a4205e1d5c9 100644
--- a/testing/py-arrow/APKBUILD
+++ b/testing/py-arrow/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python library to create and manipulate dates, times, and timestamps"
 url="http://arrow.readthedocs.io/"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="py-dateutil"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-astral/APKBUILD b/testing/py-astral/APKBUILD
index 55130ce628f71bb021ff27912811177955d087fd..2eed8841ae38c05ef48112aa65b9d761c41cb0da 100644
--- a/testing/py-astral/APKBUILD
+++ b/testing/py-astral/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Calculations for the position of the sun and moon"
 url="https://pypi.python.org/pypi/astral/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-tz"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-astroid/APKBUILD b/testing/py-astroid/APKBUILD
index fd7011ef3816cd2b26f4b37f30862ab6432e2d27..fa44725fb6334ff6a1e9e2bc1ddc8b5f22d136be 100644
--- a/testing/py-astroid/APKBUILD
+++ b/testing/py-astroid/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A new abstract syntax tree from Python's ast"
 url="http://www.astroid.org/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="py-logilab-common"
 replaces="py-logilab-astng"
 makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-augeas/APKBUILD b/testing/py-augeas/APKBUILD
index bc2abcc25577dbb06efc0f43d8ff78eb85b6c2aa..51ed80a6233d29644fd43c425f37d456592c1581 100644
--- a/testing/py-augeas/APKBUILD
+++ b/testing/py-augeas/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Pure python bindings for augeas"
 url="https://pypi.python.org/pypi/python-augeas"
 arch="noarch"
-license="GPL2.1"
+license="GPL-2.1"
 depends="augeas-libs py-cffi"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
diff --git a/testing/py-banknumber/APKBUILD b/testing/py-banknumber/APKBUILD
index b4c6a007361801ef654830d42dcbd38a558c7a40..6b5bb9515b012eccf959092e1e31273c525bb6ac 100644
--- a/testing/py-banknumber/APKBUILD
+++ b/testing/py-banknumber/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python module to validate Bank codes"
 url="https://bitbucket.org/zikzakmedia/python-banknumber"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-barcodenumber/APKBUILD b/testing/py-barcodenumber/APKBUILD
index 457f79455be7df0a356631d605854b343f174b38..2c6bb21617092e9fd78670313203ff58c87e203d 100644
--- a/testing/py-barcodenumber/APKBUILD
+++ b/testing/py-barcodenumber/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python module to validate product codes"
 url="https://bitbucket.org/zikzakmedia/python-barcodenumber"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-blockdiag/APKBUILD b/testing/py-blockdiag/APKBUILD
index 45e494afe6a3653d540cd321ea16aa324c029a6c..999b781f50184aeb5998036b7b346fc36d710499 100644
--- a/testing/py-blockdiag/APKBUILD
+++ b/testing/py-blockdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A python tool to generate block-diagram"
 url="http://blockdiag.com"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-pillow py-funcparserlib py-webcolors"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-boto3/APKBUILD b/testing/py-boto3/APKBUILD
index 743b1953df1636d727310b38c80747d18d5b749e..7b413fb166884199a754a820510d5601854e9da7 100644
--- a/testing/py-boto3/APKBUILD
+++ b/testing/py-boto3/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="AWS SDK for Python (Boto3)"
 url="http://aws.amazon.com/sdk-for-python/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-botocore"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
diff --git a/testing/py-botocore/APKBUILD b/testing/py-botocore/APKBUILD
index d6b0c9b01dbd14a0fb71cbad2ae45d8ce04679aa..fa64b5166d85969a644ebc27c089fe297fc55ac2 100644
--- a/testing/py-botocore/APKBUILD
+++ b/testing/py-botocore/APKBUILD
@@ -7,7 +7,7 @@ _pkgreal=${pkgname#py-}
 pkgdesc="The low-level, core functionality of Boto3"
 url="https://github.com/boto/botocore"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-dateutil py-jmespath"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py3-$_pkgreal:_py3 py2-$_pkgreal:_py2"
diff --git a/testing/py-cairosvg/APKBUILD b/testing/py-cairosvg/APKBUILD
index 7deb42537b7f2e0fdbca768f5478870a91201e8c..ea317eb2da4f1d68636ebe0f3d6af3b79cd7cc40 100644
--- a/testing/py-cairosvg/APKBUILD
+++ b/testing/py-cairosvg/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Cairo-based SVG renderer for python"
 url="http://cairosvg.org"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends="python2 py-cairocffi"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-cassandra-driver/APKBUILD b/testing/py-cassandra-driver/APKBUILD
index 34571e1bcf49163116902b9ff87f878ef9af2d6f..694c27fee523c2e3906dcea87c3bb6783eef6923 100644
--- a/testing/py-cassandra-driver/APKBUILD
+++ b/testing/py-cassandra-driver/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python driver for Apache Cassandra"
 url="https://github.com/datastax/python-driver"
 arch="all"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="cython"
 makedepends="cython-dev libev-dev py-setuptools python2-dev python3-dev"
 subpackages="py2-${pkgname/py-/}:_py2 py3-${pkgname/py-/}:_py3"
diff --git a/testing/py-cjson/APKBUILD b/testing/py-cjson/APKBUILD
index c43c3618a3d4e0c639dce613db3da36f58cca6b7..6f482e2c39e50eb4552cb5e214f54f411ebe5556 100644
--- a/testing/py-cjson/APKBUILD
+++ b/testing/py-cjson/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Fast JSON encoder/decoder for Python"
 url="https://pypi.python.org/pypi/python-cjson"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="python2-dev py-setuptools"
 install=""
diff --git a/testing/py-codecov/APKBUILD b/testing/py-codecov/APKBUILD
index 00dc052c390a4b9206498070e41bbd6428b41ca2..1422306167122eefea6cca168aed058f8c6d7867 100644
--- a/testing/py-codecov/APKBUILD
+++ b/testing/py-codecov/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Report uploader for Codecov"
 url="https://github.com/codecov/codecov-python"
 arch="noarch"
-license="Apache2"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-coverage/APKBUILD b/testing/py-coverage/APKBUILD
index bd5a3f54922430dcb2c2b9484e097b851079bc20..6be98781b87173bec9646b7a680ec07761f563ca 100644
--- a/testing/py-coverage/APKBUILD
+++ b/testing/py-coverage/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Code coverage measurement for Python"
 url="https://pypi.python.org/pypi/coverage"
 arch="all"
-license="apache2"
+license="Apache-2.0"
 depends=
 depends_dev=
 makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-coveralls/APKBUILD b/testing/py-coveralls/APKBUILD
index e6780519cc4dfe04060e0e01eb0ad09f8df839aa..74623d9158cd3c6b5f36c6dfe18069cf7f855601 100644
--- a/testing/py-coveralls/APKBUILD
+++ b/testing/py-coveralls/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Show coverage stats online via coveralls.io"
 url="https://github.com/coveralls-clients/coveralls-python"
 arch="noarch"
-license="Apache2"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-cssutils/APKBUILD b/testing/py-cssutils/APKBUILD
index 8fc3852bee6269f602fdcbe7bde8a47f16fc2863..077c1cafc47cea4033367683aeed8dd8a0be6484 100644
--- a/testing/py-cssutils/APKBUILD
+++ b/testing/py-cssutils/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A CSS Cascading Style Sheets library for Python"
 url="http://cthedot.de/cssutils/"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 makedepends="python2-dev py-setuptools"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
diff --git a/testing/py-django-debug-toolbar/APKBUILD b/testing/py-django-debug-toolbar/APKBUILD
index 92b0d32d93d0a9c31c6592e42889e41fdfaaec76..f95d0f424672093b7ca8172378594e301253944e 100644
--- a/testing/py-django-debug-toolbar/APKBUILD
+++ b/testing/py-django-debug-toolbar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Configurable set of panels that display various debug information about the current request/response"
 url="https://github.com/jazzband/django-debug-toolbar"
 arch="noarch"
-license="BSD3"
+license="BSD-3-Clause"
 depends="py-django py-sqlparse"
 makedepends="python2-dev python3-dev py-setuptools"
 options="!check" #no testsuite
diff --git a/testing/py-dulwich/APKBUILD b/testing/py-dulwich/APKBUILD
index bbc5cdbf93f4343c5ab6527b8b0a4aa3603335d4..f11282a6f301fa3a71162e5d8a18eee7c73177b2 100644
--- a/testing/py-dulwich/APKBUILD
+++ b/testing/py-dulwich/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A python implementation of the Git file formats and protocols"
 url="https://www.dulwich.io"
 arch="all"
-license="GPL2+ or ASL 2.0"
+license="GPL-2.0-or-later or Apache-2.0"
 options="!check" # Tests are failing (http-backend)
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-elasticsearch/APKBUILD b/testing/py-elasticsearch/APKBUILD
index d3376f08789a187cd455f610f5a9b557b656c11d..1f693fb85d9dd4aba4f665b2af714f05c45b6a75 100644
--- a/testing/py-elasticsearch/APKBUILD
+++ b/testing/py-elasticsearch/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Official Python low-level client for Elasticsearch"
 url="http://elasticsearch-py.rtfd.org/"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="py-urllib3"
 #checkdepends="py-requests py-nose py-coverage py-mock py-yaml py-nosexcover"
 checkdepends="py-requests py-nose py-coverage py-mock py-yaml" # add nosexcover next release
diff --git a/testing/py-enchant/APKBUILD b/testing/py-enchant/APKBUILD
index 4cc2ebfdac417a7dddfdb50ff745f75c51e29951..c8e3375b3620bf22fcc5f014b6edba533aa3f4dc 100644
--- a/testing/py-enchant/APKBUILD
+++ b/testing/py-enchant/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A spellchecking library for Python"
 url="http://pythonhosted.org/pyenchant/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools enchant-dev"
diff --git a/testing/py-ev/APKBUILD b/testing/py-ev/APKBUILD
index 74a511cef628d29cae3355057ed44ff8584af249..5407e93c99e1ff88600091566320ea5af5a216f5 100644
--- a/testing/py-ev/APKBUILD
+++ b/testing/py-ev/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python libev interface"
 url="http://pythonhosted.org/pyev/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools libev-dev"
diff --git a/testing/py-exconsole/APKBUILD b/testing/py-exconsole/APKBUILD
index cbbb58ca13d5617744c09c93ad78302fdcf8a4ea..4c7053c7c228c6d41de7e73b644e9b20c8dec059 100644
--- a/testing/py-exconsole/APKBUILD
+++ b/testing/py-exconsole/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Emergency/postmortem Python console"
 url="https://github.com/Eugeny/exconsole"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-fedmsg/APKBUILD b/testing/py-fedmsg/APKBUILD
index d7c26125937aad56e560cf4345de6502c391938b..a0e2b19620377eecec2b47419753ee8397f38ec3 100644
--- a/testing/py-fedmsg/APKBUILD
+++ b/testing/py-fedmsg/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Utilities used around Fedora Infrastructure to send and receive messages"
 url="https://fedmsg.readthedocs.org/"
 arch="noarch"
-license="LGPLv2"
+license="LGPL-2.0"
 depends="python2"
 depends_dev="py-setuptools"
 makedepends="$depends_dev"
diff --git a/testing/py-feedgenerator/APKBUILD b/testing/py-feedgenerator/APKBUILD
index 0bd85246037d70e9145ff7de541d4e617b94ab35..626741b38086be1fee5361903df3ac0925d9d23f 100644
--- a/testing/py-feedgenerator/APKBUILD
+++ b/testing/py-feedgenerator/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python feed generator"
 url="https://github.com/getpelican/feedgenerator"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="py-six py-tz"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-flake8-isort/APKBUILD b/testing/py-flake8-isort/APKBUILD
index 8bfa68d0e321db1b8ba5ab68863f58744708e373..367efb8987bd78e9a78ff7b218ee6e6e81db3c2e 100644
--- a/testing/py-flake8-isort/APKBUILD
+++ b/testing/py-flake8-isort/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Extension for flake8 which integrates isort"
 url="https://github.com/gforcada/flake8-isort"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="flake8 py3-isort"
 makedepends="python3-dev"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-flask-enterprise/APKBUILD b/testing/py-flask-enterprise/APKBUILD
index 3b3674a5eb92cea5081f700e78a9c5c7656a18f1..331f7afb0821baf183182aaead037e340256d837 100644
--- a/testing/py-flask-enterprise/APKBUILD
+++ b/testing/py-flask-enterprise/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Flask enterprise capabilities"
 url="https://pypi.python.org/pypi/Flask-Enterprise"
 arch="noarch"
-license=" CDDL"
+license="CDDL"
 depends="python2 py-flask"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-flask-psycopg2/APKBUILD b/testing/py-flask-psycopg2/APKBUILD
index e296e7165ed0402c6a0a1ccae49cd130710583d4..6e342290e42696df31425837a33675dfbcc91070 100644
--- a/testing/py-flask-psycopg2/APKBUILD
+++ b/testing/py-flask-psycopg2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Flask Psycopg extension"
 url="https://pypi.python.org/pypi/Flask-Psycopg2"
 arch="noarch"
-license="Public Domain"
+license="Public-Domain"
 depends="python2 py-flask py-psycopg2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-google-apputils/APKBUILD b/testing/py-google-apputils/APKBUILD
index 600e0a1f6c72a3af913b88e4d535af02fef5b5e8..849502f7555fde4f4716abe80d74a4a5480674bf 100644
--- a/testing/py-google-apputils/APKBUILD
+++ b/testing/py-google-apputils/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Google Application Utilities for Python"
 url="https://github.com/google/google-apputils"
 arch="noarch"
-license="ASL-2.0"
+license="Apache-2.0"
 depends="python2 py-dateutil>=1.4 py-gflags>=1.4 py-tz>=2010"
 makedepends="python2-dev py-setuptools"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-hearplanetapi/APKBUILD b/testing/py-hearplanetapi/APKBUILD
index d64ff430e4462bce570d708891e29a352123f361..8537b7a3f8725b6f71df513526130e047e7431d4 100644
--- a/testing/py-hearplanetapi/APKBUILD
+++ b/testing/py-hearplanetapi/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python API wrapper for Hear Planet"
 url="http://pypi.python.org/pypi/HearPlanetAPI/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-hurry-filesize/APKBUILD b/testing/py-hurry-filesize/APKBUILD
index 77d9fa398f11b3efbd944731b1ada439d5c4d340..6e3a9d176b59cc35fe48f72dd7d2637a5ab62c27 100644
--- a/testing/py-hurry-filesize/APKBUILD
+++ b/testing/py-hurry-filesize/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python library for human readable file sizes"
 url="https://pypi.python.org/pypi/hurry.filesize"
 arch="noarch"
-license="ZPL 2.1"
+license="ZPL-2.1"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-hypothesis/APKBUILD b/testing/py-hypothesis/APKBUILD
index fb77abeb43c9c92f368695eb368e33d4183d02d7..c87eeecf64cd5b7fae66625c98e9d573f9ae6305 100644
--- a/testing/py-hypothesis/APKBUILD
+++ b/testing/py-hypothesis/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Advanced property-based (QuickCheck-like) testing for Python"
 url="http://hypothesis.works/"
 arch="noarch"
-license="MPLv2.0"
+license="MPL-2.0"
 depends=""
 makedepends="py-setuptools python2-dev python3-dev py-enum34"
 install=""
diff --git a/testing/py-ibanlib/APKBUILD b/testing/py-ibanlib/APKBUILD
index e3c26e25aa7c6ed303cc5dc3efe520a165a7ab56..ef9ca19c7f7e13d69160e5c82bfaf7419f1fd3d9 100644
--- a/testing/py-ibanlib/APKBUILD
+++ b/testing/py-ibanlib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Library integrate the International Bank Account Number (IBAN)"
 url="https://pypi.python.org/pypi/ibanlib"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-isbn/APKBUILD b/testing/py-isbn/APKBUILD
index 5167c8d48dc49c6f95b3ff1ee2c434101633272d..3deb9d23a304132ce0f50b2194c436528965abea 100644
--- a/testing/py-isbn/APKBUILD
+++ b/testing/py-isbn/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A module for working with 10- and 13-digit ISBNs"
 url="https://github.com/JNRowe/pyisbn"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-kerberos/APKBUILD b/testing/py-kerberos/APKBUILD
index 774769dabb7b0528e344a94117fad16f3595a09e..4ed76af02863e9f4c60628cc9e4c5098496bd657 100644
--- a/testing/py-kerberos/APKBUILD
+++ b/testing/py-kerberos/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python Kerberos high-level interface"
 url="https://pypi.python.org/pypi/kerberos"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2"
 makedepends="python2-dev py-setuptools python3-dev krb5-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-libacl/APKBUILD b/testing/py-libacl/APKBUILD
index a48222698f41247274567a508c4b988ced6560dd..8eccd0ebd5659e337bc1914f1d38663942c1ef97 100644
--- a/testing/py-libacl/APKBUILD
+++ b/testing/py-libacl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A python module for manipulating ACLs"
 url="http://pylibacl.k1024.org/"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="python2-dev acl-dev py-setuptools"
diff --git a/testing/py-libnacl/APKBUILD b/testing/py-libnacl/APKBUILD
index 2b8e2bbbaff3cbd827f6c5abebc991074617e3a9..6f0fef6799c1c2eb4ef082731a4bc915c782d078 100644
--- a/testing/py-libnacl/APKBUILD
+++ b/testing/py-libnacl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python bindings for libsodium/tweetnacl"
 url="https://libnacl.readthedocs.org/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/saltstack/libnacl/archive/v$pkgver.tar.gz"
diff --git a/testing/py-logilab-astng/APKBUILD b/testing/py-logilab-astng/APKBUILD
index c106a5aefaaed04afab3500dab8739a11d84182c..285f3dc3bf4ba7921844aa01df3f27cc21f4e5c7 100644
--- a/testing/py-logilab-astng/APKBUILD
+++ b/testing/py-logilab-astng/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Rebuild a new abstract syntax tree from Python's ast"
 url="http://pypi.python.org/pypi/logilab-astng"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2 py-logilab-common"
 depends_dev=""
 makedepends="python2-dev py-logilab-common"
diff --git a/testing/py-lxc-python2/APKBUILD b/testing/py-lxc-python2/APKBUILD
index 4df7438675256c51736a7e853511218ffa8aa6e1..2bcfa25f114c5afe40c6a6fff111dce1bcdd8a37 100644
--- a/testing/py-lxc-python2/APKBUILD
+++ b/testing/py-lxc-python2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Python2 bindings for LXC"
 url="https://pypi.python.org/pypi/lxc-python2"
 arch="all"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends=""
 makedepends="lxc-dev python-dev py-setuptools"
 subpackages=""
diff --git a/testing/py-mongo/APKBUILD b/testing/py-mongo/APKBUILD
index 713f15d7e30c7ce29a73ea332de861e1755bb8a3..00fbc9f3f4cf82dc6bac92e17807308b6f262301 100644
--- a/testing/py-mongo/APKBUILD
+++ b/testing/py-mongo/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python driver for MongoDB"
 url="https://github.com/mongodb/mongo-python-driver"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-napalm/APKBUILD b/testing/py-napalm/APKBUILD
index a444a79d63d92f66d90c13acb801ec0d63aa2569..3cd40675090a3edddd13002e49a68c343c58cde3 100644
--- a/testing/py-napalm/APKBUILD
+++ b/testing/py-napalm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Network Automation and Programmability Abstraction Layer with Multivendor support"
 url="https://github.com/napalm-automation/napalm"
 arch="noarch"
-license="Apache2"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools py2-pip"
 options="!check" #no testsuite
diff --git a/testing/py-ncclient/APKBUILD b/testing/py-ncclient/APKBUILD
index a399a917d71c1048b1279f3db1c7cfd9d367e497..2dc93429b08d2eed154950e2d9e773d953ac9ac3 100644
--- a/testing/py-ncclient/APKBUILD
+++ b/testing/py-ncclient/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library for NETCONF clients"
 url="https://github.com/tomchristie/itypes"
 arch="noarch"
-license="Apache2"
+license="Apache-2.0"
 depends="py-paramiko py-lxml py-six"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-newt_syrup/APKBUILD b/testing/py-newt_syrup/APKBUILD
index 4ba027870add40b707e6d9b7315593bf56cb985a..5816a6f003d17affb1dd7d2dd4eff6263b9c0ca0 100644
--- a/testing/py-newt_syrup/APKBUILD
+++ b/testing/py-newt_syrup/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Newt Syrup is an app framework built on top of Newt"
 url="http://newt-syrup.fedorahosted.org/"
 arch="noarch"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends="py-newt"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-nmap/APKBUILD b/testing/py-nmap/APKBUILD
index fccbf3f9b8e93487f927e31eb75d2df43d994dee..5136559aef8d0c173ac572d134ce60ac7f013a25 100644
--- a/testing/py-nmap/APKBUILD
+++ b/testing/py-nmap/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python class to use nmap and access scan results"
 url="http://xael.org/norman/python/python-nmap/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="http://xael.org/pages/python-$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-ntplib/APKBUILD b/testing/py-ntplib/APKBUILD
index 7cfd2da374db3a994311fde21e0c2e8d47fadee7..234cfcd39b1cfa268c83342fcb5f4ea7c5372efb 100644
--- a/testing/py-ntplib/APKBUILD
+++ b/testing/py-ntplib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python NTP library"
 url="https://pypi.python.org/pypi/ntplib"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-nwdiag/APKBUILD b/testing/py-nwdiag/APKBUILD
index 67e76140f09d2315c631a5f02230b3755c487815..be500ff1f5048e7b71edd557458130c49171ccea 100644
--- a/testing/py-nwdiag/APKBUILD
+++ b/testing/py-nwdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="A Python tool  to generate network-diagram image"
 url="https://pypi.python.org/pypi/nwdiag"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-pillow py-funcparserlib py-blockdiag"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-osourcer/APKBUILD b/testing/py-osourcer/APKBUILD
index b4996c74ad62ef1e721c7795ee38d29dd48f86a7..747a9e2681b092591b1a5d178d638f052ae3fe73 100644
--- a/testing/py-osourcer/APKBUILD
+++ b/testing/py-osourcer/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Tool to manage licenses in source code"
 url="http://github.com/dnarvaez/osourcer"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pika/APKBUILD b/testing/py-pika/APKBUILD
index e707200d6a07dc88af7c66b37342be1fa39529eb..6f637fb5ef9742935117d75c6d8b929f28c1e03f 100644
--- a/testing/py-pika/APKBUILD
+++ b/testing/py-pika/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python AMQP client library"
 url="https://pika.readthedocs.org"
 arch="noarch"
-license="MPL 2.0"
+license="MPL-2.0"
 depends="python2 py-tornado py-twisted py-ev"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-poppler/APKBUILD b/testing/py-poppler/APKBUILD
index d71840cacfbd9b0f40c967b483372d39f0fbd7fd..9e5f1c55dc21b61d3c462845f396c3b12858997f 100644
--- a/testing/py-poppler/APKBUILD
+++ b/testing/py-poppler/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Python bindings for the poppler PDF library"
 url="https://launchpad.net/poppler-python"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="python2 poppler-glib py-gtk"
 depends_dev=""
 makedepends="python2-dev poppler-dev py-gtk-dev py2-cairo-dev"
diff --git a/testing/py-praw/APKBUILD b/testing/py-praw/APKBUILD
index a42371e4a7d4bf8fc224bf3dbf63834c6f6d8ba6..f2d62ee3d8db4f016126b496e343d6d2973b5e65 100644
--- a/testing/py-praw/APKBUILD
+++ b/testing/py-praw/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python module to access to reddit's API"
 url="https://github.com/praw-dev/praw"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="py-update-checker py-requests py-six"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-progressbar/APKBUILD b/testing/py-progressbar/APKBUILD
index d867db05924497e0cffa5921eab4bac47ade3f35..79e603687ec6e4795a66fd3236827bb8b1d283d8 100644
--- a/testing/py-progressbar/APKBUILD
+++ b/testing/py-progressbar/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Text progressbar library for Python"
 url="http://code.google.com/p/python-progressbar/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pybles/APKBUILD b/testing/py-pybles/APKBUILD
index dec6081fd74f90a94821db7cab493497ce4dd2d3..be14eb679ea6fd34190544cb82a40a985653527b 100644
--- a/testing/py-pybles/APKBUILD
+++ b/testing/py-pybles/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python module to represent tables in the terminal"
 url="http://pypi.python.org/pypi/Pybles/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2 py-blessings"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pycountry/APKBUILD b/testing/py-pycountry/APKBUILD
index 7aa1f57e9fd3015525d65f695398da38477695ee..94e3260e901c5bc4b0caef9da99de8a3d4b24ba0 100644
--- a/testing/py-pycountry/APKBUILD
+++ b/testing/py-pycountry/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="ISO country, subdivision, language, currency and script definitions and their translations"
 url="http://pypi.python.org/pypi/pycountry"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="python2-dev py-lxml py-setuptools"
diff --git a/testing/py-pycryptodome/APKBUILD b/testing/py-pycryptodome/APKBUILD
index 028394b9fca4e6a457f056f5676ea1f3a59a588a..107706fcffb9b0c2fb26a9f10e844a8d3ff4f337 100644
--- a/testing/py-pycryptodome/APKBUILD
+++ b/testing/py-pycryptodome/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Self-contained cryptographic library"
 url="https://github.com/coveralls-clients/coveralls-python"
 arch="all"
-license="Apache2"
+license="Apache-2.0"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-pygfm/APKBUILD b/testing/py-pygfm/APKBUILD
index c88d8de3d5997e19b262dffb7367ce8284b2d8ba..44a185037502ab76ade3b39f07dedfb0f8218b91 100644
--- a/testing/py-pygfm/APKBUILD
+++ b/testing/py-pygfm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Basic immutable container types for Python"
 url="https://github.com/tomchristie/itypes"
 arch="noarch"
-license="BSD3"
+license="BSD-3-Clause"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
 checkdepends="py-codecov py-coverage py-coveralls py-markdown"
diff --git a/testing/py-pygtail/APKBUILD b/testing/py-pygtail/APKBUILD
index 3a6c1a7f74096253c26ac670d4b12ec6e48725c6..aa153c08d0a7f5439a0b069910766478e3e34a3a 100644
--- a/testing/py-pygtail/APKBUILD
+++ b/testing/py-pygtail/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Reads log file lines that have not been read"
 url="http://github.com/bgreenlee/pygtail"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pyparted/APKBUILD b/testing/py-pyparted/APKBUILD
index 6b1284ca34cc1b658e9fd0e75bc3b90e8b9b9b89..bfe2bd3b37ec46ba9b5412a6583dd2a264f84404 100644
--- a/testing/py-pyparted/APKBUILD
+++ b/testing/py-pyparted/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Python bindings for GNU parted (libparted)"
 url="https://github.com/rhinstaller/pyparted"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="python2-dev python3-dev py-setuptools parted-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="$pkgname-$pkgver.tar.gz::https://github.com/rhinstaller/${pkgname/py-/}/archive/v$pkgver.tar.gz"
diff --git a/testing/py-pyphen/APKBUILD b/testing/py-pyphen/APKBUILD
index da15be2fbaa23780b329e2d0d81a4a18e8e4840e..d5a5e79e2ae06582ba4ddd95c11ed663bd5a1461 100644
--- a/testing/py-pyphen/APKBUILD
+++ b/testing/py-pyphen/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="python-based dictionary hyphenator library"
 url="http://www.pyphen.org/"
 arch="noarch"
-license="GPL2+ MPL LGPL2+"
+license="GPL-2.0-or-later MPL LGPL-2.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-pyzor/APKBUILD b/testing/py-pyzor/APKBUILD
index d38d67834aae19e966610f4ba4eb70e44d446e36..1c53b9ac21bc115d5d16b3a633cea28ace0aaed9 100644
--- a/testing/py-pyzor/APKBUILD
+++ b/testing/py-pyzor/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Python implementation of a spam-blocking networked system that use spam signatures to identify them."
 url="https://pypi.python.org/pypi/pyzor/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
diff --git a/testing/py-qt/APKBUILD b/testing/py-qt/APKBUILD
index 82dfbfabad9c5bc5cd39c20b599c807408150d60..9d82e3eae0f875f33f3718c507e538fdf182b600 100644
--- a/testing/py-qt/APKBUILD
+++ b/testing/py-qt/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A set of Python bindings for the Qt toolkit"
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="py-sip"
 makedepends="python2-dev py-dbus-dev phonon-dev qt-dev py-sip-dev libx11-dev"
 subpackages=""
diff --git a/testing/py-redmine/APKBUILD b/testing/py-redmine/APKBUILD
index 659c12c27eab5ce1c3e5630a403abe8ca22b6d3b..628a93faa3eb7a6ad99639dfbb9047ce8595d340 100644
--- a/testing/py-redmine/APKBUILD
+++ b/testing/py-redmine/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A simple library for communicating with redmine"
 url="https://github.com/maxtepkeev/python-redmine"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2 py-requests"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
diff --git a/testing/py-relatorio/APKBUILD b/testing/py-relatorio/APKBUILD
index a873d4ecc0791694d1f21caec25a89f6b8cb4665..76d0cf9aafc39c4e0faba74fa1e82cf81ca96900 100644
--- a/testing/py-relatorio/APKBUILD
+++ b/testing/py-relatorio/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A templating library able to output odt and pdf files"
 url="http://relatorio.openhex.org"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-rpio/APKBUILD b/testing/py-rpio/APKBUILD
index 908a16dd6269527a2ac5fcef0cc21b0b398650c2..9c2901bfdd70bb32f92221b105abdc481d4f3ed1 100644
--- a/testing/py-rpio/APKBUILD
+++ b/testing/py-rpio/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="GPIO toolbox for the Raspberry Pi"
 url="https://github.com/metachris/RPIO"
 arch="all"
-license="LGPLv3+"
+license="LGPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-runstatus/APKBUILD b/testing/py-runstatus/APKBUILD
index 13b255918789cd5cbd6dad7d910559fb91ae5fb3..7ed62d640ff924eea438308db593099dace738e5 100644
--- a/testing/py-runstatus/APKBUILD
+++ b/testing/py-runstatus/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python library to detect program states"
 url="https://github.com/riquito/runstatus/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-s3transfer/APKBUILD b/testing/py-s3transfer/APKBUILD
index 01f3f58418074e34163f5fdb99b41b66cbf88fa0..3bf985ef56eb4b4756b25f07114f3fd8323964a2 100644
--- a/testing/py-s3transfer/APKBUILD
+++ b/testing/py-s3transfer/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Amazon S3 Transfer Manager for Python"
 url="https://github.com/boto/s3transfer"
 arch="noarch"
-license="apache2"
+license="Apache-2.0"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/boto/$_pkgname/archive/$pkgver.tar.gz"
diff --git a/testing/py-seqdiag/APKBUILD b/testing/py-seqdiag/APKBUILD
index 1e7a469ba6207b363445862793b1977f7e441221..4529bfe3f5334df988a9e402d897980b1a9f5eaf 100644
--- a/testing/py-seqdiag/APKBUILD
+++ b/testing/py-seqdiag/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="seqdiag generate sequence-diagram image file"
 url="https://pypi.python.org/pypi/seqdiag"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py-pillow py-funcparserlib py-blockdiag"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/py-sphinx-theme-epfl/APKBUILD b/testing/py-sphinx-theme-epfl/APKBUILD
index af4b01d54e6ffcf2d7afc67816ebbf89117809a8..1de3ac716be6701cc45a4520e1c59788c43243e7 100644
--- a/testing/py-sphinx-theme-epfl/APKBUILD
+++ b/testing/py-sphinx-theme-epfl/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="The EPFL Sphinx theme"
 url="http://kis-doc.epfl.ch/sphinx/"
 arch="noarch"
-license="GPL3"
+license="GPL-3.0"
 depends="python2 py-sphinx"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-gist/APKBUILD b/testing/py-sphinxcontrib-gist/APKBUILD
index 058253ab7515fdb6fc3f6c276a950ad1c9cf470c..0100d7409d05a8eaaf26be00018124aca505cde6 100644
--- a/testing/py-sphinxcontrib-gist/APKBUILD
+++ b/testing/py-sphinxcontrib-gist/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sphinx gist extension"
 url="https://pypi.python.org/pypi/sphinxcontrib-gist"
 arch="noarch"
-license="LGPL3"
+license="LGPL-3.0"
 depends="python2 py-sphinx"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-git/APKBUILD b/testing/py-sphinxcontrib-git/APKBUILD
index 2c9f665a9080f677696ad9b8e7f7e09de2bbf157..537f5ff805f91ae1de69aba5e21c9bf812fbede4 100644
--- a/testing/py-sphinxcontrib-git/APKBUILD
+++ b/testing/py-sphinxcontrib-git/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sphinx git changelog extension"
 url="https://github.com/OddBloke/sphinx-git"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2 py-sphinx py-feedformatter"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-images/APKBUILD b/testing/py-sphinxcontrib-images/APKBUILD
index b6a64697dbef60db0ee499294005a12a561f3705..d1df008fb83387ff09e68c6d4f6f5c3b8cddfc1f 100644
--- a/testing/py-sphinxcontrib-images/APKBUILD
+++ b/testing/py-sphinxcontrib-images/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sphinx images extension"
 url="https://pypi.python.org/pypi/sphinxcontrib-images"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2 py-sphinx py-requests"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-manpage/APKBUILD b/testing/py-sphinxcontrib-manpage/APKBUILD
index 0b78d1e30456f4dfa056e80c886ff9cebfe3e93e..cc2b628790991d73e7fb01b30e4b5d407c2ee5d2 100644
--- a/testing/py-sphinxcontrib-manpage/APKBUILD
+++ b/testing/py-sphinxcontrib-manpage/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sphinx manpage extension"
 url="https://pypi.python.org/pypi/sphinxcontrib-manpage"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="python2 py-sphinx py-nwdiag"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-mercurial/APKBUILD b/testing/py-sphinxcontrib-mercurial/APKBUILD
index 8433b63ffc2cdaf026fad1e2b6ec09da7397126f..87f1b723eb0de8d4a5831ca5170ad77475552e2c 100644
--- a/testing/py-sphinxcontrib-mercurial/APKBUILD
+++ b/testing/py-sphinxcontrib-mercurial/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sphinx mercurial extension"
 url="http://bitbucket.org/cointoss1973/sphinxcontrib-mercurial"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2 py-sphinx"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-sphinxcontrib-whoosh/APKBUILD b/testing/py-sphinxcontrib-whoosh/APKBUILD
index 9058f33f55b5a77e603c8cb175425a260cd7f128..15be58585c20ed89e5b1a049a74bd560ed4a7876 100644
--- a/testing/py-sphinxcontrib-whoosh/APKBUILD
+++ b/testing/py-sphinxcontrib-whoosh/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sphinx whoosh extension"
 url="https://pypi.python.org/pypi/sphinxcontrib-whoosh"
 arch="noarch"
-license="Public Domain"
+license="Public-Domain"
 depends="python2 py-sphinx"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-stdnum/APKBUILD b/testing/py-stdnum/APKBUILD
index 7f6b30a30b00c8204d8a95988f413c21afa9f73e..5481ee676b88062cef8fa8e146ae16297622bcc0 100644
--- a/testing/py-stdnum/APKBUILD
+++ b/testing/py-stdnum/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A Python module to handle standardized numbers and codes"
 url="http://arthurdejong.org/python-stdnum/"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="https://arthurdejong.org/python-stdnum/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-telegram-bot/APKBUILD b/testing/py-telegram-bot/APKBUILD
index 937f053e8bbc65f37695828fa1ba2c0e729f6d1a..97d36742be7a66307e517564b03f90a7254979f6 100644
--- a/testing/py-telegram-bot/APKBUILD
+++ b/testing/py-telegram-bot/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python wrapper around the Telegram Bot API"
 url="https://github.com/python-telegram-bot/python-telegram-bot"
 arch="noarch"
-license="LGPL3+"
+license="LGPL-3.0-or-later"
 depends="py-futures py-certifi"
 depends_dev=""
 makedepends="python2-dev python3-dev py2-setuptools"
diff --git a/testing/py-tzlocal/APKBUILD b/testing/py-tzlocal/APKBUILD
index f6048bd16f1dd0b7c177a2f7952d582c950ef6e6..931aeb67587c044a0c33f37c877e6ab3229268cb 100644
--- a/testing/py-tzlocal/APKBUILD
+++ b/testing/py-tzlocal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Python tzinfo object for the local timezone"
 url="http://pytz.sourceforge.net/"
 arch="noarch"
-license="CC0 1.0"
+license="CC0-1.0"
 depends="python2 py-tz"
 makedepends="python2-dev py-setuptools"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py-unicorn-hat/APKBUILD b/testing/py-unicorn-hat/APKBUILD
index 544412c122f4b570469aed6258ebf0693cbd2be9..bded9ea2eca9f580872b1bddc52e5f53f3f36abe 100644
--- a/testing/py-unicorn-hat/APKBUILD
+++ b/testing/py-unicorn-hat/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Python wrapper for driving ws2812 pixels from the Raspberry Pi"
 url="http://shop.pimoroni.com/products/unicorn-hat"
 arch="armhf aarch64"
-license="GPL2"
+license="GPL-2.0"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-urlobject/APKBUILD b/testing/py-urlobject/APKBUILD
index 84e3d472157c1ac9dde0cbb5fd27ecd44ca9099a..49a57b7b9cc50da4f469cc75f2fda0c6a286351f 100644
--- a/testing/py-urlobject/APKBUILD
+++ b/testing/py-urlobject/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python utility class for manipulating URLs"
 url="https://github.com/dperezrada/html2data"
 arch="noarch"
-license="Public Domain"
+license="Public-Domain"
 options="!check"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-vatnumber/APKBUILD b/testing/py-vatnumber/APKBUILD
index 1dd04d779702f7a2aceab254166301136e4a4300..7e0f65e3ef141dc8ce75c54cc03d2004cd000ca0 100644
--- a/testing/py-vatnumber/APKBUILD
+++ b/testing/py-vatnumber/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python module to validate VAT numbers"
 url="http://code.google.com/p/vatnumber/"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-wbdata/APKBUILD b/testing/py-wbdata/APKBUILD
index c5641168f78277feb1a00fdeaf42dce2f28170e5..c9e00bbd3e18b249b2ace2347fd44dc56c318041 100644
--- a/testing/py-wbdata/APKBUILD
+++ b/testing/py-wbdata/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A library to access World Bank data"
 url="https://github.com/oliversherouse/wbdata"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-whoispy/APKBUILD b/testing/py-whoispy/APKBUILD
index 5f4844a6c460ac8298f26996406707f5f77b2aee..1a9c8ed90e443ea09e4f9386a2cc64f9f970e08d 100644
--- a/testing/py-whoispy/APKBUILD
+++ b/testing/py-whoispy/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python module/library to get the WHOIS information"
 url="https://github.com/nemumu/whoispy"
 arch="noarch"
-license="GPL3+"
+license="GPL-3.0-or-later"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-xlib/APKBUILD b/testing/py-xlib/APKBUILD
index a5cff29773b35d5679a2de9cee0c894b9caa5914..0a664f342536af4943325901054daf3a092163e3 100644
--- a/testing/py-xlib/APKBUILD
+++ b/testing/py-xlib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A fully functional X client library for Python programs"
 url="https://github.com/python-xlib/python-xlib"
 arch="noarch"
-license="LGPL2"
+license="LGPL-2.0"
 depends="py-six"
 checkdepends="xvfb"
 makedepends="python2-dev python3-dev py-setuptools"
diff --git a/testing/py-zeroconf/APKBUILD b/testing/py-zeroconf/APKBUILD
index a6c52e8b12f409261b9cd6467904ee28d1f592c4..994a2c181d98fea5897fc276ba18877508bdb833 100644
--- a/testing/py-zeroconf/APKBUILD
+++ b/testing/py-zeroconf/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A Python implementation of multicast DNS service discovery"
 url="https://github.com/jstasiak/python-zeroconf"
 arch="noarch"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="py-six py-netifaces"
 makedepends="python2-dev py-setuptools python3-dev"
 subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
diff --git a/testing/py-zope-configuration/APKBUILD b/testing/py-zope-configuration/APKBUILD
index 793884a3f4d4d7605bb9cf0d2ca25faec00dcb23..c1c6f122cb1cc17a4a5e2b06c779375759815403 100644
--- a/testing/py-zope-configuration/APKBUILD
+++ b/testing/py-zope-configuration/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Zope Configuration Markup Language"
 url="http://pypi.python.org/pypi/zope.configuration"
 arch="noarch"
-license="ZPL2+"
+license="ZPL-2.1"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py-zope-deprecation/APKBUILD b/testing/py-zope-deprecation/APKBUILD
index a0882f70414369b45afc8ae205572bf3c1fab562..88667793d5c86c87b63a489adcee85d287cb3c3b 100644
--- a/testing/py-zope-deprecation/APKBUILD
+++ b/testing/py-zope-deprecation/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Zope Deprecation Infrastructure"
 url="https://pypi.python.org/pypi/zope.deprecation"
 arch="noarch"
-license="ZPL2+"
+license="ZPL-2.1"
 depends="python2"
 depends_dev=""
 makedepends="python2-dev py-setuptools"
diff --git a/testing/py3-aiohttp-debugtoolbar/APKBUILD b/testing/py3-aiohttp-debugtoolbar/APKBUILD
index 6b0ecc95edae5f47463cdeca9c9fcabaa4ad8577..9f7d492eb2272620e7781a823d27505aa3ff07e3 100644
--- a/testing/py3-aiohttp-debugtoolbar/APKBUILD
+++ b/testing/py3-aiohttp-debugtoolbar/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A ibrary for debugtoolbar support for aiohttp"
 url="https://github.com/aio-libs/aiohttp-debugtoolbar"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py3-aiohttp py3-aiohttp-jinja2"
 makedepends="python3-dev"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
diff --git a/testing/py3-aiohttp-jinja2/APKBUILD b/testing/py3-aiohttp-jinja2/APKBUILD
index 8c368fa81dcabaa7065af3b61bce5a53d45e3401..ae2e6b99b9a19dcd0bb7b9cc35bab17c292c6652 100644
--- a/testing/py3-aiohttp-jinja2/APKBUILD
+++ b/testing/py3-aiohttp-jinja2/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Jinja2 template renderer for aiohttp"
 url="https://github.com/aio-libs/aiohttp-jinja2"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py3-aiohttp py3-jinja2"
 makedepends="python3-dev"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/aio-libs/aiohttp-jinja2/archive/v$pkgver.tar.gz"
diff --git a/testing/py3-aiohttp-session/APKBUILD b/testing/py3-aiohttp-session/APKBUILD
index c92dca4f290c2ff38405a9d844cc8574069cbcde..e3f3f5da0d10d889bba2ea02a0301934e4db8615 100644
--- a/testing/py3-aiohttp-session/APKBUILD
+++ b/testing/py3-aiohttp-session/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Sessions support for aiohttp"
 url="http://aiohttp-session.readthedocs.io/"
 arch="noarch"
-license="ASL 2.0"
+license="Apache-2.0"
 depends="py3-aiohttp"
 makedepends="python3-dev"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/aio-libs/aiohttp-session/archive/v1.0.1.tar.gz"
diff --git a/testing/py3-pygpgme/APKBUILD b/testing/py3-pygpgme/APKBUILD
index 5c34d834e742f19ed5541bf1c7613a92863918fe..34e51b4a61a3803e0f7e547242928dd786d5d8a5 100644
--- a/testing/py3-pygpgme/APKBUILD
+++ b/testing/py3-pygpgme/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="PyGPGME is a Python module that lets you sign, verify, encrypt and decrypt messages using the OpenPGP format."
 url="https://launchpad.net/pygpgme"
 arch="all"
-license="LGPL2.1"
+license="LGPL-2.1"
 depends="python3 gpgme"
 makedepends="python3-dev gpgme-dev"
 subpackages=""
diff --git a/testing/py3-unoconv/APKBUILD b/testing/py3-unoconv/APKBUILD
index 60733aefe1930e38d06d8911629d19db60af331d..981eee0c1dfd10f08762125e56457894d33e0732 100644
--- a/testing/py3-unoconv/APKBUILD
+++ b/testing/py3-unoconv/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Tool to convert between any document format supported by LibreOffice"
 url="http://dag.wieers.com/home-made/unoconv/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="libreoffice python3"
 makedepends="python3-dev py-setuptools"
 subpackages=""
diff --git a/testing/pylint/APKBUILD b/testing/pylint/APKBUILD
index 541bb2011db6895d73648b0800d445dbf35d2668..89a2ab0d9a87bb62dc3d2bc71fd2296433cd0a29 100644
--- a/testing/pylint/APKBUILD
+++ b/testing/pylint/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Analyzes Python code looking for bugs and signs of poor quality"
 url="http://pypi.python.org/pypi/pylint"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="py-mccabe py-six py-isort py-astroid"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
diff --git a/testing/qperf/APKBUILD b/testing/qperf/APKBUILD
index b73b22f8bee333d35550fc4eb25427bbb98c171e..015def2821eae2c575fd7d9d35c428f016c5e18f 100644
--- a/testing/qperf/APKBUILD
+++ b/testing/qperf/APKBUILD
@@ -7,7 +7,7 @@ url="https://www.openfabrics.org"
 arch="all"
 makedepends="perl perl-doc"
 subpackages="$pkgname-doc"
-license="GPL2"
+license="GPL-2.0"
 source="https://www.openfabrics.org/downloads/qperf/$pkgname-$pkgver.tar.gz"
 
 builddir="$srcdir"/"$pkgname"-"$pkgver"
diff --git a/testing/qt-creator/APKBUILD b/testing/qt-creator/APKBUILD
index f0cceb930149081fb20c3afe10564531f7584334..49747e906596a00beaac3db5aab67fc3dc85fa7a 100644
--- a/testing/qt-creator/APKBUILD
+++ b/testing/qt-creator/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Lightweight and cross-platform IDE for Qt"
 url="https://qt-project.org/wiki/Category:Tools::QtCreator"
 arch="all !aarch64 !ppc64le"
-license="LGPLv2 with exceptions"
+license="LGPL-2.0 with exceptions"
 depends=""
 depends_dev=""
 makedepends="$depends_dev qt-dev qt-private-dev paxmark"
diff --git a/testing/qt5-qtconnectivity/APKBUILD b/testing/qt5-qtconnectivity/APKBUILD
index 7f750c1e5be7446323e4691b9732a07460861903..12134e45355a287f3015c62c7131961d85da92cd 100644
--- a/testing/qt5-qtconnectivity/APKBUILD
+++ b/testing/qt5-qtconnectivity/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="QT5 Connectivity Compontents"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 options="!check" #upstream does not provide check
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtlocation/APKBUILD b/testing/qt5-qtlocation/APKBUILD
index 647c7ef01277ea21a3567ec1a3f660c38d30286c..a26ebf76e90b38e8ff409aa475d7d085ef5053ca 100644
--- a/testing/qt5-qtlocation/APKBUILD
+++ b/testing/qt5-qtlocation/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Qt5 - Location component"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 options="!check" # upstream does not provide check
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtquickcontrols2/APKBUILD b/testing/qt5-qtquickcontrols2/APKBUILD
index d9d45c53e3b0771db34f49f28a9151cdc9d1773c..be76687057a8889e3939abcead89664b03f18ad2 100644
--- a/testing/qt5-qtquickcontrols2/APKBUILD
+++ b/testing/qt5-qtquickcontrols2/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Qt5 - module with set of QtQuick controls for embedded"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 options="!check" #upstream does not provide check
 depends="qt5-qtgraphicaleffects"
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
diff --git a/testing/qt5-qtremoteobjects/APKBUILD b/testing/qt5-qtremoteobjects/APKBUILD
index 58f0401a26520bf8cb9d8e4afec69fc36efb36a8..47f2dc9bb2eb726b04af402ad97a1a90d619c385 100644
--- a/testing/qt5-qtremoteobjects/APKBUILD
+++ b/testing/qt5-qtremoteobjects/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="Qt Remote Objects (QtRO) is an inter-process communication (IPC) module developed for Qt"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 options="!check" #upstream does not provide check
 makedepends="qt5-qtbase-dev"
 subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtsensors/APKBUILD b/testing/qt5-qtsensors/APKBUILD
index 6fe9603ca7a92be85fd926164a48a248d9a6965c..40f6c7f600c6e60a023b1963ae76002ba919dadb 100644
--- a/testing/qt5-qtsensors/APKBUILD
+++ b/testing/qt5-qtsensors/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="+The Qt Sensors API provides access to sensor hardware via QML and C++"
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 options="!check" #upstream does not provide check
 makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
 subpackages="$pkgname-dev"
diff --git a/testing/qt5-qtwebchannel/APKBUILD b/testing/qt5-qtwebchannel/APKBUILD
index fd2793200d87750ca2dcad4d3973aad287eae0f1..de20d7bbf4ca1b0c2fbb825e702b0cf6db684aaa 100644
--- a/testing/qt5-qtwebchannel/APKBUILD
+++ b/testing/qt5-qtwebchannel/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
 pkgdesc="library for seamless integration of C++ +and QML applications with HTML/JavaScript clients."
 url="http://qt-project.org/"
 arch="all"
-license="LGPLv2 with exceptions or GPLv3 with exceptions"
+license="LGPL-2.0 with exceptions or GPL-3.0 with exceptions"
 options="!check" #upstream does not provide check
 makedepends="qt5-qtbase-dev qt5-websockets-dev"
 subpackages="$pkgname-dev"
diff --git a/testing/rabbitmq-server/APKBUILD b/testing/rabbitmq-server/APKBUILD
index a63f049f757a8c09b777cf22c0cfdc0973918eb3..8f21ecc3f12e76e0a429848d89553b0a9a695a37 100644
--- a/testing/rabbitmq-server/APKBUILD
+++ b/testing/rabbitmq-server/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="RabbitMQ is an open source multi-protocol messaging broker."
 url="http://www.rabbitmq.com/"
 arch="noarch"
-license="MPL 1.1"
+license="MPL-1.1"
 depends="erlang erlang-tools erlang-runtime-tools erlang-stdlib
 	logrotate erlang-ssl erlang-crypto erlang-parsetools
 	erlang-mnesia erlang-sasl erlang-inets erlang-syntax-tools
diff --git a/testing/radare2/APKBUILD b/testing/radare2/APKBUILD
index b64bc17156ac42cb644fe3697f1e7088899079fe..0e3bab4839bc7039b48cd18a2ac7147ce1a1d295 100644
--- a/testing/radare2/APKBUILD
+++ b/testing/radare2/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
 pkgdesc="An opensource, crossplatform reverse engineering framework"
 url="http://www.radare.org"
 arch="all !aarch64"
-license="GPLv3"
+license="GPL-3.0"
 options="!check" # upstream does not provide any working testsuite
 depends=""
 depends_dev=""
diff --git a/testing/radicale/APKBUILD b/testing/radicale/APKBUILD
index 46b840a649e50698bfe6f22d8bded0cb27fdb390..ff88d6aebf4656c3578b65d0aba6020e26194a7f 100644
--- a/testing/radicale/APKBUILD
+++ b/testing/radicale/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A simple CalDAV (calendar) and CardDAV (contact) server"
 url="http://radicale.org"
 arch="noarch"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends="python3 py3-vobject"
 pkgusers="radicale"
 pkggroups="radicale"
diff --git a/testing/rcs/APKBUILD b/testing/rcs/APKBUILD
index bed4abb80eac57fec75d175651de0011a93c1654..115a712b69ccb924cd82e45ebd7bf3192d83a515 100644
--- a/testing/rcs/APKBUILD
+++ b/testing/rcs/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Revision Control System"
 url="https://www.gnu.org/software/rcs"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends="diffutils"
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/testing/reaver-wps-fork-t6x/APKBUILD b/testing/reaver-wps-fork-t6x/APKBUILD
index 2724eb3ccf3b346d0e1c81b16d0632563fd6b8b2..f94071f88df1a3ef17861007fda83486fb55148e 100644
--- a/testing/reaver-wps-fork-t6x/APKBUILD
+++ b/testing/reaver-wps-fork-t6x/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Community forked version of reaver, the WPS password cracker"
 url="https://github.com/t6x/reaver-wps-fork-t6x"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="pixiewps sqlite aircrack-ng"
 makedepends="libpcap-dev sqlite-dev linux-headers"
 install=""
diff --git a/testing/recoll/APKBUILD b/testing/recoll/APKBUILD
index c014064879274e69fe2cc014da8c74e349775ded..6599f860fb1fea355d037e24156dbdb525c8c6c4 100644
--- a/testing/recoll/APKBUILD
+++ b/testing/recoll/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Desktop full-text search tool"
 url="http://www.lesbonscomptes.com/recoll/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="file libx11-dev libxslt-dev qt-dev xapian-core-dev zlib-dev"
 subpackages="$pkgname-doc"
 source="http://www.lesbonscomptes.com/recoll/recoll-$pkgver.tar.gz
diff --git a/testing/refpolicy/APKBUILD b/testing/refpolicy/APKBUILD
index 5d402181910f36d532255708db1d9766cf542662..6cd1732ee040fddc9961f38c54a541b842e75cbb 100644
--- a/testing/refpolicy/APKBUILD
+++ b/testing/refpolicy/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="SELinux policy reference"
 url="https://github.com/TresysTechnology/refpolicy/wiki"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev checkpolicy python gawk"
diff --git a/testing/rlwrap/APKBUILD b/testing/rlwrap/APKBUILD
index 120ee3d91d4f6060ede8653dfdcc0debc4679b49..2f38a193efad52f3a80b92567c1ddb4636ed3b76 100644
--- a/testing/rlwrap/APKBUILD
+++ b/testing/rlwrap/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A readline wrapper"
 url="https://github.com/hanslub42/rlwrap"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev readline-dev ncurses-dev"
diff --git a/testing/sane/APKBUILD b/testing/sane/APKBUILD
index 04d84f6b899cb59533305e2316d49442881051b4..c1375da5a3eb73809689d028c1b3cb4f4eb56ba1 100644
--- a/testing/sane/APKBUILD
+++ b/testing/sane/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Scanner Access Now Easy - an universal scanner interface"
 url="http://www.sane-project.org/"
 arch="x86 x86_64"
-license="GPLv2.0+ GPLv2.0+-with-sane-exception public-domain"
+license="GPL-2.0-or-later GPL-2.0-or-later-with-sane-exception Public-Domain"
 depends=""
 depends_dev=""
 makedepends="diffutils file libtool libusb-dev v4l-utils-dev net-snmp-dev avahi-dev libpng-dev
diff --git a/testing/sbt/APKBUILD b/testing/sbt/APKBUILD
index f35f5add6823cbef3299cb746715c3c65a6fac9f..8e795ff315f2b442bb86464c85a611e79cf49761 100644
--- a/testing/sbt/APKBUILD
+++ b/testing/sbt/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="The interactive build tool, sbt is a build tool for Scala, Java, and more."
 url="http://www.scala-sbt.org/"
 arch="noarch"
-license="BSD-3"
+license="BSD-3-Clause"
 depends="openjdk8-jre bash"
 source="https://dl.bintray.com/$pkgname/native-packages/$pkgname/$pkgver/$pkgname-$pkgver.tgz
 global-sbtopts.patch"
diff --git a/testing/sch-cake-hardened/APKBUILD b/testing/sch-cake-hardened/APKBUILD
index f2204633b30cc877d022019d8cf2e07e67ee76fe..9b56e176080c70b1dba016b2dc6a42b19d3824d8 100644
--- a/testing/sch-cake-hardened/APKBUILD
+++ b/testing/sch-cake-hardened/APKBUILD
@@ -29,7 +29,7 @@ pkgrel=0
 pkgdesc="Out of tree build for the new cake qdisc"
 url="https://github.com/dtaht/sch_cake"
 arch="x86 x86_64 armhf"
-license="Dual BSD/GPL"
+license="BSD or GPL"
 depends="linux-${_flavor}=${_kernelver}"
 makedepends="linux-${_flavor}-dev=${_kernelver} linux-headers"
 install=
diff --git a/testing/setroot/APKBUILD b/testing/setroot/APKBUILD
index beb9b28ac5a8f9043ee7b6ac59f1e552d5cba8be..a20123140240fc276ee7697c64b0f5ce8bd3ede9 100644
--- a/testing/setroot/APKBUILD
+++ b/testing/setroot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Simple X background setter inspired by imlibsetroot and feh"
 url="https://github.com/ttzhou/setroot"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev="imlib2-dev"
 makedepends="$depends_dev"
diff --git a/testing/shadowsocks-libev/APKBUILD b/testing/shadowsocks-libev/APKBUILD
index 99121261c476be5f1627f8351ea8e703720ab70d..dd870b621f20d59352954956d5133985ca60ec3e 100644
--- a/testing/shadowsocks-libev/APKBUILD
+++ b/testing/shadowsocks-libev/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="lightweight secured SOCKS5 proxy"
 url="https://shadowsocks.org/en/download/servers.html"
 arch="all"
-license="GPLv3"
+license="GPL-3.0"
 depends=""
 makedepends="asciidoc autoconf libtool linux-headers
 	libressl-dev pcre-dev xmlto libev-dev udns-dev libsodium-dev zlib-dev"
diff --git a/testing/shellinabox/APKBUILD b/testing/shellinabox/APKBUILD
index 0f7516f52f19a915ad43de54a8c6efeac3794c74..b1c56a55d38624420dfb76ab53382752d1673cc7 100644
--- a/testing/shellinabox/APKBUILD
+++ b/testing/shellinabox/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Implementation of a web server that can export arbitrary command line tools to a web based terminal emulator"
 url="https://github.com/shellinabox/shellinabox"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="autoconf automake m4 libtool libressl-dev zlib-dev"
 subpackages="$pkgname-doc"
 pkgusers="$_daemonname"
diff --git a/testing/shine/APKBUILD b/testing/shine/APKBUILD
index 5998c6514f9fb875012495c0431fb01619a0b43f..0f23e53fb10d079348781c850c8d607fc357cfaf 100644
--- a/testing/shine/APKBUILD
+++ b/testing/shine/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Shine: fast fixed-point mp3 encoding"
 url="https://github.com/toots/shine"
 arch="all"
-license="LGPL2"
+license="LGPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev libtool automake autoconf"
diff --git a/testing/shotcut/APKBUILD b/testing/shotcut/APKBUILD
index aa9bca4ed3e414c58a1e5196451681af7a7b0656..6aedce925b7090655d115aea3bdc08c271a880a5 100644
--- a/testing/shotcut/APKBUILD
+++ b/testing/shotcut/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="a free, open source, cross-platform video editor"
 url="https://www.shotcut.org"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtmultimedia-dev
 	qt5-websockets-dev qt5-x11extras-dev ffmpeg-dev mlt-dev"
diff --git a/testing/simple-scan/APKBUILD b/testing/simple-scan/APKBUILD
index 00e840c2af53df95a5444339928c8ccc7457f4fa..8ca2f53d960489c0af474bd691b0f2f0cd97d52a 100644
--- a/testing/simple-scan/APKBUILD
+++ b/testing/simple-scan/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Simple Scan allows you to get images from a scanner"
 url="https://launchpad.net/simple-scan"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 makedepends="sane-dev dconf-dev gtk+3.0-dev colord-dev libgusb-dev vala itstool
 	libxml2-utils"
 subpackages="$pkgname-doc"
diff --git a/testing/snapraid/APKBUILD b/testing/snapraid/APKBUILD
index 5e855a7f7794b5fdcb37c918271757308d252e7d..548b9529cd891ca487fed0235c40435f53d41c6b 100644
--- a/testing/snapraid/APKBUILD
+++ b/testing/snapraid/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A backup program for disk arrays"
 url="http://www.snapraid.it"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/amadvance/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
 
diff --git a/testing/softhsm/APKBUILD b/testing/softhsm/APKBUILD
index 99a7b6ea0b32fbc7725e2051a779fb5a552d0068..92c640b382cf6ebd055463c01344bb7528b22448 100644
--- a/testing/softhsm/APKBUILD
+++ b/testing/softhsm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="cryptographic store accessible through a PKCS #11"
 url="http://www.softhsm.org/"
 arch="all"
-license="BSD2"
+license="BSD-2-Clause"
 depends="libressl"
 makedepends="libressl-dev automake autoconf libtool file"
 install=""
diff --git a/testing/spreed-webrtc/APKBUILD b/testing/spreed-webrtc/APKBUILD
index 8789cda569c81e15f22b16e1161974f52982e1ee..d2d5a5f9cb58f805a26cd37567d56a7f5b1d16ea 100644
--- a/testing/spreed-webrtc/APKBUILD
+++ b/testing/spreed-webrtc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="WebRTC audio/video call and conferencing server"
 url="http://spreed.me"
 arch="all"
-license="AGPL3"
+license="AGPL-3.0"
 depends=
 depends_dev=
 makedepends="$depends_dev autoconf automake go go-context go-acceptlanguageparser
diff --git a/testing/sqm-scripts/APKBUILD b/testing/sqm-scripts/APKBUILD
index e4adb7223967bf254b126761ef5b8a843a85281b..7245c23aa3601f212d8fe2b945c72eac24598ebb 100644
--- a/testing/sqm-scripts/APKBUILD
+++ b/testing/sqm-scripts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="SQM scripts traffic shaper"
 url="https://github.com/tohojo/sqm-scripts"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends="iproute2 iptables ip6tables"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/testing/sslh/APKBUILD b/testing/sslh/APKBUILD
index efcd23d8c88e16839c62d9c5caf865fac0a79c3a..2af08340b739ef5e9ea9ce3032ff2c0593ebae9a 100644
--- a/testing/sslh/APKBUILD
+++ b/testing/sslh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port) "
 url="http://www.rutschle.net/tech/sslh.shtml"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libconfig-dev libcap-dev pcre-dev perl"
 subpackages="$pkgname-doc"
 options="!check"
diff --git a/testing/stargazer/APKBUILD b/testing/stargazer/APKBUILD
index a707df3c29ad7647a9e3d87c85b040fe8a89234e..1adcde132629717e5d5d971b9e08b0e1bb44f697 100644
--- a/testing/stargazer/APKBUILD
+++ b/testing/stargazer/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A billing system for small home and office networks"
 url="http://www.stg.dp.ua"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 makedepends="expat-dev linux-headers"
 install=""
diff --git a/testing/stoken/APKBUILD b/testing/stoken/APKBUILD
index 797b1ac909e3544f41dcc05874bc8cb60e5e9401..709344672c419c53d548acb30e08cce9812ac435 100644
--- a/testing/stoken/APKBUILD
+++ b/testing/stoken/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="RSA SecurID-compatible software token for Linux/UNIX systems"
 url="http://stoken.sf.net"
 arch="all"
-license="LGPLv2.1+"
+license="LGPL-2.1-or-later"
 makedepends="autoconf automake libtool libxml2-dev nettle-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/cernekee/$pkgname/archive/v$pkgver.tar.gz"
diff --git a/testing/subtitleeditor/APKBUILD b/testing/subtitleeditor/APKBUILD
index 305cdc6c7fe953d6b2cf0b751cdbb9fe7119ba0d..ea8e55d3c301024c32c283662fda86c1afbf6a26 100644
--- a/testing/subtitleeditor/APKBUILD
+++ b/testing/subtitleeditor/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="GTK+3 tool to create and edit subtitles."
 url="http://home.gna.org/subtitleeditor/"
 arch="x86 x86_64"
-license="GPL3"
+license="GPL-3.0"
 makedepends="libxml++-2.6-dev enchant-dev libsigc++-dev xdg-utils gtkmm3-dev gtk+3.0-dev
 	gst-plugins-base1-dev gstreamer1-dev gstreamermm-dev iso-codes-dev gst-libav1
 	desktop-file-utils gst-plugins-ugly1"
diff --git a/testing/swaks/APKBUILD b/testing/swaks/APKBUILD
index b6458380f5375892d5a171d22a9e6076073f91d5..a82ad45dd0ae61a2ea6eb88330218b96b8f49803 100644
--- a/testing/swaks/APKBUILD
+++ b/testing/swaks/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Swiss Army Knife for SMTP"
 url="http://www.jetmore.org/john/code/swaks/"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="perl"
 install=""
 subpackages="$pkgname-doc"
diff --git a/testing/tanidvr/APKBUILD b/testing/tanidvr/APKBUILD
index 10fea3d34131e630582be86a5acba35ed8427568..93bea5960c84b20d2ed6f3388082e7aa08dc3899 100644
--- a/testing/tanidvr/APKBUILD
+++ b/testing/tanidvr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="a CLI tool for accessing DVRs and IP cameras based on the proprietary DVR-IP protocol (port 37777/TCP)"
 url="http://tanidvr.sourceforge.net"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=
 depends_dev=
 makedepends=
diff --git a/testing/tcc/APKBUILD b/testing/tcc/APKBUILD
index cffb5d15ee2a2c56a67143c0cdba3abb97c552be..c8bde7628e74de05a6d05644ea8571dd8b3f21cf 100644
--- a/testing/tcc/APKBUILD
+++ b/testing/tcc/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
 pkgdesc="Tiny C Compiler"
 url="http://repo.or.cz/tinycc.git"
 arch="all !ppc64le"
-license="LGPL2.1"
+license="LGPL-2.1"
 makedepends="texinfo"
 options="!check" # test suite currently fails on the server
 source="$pkgname-$pkgver.tar.gz::http://repo.or.cz/tinycc.git/snapshot/$_commit.tar.gz"
diff --git a/testing/tcpreplay/APKBUILD b/testing/tcpreplay/APKBUILD
index 472aff054657243ec46925e56b504e929f22f3f4..f7fc1e1f41e0714ad264f21f20c64b92a829c53e 100644
--- a/testing/tcpreplay/APKBUILD
+++ b/testing/tcpreplay/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Replay captured network traffic"
 url="http://tcpreplay.synfin.net/trac/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 depends_dev=""
 makedepends="libdnet-dev libpcap-dev tcpdump"
diff --git a/testing/tcsh/APKBUILD b/testing/tcsh/APKBUILD
index 3cf154385f10496f4862741f59cb9d78d72f5694..95d031a220436720d32dfab40a9191ed7b37ca8d 100644
--- a/testing/tcsh/APKBUILD
+++ b/testing/tcsh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="extended C-shell"
 url="http://www.tcsh.org"
 arch="all"
-license="bsd"
+license="BSD"
 depends=""
 makedepends="ncurses-dev"
 install=""
diff --git a/testing/td-agent-bit/APKBUILD b/testing/td-agent-bit/APKBUILD
index d0914bd5c4342e9b27f9bfd117645ec292d02783..6224486d02dd42f6ee57a4494829328a936062a1 100644
--- a/testing/td-agent-bit/APKBUILD
+++ b/testing/td-agent-bit/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Fast and Lightweight Log/Data Forwarder [fluent-bit]"
 url="http://fluentbit.io"
 arch="all !aarch64"
-license="Apache2.0"
+license="Apache-2.0"
 makedepends="cmake linux-headers zlib-dev mbedtls-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://fluentbit.io/releases/0.10/$_pkgname-$pkgver.tar.gz
diff --git a/testing/thermald/APKBUILD b/testing/thermald/APKBUILD
index b2618b1976b7276a8a023aec1b68b9afc6227f99..f525d2eb510ff315d64e032c6462afcc83bd9550 100644
--- a/testing/thermald/APKBUILD
+++ b/testing/thermald/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Thermal daemon for IA"
 url="https://github.com/01org/thermal_daemon"
 arch="all !armhf !aarch64"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends="autoconf automake libtool dbus-glib-dev libxml2-dev linux-headers"
 subpackages="$pkgname-doc"
diff --git a/testing/tiptop/APKBUILD b/testing/tiptop/APKBUILD
index d57ab3033d5214c9916a31b93c0dfd4c3852dbb2..a5889ab51998dcc25029be670a4c3bcdb4d0b1c4 100644
--- a/testing/tiptop/APKBUILD
+++ b/testing/tiptop/APKBUILD
@@ -12,7 +12,7 @@ url="http://tiptop.gforge.inria.fr"
 # elsewhere but without the aforementioned hardware support and kernel
 # support, nothing of use will happen when run.
 arch="x86 x86_64"
-license="GPL2"
+license="GPL-2.0"
 makedepends="byacc flex linux-headers ncurses-dev libxml2-dev"
 subpackages="$pkgname-doc"
 source="http://$pkgname.gforge.inria.fr/releases/$pkgname-$pkgver.tar.gz"
diff --git a/testing/tlp/APKBUILD b/testing/tlp/APKBUILD
index 838ac3b3b70bf6c637ba65724a069b5eabe6b7fa..4203d3a0ec0d10c9771102085c128c3d31f5bd92 100644
--- a/testing/tlp/APKBUILD
+++ b/testing/tlp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Linux Advanced Power Management"
 url="http://linrunner.de/en/tlp/tlp.html"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 subpackages="$pkgname-doc $pkgname-rdw:rdw $pkgname-bash-completion:bashcomp"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/linrunner/${_pkgname}/archive/${pkgver}.tar.gz
 	$pkgname.initd"
diff --git a/testing/ts/APKBUILD b/testing/ts/APKBUILD
index c25833b4d9d2494af5bbf939f89b6d3a110f8a8c..4bcf8b27401f82f306b8e3d18bd2e1a050330212 100644
--- a/testing/ts/APKBUILD
+++ b/testing/ts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Unix batch system where the tasks spooled run one after the other"
 url="http://vicerveza.homeunix.net/~viric/soft/ts/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev bash"
diff --git a/testing/tsung/APKBUILD b/testing/tsung/APKBUILD
index 0c2dc0ec7e2b1090ca99d903bc2832ed9d5537f5..8037120c568f058862fdffb1adb198d7eed07f49 100644
--- a/testing/tsung/APKBUILD
+++ b/testing/tsung/APKBUILD
@@ -6,7 +6,7 @@ pkgver=1.7.0
 pkgrel=0
 pkgdesc="Tsung is a high-performance benchmark framework for various protocols including HTTP,XMPP,LDAP,etc."
 url="http://www.process-one.net/en/tsung/"
-license="GPL2"
+license="GPL-2.0"
 arch="noarch !armhf"
 depends="bash
          erlang
diff --git a/testing/ttf-font-awesome/APKBUILD b/testing/ttf-font-awesome/APKBUILD
index 60620198d08730930f6877bb5702957ee78de022..fc70f86e97a1fb10c1073bfa161bc5fc275c9cb6 100644
--- a/testing/ttf-font-awesome/APKBUILD
+++ b/testing/ttf-font-awesome/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Iconic font designed for Bootstrap TTF file only"
 url="http://fortawesome.github.io/Font-Awesome/"
 arch="noarch"
-license="CCPL"
+license="CC"
 depends="fontconfig mkfontdir mkfontscale"
 makedepends="font-util-dev"
 install="$pkgname.post-install"
diff --git a/testing/twemproxy/APKBUILD b/testing/twemproxy/APKBUILD
index d1e12089540f4bbf8ccf08529c30f399b369bc96..9ee7379f52ab08bae1a1b086e6bcff27f9f5136f 100644
--- a/testing/twemproxy/APKBUILD
+++ b/testing/twemproxy/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="A fast, light-weight proxy for memcached and redis"
 url="https://github.com/twitter/twemproxy"
 arch="all"
-license="ASL 2.0"
+license="Apache-2.0"
 depends=""
 depends_dev=""
 makedepends="automake autoconf libtool yaml-dev"
diff --git a/testing/ucspi-tcp/APKBUILD b/testing/ucspi-tcp/APKBUILD
index ce8a7518318591212766192b280ead466f69d05d..a878d5cb79c20a06ec490bd6f406e03ac0ec9262 100644
--- a/testing/ucspi-tcp/APKBUILD
+++ b/testing/ucspi-tcp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Easy-to-use command-line tools for building TCP client-server applications."
 url="http://cr.yp.to/ucspi-tcp.html"
 arch="all"
-license="public-domain"
+license="Public-Domain"
 depends=""
 makedepends=""
 source="http://cr.yp.to/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/testing/udpcast/APKBUILD b/testing/udpcast/APKBUILD
index c253e908f6346b283e68b9018d3b3272f25a1912..58b0605df0be616fa913626c0ba13c5f89cb6b0b 100644
--- a/testing/udpcast/APKBUILD
+++ b/testing/udpcast/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Port of UDPcast file transfer tool"
 url="https://www.udpcast.linux.lu/index.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev linux-headers m4 perl"
diff --git a/testing/upmpdcli/APKBUILD b/testing/upmpdcli/APKBUILD
index 912606efac1b44f120d48c85749712510bf14d30..e2f61fc6ebbfd3e3e3d543a4ff898a42d658ee29 100644
--- a/testing/upmpdcli/APKBUILD
+++ b/testing/upmpdcli/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="upmpdcli is a UPnP Media Renderer front-end for MPD, the Music Player Daemon"
 url="http://www.lesbonscomptes.com/upmpdcli"
 arch="all !armhf"
-license="GPL2"
+license="GPL-2.0"
 options="!check"
 depends=""
 makedepends="libupnpp-dev libmpdclient-dev libmicrohttpd-dev jsoncpp-dev"
diff --git a/testing/ustr/APKBUILD b/testing/ustr/APKBUILD
index 5cde6920c23c1b437417ee4449e84ba594c7e9a2..e01a91828f03865cdcee8a1aef3573f016535f16 100644
--- a/testing/ustr/APKBUILD
+++ b/testing/ustr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="String library, very low memory overhead, simple to import"
 url="http://www.and.org/ustr/"
 arch="all"
-license="MIT or LGPLv2+ or BSD"
+license="MIT or LGPL-2.0-or-later or BSD"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/testing/uucp/APKBUILD b/testing/uucp/APKBUILD
index cd456d23d4f9e1f0f55ab4ad73e586ee6aba8d97..dd807eedc40a53b9d018489843dd4341a5bb0378 100644
--- a/testing/uucp/APKBUILD
+++ b/testing/uucp/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="Taylor UUCP is a free implementation of UUCP"
 url="http://airs.com/ian/uucp.html"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/testing/vdr/APKBUILD b/testing/vdr/APKBUILD
index 68b3f48757b5f358827e464fb44f0c97689b2b50..402f80598354d5859c1b84102ca1293ab5d782e4 100644
--- a/testing/vdr/APKBUILD
+++ b/testing/vdr/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Video Disk Recorder"
 url="http://www.tvdr.de/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="libexecinfo-dev fontconfig-dev freetype-dev gettext-dev libjpeg-turbo-dev fribidi-dev
 	libcap-dev alsa-lib-dev libvdpau-dev libva-dev libx11-dev xcb-util-dev xcb-util-wm-dev
diff --git a/testing/viewnior/APKBUILD b/testing/viewnior/APKBUILD
index ef280bac3ee143953104b0992696dba0e04a7b9a..37d0a08d7b94f07d9f95adc5541df6b93bcd2dbd 100644
--- a/testing/viewnior/APKBUILD
+++ b/testing/viewnior/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A fast and simple image viewer"
 url="http://siyanpanayotov.com/project/viewnior"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="autoconf automake gnome-common gtk+2.0-dev exiv2-dev libtool"
 subpackages="$pkgname-lang $pkgname-doc"
diff --git a/testing/vips/APKBUILD b/testing/vips/APKBUILD
index 686c1064ad289b6c0794d93191cb7d588573dd27..15545b79662d6439695f0952952983ddfb280120 100644
--- a/testing/vips/APKBUILD
+++ b/testing/vips/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A fast image processing library with low memory needs"
 url="http://www.vips.ecs.soton.ac.uk/"
 arch="all"
-license="LGPL 2.1+"
+license="LGPL-2.1-or-later"
 depends_dev="libjpeg-turbo-dev libexif-dev lcms2-dev"
 makedepends="$depends_dev fftw-dev giflib-dev glib-dev libpng-dev libwebp-dev
 	expat-dev orc-dev tiff-dev"
diff --git a/testing/virt-what/APKBUILD b/testing/virt-what/APKBUILD
index 906192e972a25e47a327166e7cdab5a73fdde8fc..3e0c247685c06889691524e00c9198522a8e8045 100644
--- a/testing/virt-what/APKBUILD
+++ b/testing/virt-what/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Detect if we are running in a virtual machine"
 url="https://people.redhat.com/~rjones/virt-what/"
 arch="x86 x86_64 ppc64le"
-license="GPL2+"
+license="GPL-2.0-or-later"
 checkdepends="checkbashisms"
 makedepends="automake autoconf perl-dev"
 subpackages="$pkgname-doc"
diff --git a/testing/vpnc/APKBUILD b/testing/vpnc/APKBUILD
index d4ef16a361ea1c7fa38965d42837fc8798347165..b405f367343f158a51a0656daac5ed6452a62df1 100644
--- a/testing/vpnc/APKBUILD
+++ b/testing/vpnc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="IPSec VPN client compatible with Cisco equipment"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 arch="all"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 makedepends="libgcrypt-dev perl"
 subpackages="$pkgname-doc"
 source="http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-$pkgver.tar.gz
diff --git a/testing/watchman/APKBUILD b/testing/watchman/APKBUILD
index f29265cb75bc51333849e7cf8de0431db55d44ba..8b477d49937454719f7c395d242c121c8a9a0d70 100644
--- a/testing/watchman/APKBUILD
+++ b/testing/watchman/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A file watching service"
 url="https://facebook.github.io/watchman/"
 arch="all"
-license="Apache-2"
+license="Apache-2.0"
 makedepends="pcre-dev autoconf automake linux-headers"
 source="$pkgname-$pkgver.tar.gz::https://github.com/facebook/watchman/archive/v$pkgver.tar.gz"
 builddir="$srcdir/"$pkgname-$pkgver
diff --git a/testing/websockify/APKBUILD b/testing/websockify/APKBUILD
index 29dd2a53b66610cdc5296970d017c7d2c0c7d38e..e65bac5ddc20c6ea9f48941838ba9452968f03c1 100644
--- a/testing/websockify/APKBUILD
+++ b/testing/websockify/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="WebSockets support for any application/server"
 url="https://github.com/kanaka/websockify"
 arch="noarch"
-license="LGPLv3"
+license="LGPL-3.0"
 depends="py2-$pkgname=$pkgver-r$pkgrel py-setuptools py2-numpy"
 makedepends="python2-dev"
 subpackages="py2-$pkgname:py2"
diff --git a/testing/wicd/APKBUILD b/testing/wicd/APKBUILD
index e3bb51392c65004abb0d21654e47487197204fa4..3523ff24c26ece61df10cef0659e68a214317d20 100644
--- a/testing/wicd/APKBUILD
+++ b/testing/wicd/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Wicd is an open source wired and wireless network manager for Linux"
 url="http://wicd.sourceforge.net/"
 arch="noarch"
-license="GPLv2"
+license="GPL-2.0"
 depends="python2 py-gtk dbus py-dbus wireless-tools iproute2 pm-utils py2-babel"
 makedepends="py-setuptools"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/dpaleino/wicd/archive/1.7.2.4.tar.gz
diff --git a/testing/windowmaker/APKBUILD b/testing/windowmaker/APKBUILD
index 742ed8e58d77e55963a246d38e8cb6ce3abd6e46..541fe4a0ba3c0f009921feb922f7d56e0f70faa3 100644
--- a/testing/windowmaker/APKBUILD
+++ b/testing/windowmaker/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Window manager for X emulating the NeXTSTEP user interface"
 url="http://www.windowmaker.org"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 depends_dev="libx11-dev libxmu-dev libxft-dev"
 makedepends="$depends_dev"
diff --git a/testing/wine-staging/APKBUILD b/testing/wine-staging/APKBUILD
index c85ab65ac5a95f08c84f2f033ef9e0a57c1d87a7..e836fd7b35f1618e4059218d28f03333e3da8052 100644
--- a/testing/wine-staging/APKBUILD
+++ b/testing/wine-staging/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs :: Staging"
 url="http://wine-staging.com"
 arch="x86_64"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 replaces="wine"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
 depends_dev="$pkgname perl"
diff --git a/testing/wireguard-hardened/APKBUILD b/testing/wireguard-hardened/APKBUILD
index 484568a3b4f14eba17ad4a011b12b1a16b2a6a5c..269a90bcefe158203e66c11941d3e92fec46c015 100644
--- a/testing/wireguard-hardened/APKBUILD
+++ b/testing/wireguard-hardened/APKBUILD
@@ -32,7 +32,7 @@ pkgrel=$(($_kpkgrel + $_mypkgrel))
 pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor"
 arch='x86 x86_64 armhf'
 url='https://www.wireguard.com'
-license="GPLv2"
+license="GPL-2.0"
 depends="linux-${_flavor}=${_kpkgver}"
 makedepends="linux-${_flavor}-dev=$_kpkgver libmnl-dev"
 install_if="wireguard-tools=$_toolsver linux-hardened=$_kpkgver"
diff --git a/testing/wireguard-tools/APKBUILD b/testing/wireguard-tools/APKBUILD
index 743aef33131f7f1ba1d75a649b0af21672641926..620aa83cb0c4663a8b27cf2813aa763813d7f4b3 100644
--- a/testing/wireguard-tools/APKBUILD
+++ b/testing/wireguard-tools/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Next generation secure network tunnel: userspace tools"
 arch='all'
 url='https://www.wireguard.com'
-license="GPLv2"
+license="GPL-2.0"
 makedepends="libmnl-dev"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
 options="!check"
diff --git a/testing/wireguard-vanilla/APKBUILD b/testing/wireguard-vanilla/APKBUILD
index d283abe31ed0fa60ee6cb88980a6f7e78c284cc8..f1fd2054b06d11ffbb5c43ed9f4f0a5b50b98f2e 100644
--- a/testing/wireguard-vanilla/APKBUILD
+++ b/testing/wireguard-vanilla/APKBUILD
@@ -32,7 +32,7 @@ pkgrel=$(($_kpkgrel + $_mypkgrel))
 pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor"
 arch='all'
 url='https://www.wireguard.com'
-license="GPLv2"
+license="GPL-2.0"
 depends="${_kpkg}=${_kpkgver}"
 makedepends="linux-vanilla-dev=$_kpkgver libmnl-dev"
 install_if="wireguard-tools=$_toolsver linux-vanilla=$_kpkgver"
diff --git a/testing/wkhtmltopdf/APKBUILD b/testing/wkhtmltopdf/APKBUILD
index c51ccd858c96e5ef444273ffbd2e3b6e43837433..d4168239da779a5bf815184d1b1bd520761e8c63 100644
--- a/testing/wkhtmltopdf/APKBUILD
+++ b/testing/wkhtmltopdf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="Simple shell utility to convert html to pdf"
 url="http://wkhtmltopdf.org/"
 arch="all"
-license="GPLv3+"
+license="GPL-3.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtsvg-dev
diff --git a/testing/wmi-client/APKBUILD b/testing/wmi-client/APKBUILD
index 2212e6913b92e7f95a153d771b25de708d1baaa0..0ac028a77078876534e1233b22e5927689d1bcac 100644
--- a/testing/wmi-client/APKBUILD
+++ b/testing/wmi-client/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 pkgdesc="DCOM/WMI client implementation"
 url="https://www.orvant.com/packages"
 arch="all !aarch64"
-license="GPL3"
+license="GPL-3.0"
 subpackages="libwmiclient-dev:libdev libwmiclient:lib"
 makedepends="autoconf python-dev perl-datetime"
 source="https://launchpad.net/~cybersec/+archive/ubuntu/chaos-ppa-v2/+files/${_pkgname}_${pkgver}.orig.tar.bz2
diff --git a/testing/wok/APKBUILD b/testing/wok/APKBUILD
index df06ecbf0d4ce9ae66d5fdb264a55327a2d85441..de4d2e93aed8e1115d56eaa1ffa81df34590bf6d 100644
--- a/testing/wok/APKBUILD
+++ b/testing/wok/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Webserver of Kimchi - a cherrypy framework for multi-purpose plug-ins"
 url="http://kimchi-project.github.io/wok/"
 arch="noarch"
-license="APACHE LGPL2.1"
+license="Apache LGPL-2.1"
 depends="python2 nginx logrotate py-cherrypy py2-jsonschema
 	py2-pyparted  py2-pyldap py2-psutil py2-m2crypto py-cheetah
 	py2-augeas py2-pam py2-functools32 py2-lxml py2-libvirt py-cherrypy
diff --git a/testing/wpa_actiond/APKBUILD b/testing/wpa_actiond/APKBUILD
index c92874f74edb7a33029d55c2d96d8f0bf35828e9..2fafb399d178ecb86c52e9f09e0b407c777d71c0 100644
--- a/testing/wpa_actiond/APKBUILD
+++ b/testing/wpa_actiond/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
 url="https://git.archlinux.org/wpa_actiond.git/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 makedepends=""
 subpackages=""
diff --git a/testing/wput/APKBUILD b/testing/wput/APKBUILD
index b82ab90c4d11814dc921186b3a232e2f0e4e7978..93bf886ff60c1524c19e4683fe577c1490ae9609 100644
--- a/testing/wput/APKBUILD
+++ b/testing/wput/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="A command line tool to upload files to FTP site"
 url="http://wput.sourceforge.net/"
 arch="all"
-license="GPL2+"
+license="GPL-2.0-or-later"
 makedepends="gnutls-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz
diff --git a/testing/wqy-zenhei/APKBUILD b/testing/wqy-zenhei/APKBUILD
index c5656fe6ffeafe3de09616792cdcd0810382e849..ef7ad51be3f8b8e8d809f687f0200813c53d07a0 100644
--- a/testing/wqy-zenhei/APKBUILD
+++ b/testing/wqy-zenhei/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Hei-Ti style (sans-serif) Chinese outline font"
 url="http://wenq.org/wqy2/index.cgi?ZenHei"
 arch="noarch"
-license="GPL2"
+license="GPL-2.0"
 depends="fontconfig mkfontscale"
 makedepends=""
 install=""
diff --git a/testing/x11vnc/APKBUILD b/testing/x11vnc/APKBUILD
index 1a2dc12d46d394f354c2ccc3b5932681be3ddd15..4fb2fbfdab82fcd3a981d43daa4b3a9915237a65 100644
--- a/testing/x11vnc/APKBUILD
+++ b/testing/x11vnc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
 pkgdesc="VNC server for real X displays"
 url="http://www.karlrunge.com/x11vnc/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libressl-dev libjpeg-turbo-dev avahi-dev libvncserver-dev
 	automake autoconf"
 subpackages="$pkgname-doc"
diff --git a/testing/xf86-input-wacom/APKBUILD b/testing/xf86-input-wacom/APKBUILD
index 110f8594a21666e651c6e16ad47f69a40267126a..9862f37579aae6560939cf27a6baf9359922ecdf 100644
--- a/testing/xf86-input-wacom/APKBUILD
+++ b/testing/xf86-input-wacom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="X.org Wacom tablet input driver"
 url="http://linuxwacom.sourceforge.net/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="xorg-server-dev libxext-dev libxi-dev libxrandr-dev
 	libxinerama-dev eudev-dev"
 checkdepends="bash findutils"
diff --git a/testing/xfce-polkit/APKBUILD b/testing/xfce-polkit/APKBUILD
index 846fd68a77e39e4f90d66e40b8efead6255577c9..c711da32b3c7e4b5400198cbe5432eb713b8fafb 100644
--- a/testing/xfce-polkit/APKBUILD
+++ b/testing/xfce-polkit/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A simple PolicyKit authentication agent for XFCE"
 url="https://github.com/ncopa/xfce-polkit"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libxfce4ui-dev polkit-dev glib-dev gtk+2.0-dev autoconf automake"
 source="https://github.com/ncopa/xfce-polkit/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/testing/xfce4-mailwatch-plugin/APKBUILD b/testing/xfce4-mailwatch-plugin/APKBUILD
index 27df38fa80604b806da0c4181e2b3b4ab61e1cd9..34b32be5149ba91a76cb719a862e76d9b21ce0ec 100644
--- a/testing/xfce4-mailwatch-plugin/APKBUILD
+++ b/testing/xfce4-mailwatch-plugin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="a multi-protocol, multi-mailbox mail watcher"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
 arch="all"
-license="GPL-v2"
+license="GPL-2.0"
 depends=""
 depends_dev=""
 makedepends="$depends_dev intltool libx11-dev glib-dev gtk+2.0-dev
diff --git a/testing/xfce4-sensors-plugin/APKBUILD b/testing/xfce4-sensors-plugin/APKBUILD
index 7c6cf955b4529425ca2bd77815e7e614e445363c..516ce47599f681984940e2765b02c9290f9cc394 100644
--- a/testing/xfce4-sensors-plugin/APKBUILD
+++ b/testing/xfce4-sensors-plugin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Reads your hardware sensor values and displays them in your panel"
 url="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends_dev="xfce4-panel-dev lm_sensors-dev libxfce4ui-dev"
 makedepends="$depends_dev bash"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/testing/xonotic-data/APKBUILD b/testing/xonotic-data/APKBUILD
index c7e21114bde24104c613329e8ae64e38cb3ca21a..135f21aeb10f96589a216fb3ae6663bc022e0882 100644
--- a/testing/xonotic-data/APKBUILD
+++ b/testing/xonotic-data/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Data files for Xonotic"
 url="http://www.xonotic.org/"
 arch="noarch"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/testing/xonotic/APKBUILD b/testing/xonotic/APKBUILD
index c76de09489f2473d0fe9572f586221f654f5ed26..3687f701ec00310970252f67ad6a0c5dcaaf30c2 100644
--- a/testing/xonotic/APKBUILD
+++ b/testing/xonotic/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
 pkgdesc="Game engine for Xonotic (quake1/nexuiz derivative)"
 url="http://www.xonotic.org/"
 arch="x86 x86_64"
-license="GPL2+"
+license="GPL-2.0-or-later"
 depends="xonotic-data"
 depends_dev=""
 makedepends="sdl-dev mesa-dev jpeg-dev libvorbis-dev libxpm-dev libxxf86dga-dev
diff --git a/testing/xournal/APKBUILD b/testing/xournal/APKBUILD
index ef124ece9d8b119e0f68f4759299c306d14d4a23..564e6a1cf458a99b0824d92cc626e039884ce2c5 100644
--- a/testing/xournal/APKBUILD
+++ b/testing/xournal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Notetaking, sketching, keeping a journal using a stylus"
 url="http://xournal.sourceforge.net/"
 arch="all !aarch64"
-license="GPL2"
+license="GPL-2.0"
 makedepends="libgnomecanvas-dev poppler-dev gtk+2.0-dev libart-lgpl-dev"
 subpackages="$pkgname-lang"
 source="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
diff --git a/testing/yodl/APKBUILD b/testing/yodl/APKBUILD
index da3c18096a667daf8fa0aba470bf638491f23f33..f0b845ad7328a57d4c849fddf869fc686b36c046 100644
--- a/testing/yodl/APKBUILD
+++ b/testing/yodl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Pre-document language and tools to process it"
 url="https://fbb-git.github.io/yodl/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 makedepends="icmake bash perl flex bison"
 subpackages="$pkgname-doc"
 source="yodl-$pkgver.tar.gz::https://github.com/fbb-git/yodl/archive/$pkgver.tar.gz"
diff --git a/testing/zbar/APKBUILD b/testing/zbar/APKBUILD
index 534b87ce553890c43c1792fa5381bc4717685ad5..84700d87490af958e32873b36e4629b20d5ca6ef 100644
--- a/testing/zbar/APKBUILD
+++ b/testing/zbar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="Port of ZBAR BAR CODE READER"
 url="http://zbar.sourceforge.net/"
 arch="all !aarch64"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 depends="py-gobject"
 makedepends="imagemagick-dev gtk+-dev py-gtk-dev qt-dev libtool lcms2-dev autoconf python2-dev"
 install=""
diff --git a/testing/zerotier-one/APKBUILD b/testing/zerotier-one/APKBUILD
index 608d8a394ff7639d99051a7794187a2bb35c4e99..79752e9c76fd958882a1b01e6bdf2bf1c9d08810 100644
--- a/testing/zerotier-one/APKBUILD
+++ b/testing/zerotier-one/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="ZeroTier One allows systems to join and participate in ZeroTier virtual networks."
 url="https://www.zerotier.com/"
 arch="all"
-license="GPL3"
+license="GPL-3.0"
 depends=""
 makedepends="nodejs linux-headers"
 install=""
diff --git a/testing/zim/APKBUILD b/testing/zim/APKBUILD
index 9c1ea7374e49d8061f201190f9e26682d8cb5de6..14302ee44065ee561ba08ff72a00926ccefd6275 100644
--- a/testing/zim/APKBUILD
+++ b/testing/zim/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A Desktop Wiki Editor"
 url="http://zim-wiki.org/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends="python2 py-gobject py-xdg py-gtk py2-simplejson xdg-utils"
 makedepends="desktop-file-utils"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/testing/zsh-syntax-highlighting/APKBUILD b/testing/zsh-syntax-highlighting/APKBUILD
index 8f27518cd56bee3fe062c7f9ca38edfb7f3ac26b..476ed0e7e3426cc08c5532ac641ec740f4e0ca95 100644
--- a/testing/zsh-syntax-highlighting/APKBUILD
+++ b/testing/zsh-syntax-highlighting/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Fish shell like syntax highlighting for Zsh"
 url="https://github.com/zsh-users/zsh-syntax-highlighting"
 arch="noarch"
-license="BSD-3"
+license="BSD-3-Clause"
 depends="zsh"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
diff --git a/unmaintained/acf-provisioning-algo/APKBUILD b/unmaintained/acf-provisioning-algo/APKBUILD
index 1c1f48570c142b36f8dfb2900d93854d4277e0bd..db55bc91ee55dabdf2854cc838aecf032f5c7d96 100644
--- a/unmaintained/acf-provisioning-algo/APKBUILD
+++ b/unmaintained/acf-provisioning-algo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Files for provisioning Algo Products"
 url="http://www.algosolutions.com/products/overview.html"
 arch="noarch"
-license="AS IS"
+license="AS-IS"
 depends=""
 makedepends=""
 source="http://www.algosolutions.com/fw-downloads/8180/firmware/algo-8180-2.4.fw
diff --git a/unmaintained/acf-provisioning-cisco/APKBUILD b/unmaintained/acf-provisioning-cisco/APKBUILD
index 10f1d513ff219b3e0fc12045476cecac58e3a25f..924870a06dbbf5e8c4e6eaf6f382a696252f8327 100644
--- a/unmaintained/acf-provisioning-cisco/APKBUILD
+++ b/unmaintained/acf-provisioning-cisco/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Files for provisioning Cisco Small Business Voice Gateways and ATAs"
 url="http://www.cisco.com/c/en/us/support/unified-communications/small-business-voice-gateways-ata/tsd-products-support-series-home.html"
 arch="noarch"
-license="AS IS"
+license="AS-IS"
 depends=""
 makedepends=""
 # Source obtained from http://software.cisco.com/download/release.html?mdfid=283998771&softwareid=282463187&release=1.3.1
diff --git a/unmaintained/acf-provisioning-cyberdata/APKBUILD b/unmaintained/acf-provisioning-cyberdata/APKBUILD
index e803d3622a1feb8bdfe754a9897fdeb130df4517..4e8bd69b1938f71ebf9975f0883ede2aefb4c8d1 100644
--- a/unmaintained/acf-provisioning-cyberdata/APKBUILD
+++ b/unmaintained/acf-provisioning-cyberdata/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Files for provisioning CyberData Outdoor Intercom"
 url="http://www.cyberdata.net/products/voip/digitalanalog/intercom_endpoints.html"
 arch="noarch"
-license="AS IS"
+license="AS-IS"
 depends=""
 makedepends=""
 source="http://www.cyberdata.net/assets/011186/1148-uImage-outdoor_intercom.zip
diff --git a/unmaintained/acf-provisioning-linksys/APKBUILD b/unmaintained/acf-provisioning-linksys/APKBUILD
index 8d9d57efaffc5342163d7c38943b30ce3ab6bb04..8d807a1278b409bc007d830fad1a33e417fba48e 100644
--- a/unmaintained/acf-provisioning-linksys/APKBUILD
+++ b/unmaintained/acf-provisioning-linksys/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Files for provisioning Cisco Linksys IP phones"
 url="http://www.cisco.com/en/US/products/ps10029/index.html"
 arch="noarch"
-license="AS IS"
+license="AS-IS"
 depends=""
 makedepends=""
 source="http://download.cisco.com/swc/esd/03/282414114/anon/PAP2T_v5.1.6_fw.zip
diff --git a/unmaintained/acf-provisioning-polycom/APKBUILD b/unmaintained/acf-provisioning-polycom/APKBUILD
index 2ef1d1a6f48fd4761b2567e470a24e069effc8dd..df2d577fa92a9bccea2b291de8666f5fdf1eedf2 100644
--- a/unmaintained/acf-provisioning-polycom/APKBUILD
+++ b/unmaintained/acf-provisioning-polycom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Files for provisioning Polycom IP phones"
 url="http://www.polycom.com/products/voice/index.html"
 arch="noarch"
-license="AS IS"
+license="AS-IS"
 depends=""
 makedepends=""
 # Make sure 5.5.1 comes after 4.0.11 so that older files are overwritten
diff --git a/unmaintained/acf-provisioning-snom/APKBUILD b/unmaintained/acf-provisioning-snom/APKBUILD
index 13ec4193a16ed589b28ae6fba9dd2c926b9b38cd..3548bdbe937aedb4403ea3f8382f827ee1f57423 100644
--- a/unmaintained/acf-provisioning-snom/APKBUILD
+++ b/unmaintained/acf-provisioning-snom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Files for provisioning Snom IP phones"
 url="http://snom.com/"
 arch="noarch"
-license="AS IS"
+license="AS-IS"
 depends=""
 makedepends=""
 source="http://downloads.snom.com/fw/snom300-$pkgver-SIP-f.bin
diff --git a/unmaintained/beecrypt/APKBUILD b/unmaintained/beecrypt/APKBUILD
index a1a2aa8435020e96074bf968e25c220a775be216..33fb673fd96576a08cd4238aeb370afd03261701 100644
--- a/unmaintained/beecrypt/APKBUILD
+++ b/unmaintained/beecrypt/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="A general-purpose cryptography library"
 url="http://sourceforge.net/projects/beecrypt"
 arch="all"
-license="LGPL2+"
+license="LGPL-2.0-or-later"
 makedepends="libtool m4"
 subpackages="$pkgname-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/unmaintained/geary/APKBUILD b/unmaintained/geary/APKBUILD
index fb0f244b6c049941bf036e8fa25b4b13a99c763c..b2683b5139a459cf0957912c5a799c1be5d3b0e9 100644
--- a/unmaintained/geary/APKBUILD
+++ b/unmaintained/geary/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A lightweight email program designed around conversations"
 url="http://yorba.org/geary/"
 arch="all !ppc64le !s390x"
-license="LGPLv2+"
+license="LGPL-2.0-or-later"
 depends="hicolor-icon-theme gsettings-desktop-schemas"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/unmaintained/ocfs2-tools/APKBUILD b/unmaintained/ocfs2-tools/APKBUILD
index 9169d3dc964842631c86a286339b9398559a4759..8567e40d68cd232604c63b9f29431bab621c4795 100644
--- a/unmaintained/ocfs2-tools/APKBUILD
+++ b/unmaintained/ocfs2-tools/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
 pkgdesc="Oracle Cluster File System 2 utilities"
 url="http://oss.oracle.com/projects/ocfs2-tools"
 arch=""
-license="GPL2"
+license="GPL-2.0"
 depends=
 depends_dev="e2fsprogs-dev glib-dev ncurses-dev readline-dev"
 makedepends="$depends_dev"
diff --git a/unmaintained/sipwise-sems/APKBUILD b/unmaintained/sipwise-sems/APKBUILD
index df08b8a93f47d2bb948af8bccf59f1cb1a0ed8a0..42391971fd6b2ccd496a54d020339d1a2198a62f 100644
--- a/unmaintained/sipwise-sems/APKBUILD
+++ b/unmaintained/sipwise-sems/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="SIP Express Media Server, an extensible SIP media server"
 url="http://iptel.org/sems/"
 arch="all !aarch64"
-license="GPLv2+"
+license="GPL-2.0-or-later"
 pkgusers="sems"
 pkggroups="sems"
 install="$pkgname.pre-install"
diff --git a/unmaintained/sword/APKBUILD b/unmaintained/sword/APKBUILD
index 3a3f960cdc1ce984879034ac0fab60a2cf357be7..063f2cd684d104a5aa42bdd5435672e7a62e4152 100644
--- a/unmaintained/sword/APKBUILD
+++ b/unmaintained/sword/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=6
 pkgdesc="Library for free Bible software"
 url="http://www.crosswire.org/sword/"
 arch="all"
-license="GPL2"
+license="GPL-2.0"
 depends=""
 # all are optional but desireable; clucene-dev could be replaced with
 # new --with-cxx11regex or --with-internalregex,
diff --git a/unmaintained/usbip-utils/APKBUILD b/unmaintained/usbip-utils/APKBUILD
index fd904f048c46e0ffff80108f8993d0a1a6528b0d..9bbd485021631eaae5fff7cabef97e4b4bb1ac19 100644
--- a/unmaintained/usbip-utils/APKBUILD
+++ b/unmaintained/usbip-utils/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Utilities for USB device sharing over IP network"
 url="https://kernel.org/doc/readme/drivers-staging-usbip-userspace-README"
 arch="all"
-license="GPLv2"
+license="GPL-2.0"
 depends="glib sysfsutils usbutils"
 depends_dev="gcc automake autoconf eudev-dev libtool linux-headers sysfsutils-dev glib-dev"
 makedepends="$depends_dev tar"
diff --git a/unmaintained/webkitgtk/APKBUILD b/unmaintained/webkitgtk/APKBUILD
index 6c7e49bfce40ade33a0166ad9d2b59e0345873cf..ec1d864cb9466aedbd651a34485bd4a0630fb984 100644
--- a/unmaintained/webkitgtk/APKBUILD
+++ b/unmaintained/webkitgtk/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
 arch="all !ppc64le !s390x"
-license="LGPL2+ BSD"
+license="LGPL-2.0-or-later BSD"
 depends=""
 depends_dev="gtk+2.0-dev gtk+3.0-dev libsoup-dev gstreamer1-dev
 	gst-plugins-base1-dev"