From 63f5e7d295659a855709901ce22a3e5f40fce455 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 30 Dec 2017 19:04:30 +0100
Subject: [PATCH] [various]: unify names of licenses according to SPDX

This commit updates $license variable in all APKBUILDs to comply with
short names specified by SPDX version 3.0 [1] where possible. It was
done using find-and-replace method on substrings inside $license
variables.

Only license names were updated, not "expressions" specifying relation
between the licenses (e.g. "X and Y", "X or Y", "X and (Y or Z)") or
exceptions (e.g. "X with exceptions").

Many licenses have a version or multiple variants, e.g. MPL-2.0,
BSD-2-Clause, BSD-3-Clause. However, $license in many aports do not
contain license version or variant. Since there's no way how to infer
this information just from abuild, it were left without the variant
suffix or version, i.e. non SPDX compliant.

GNU licenses (AGPL, GFDL, GPL, LGPL) are especially complicated. They
exist in two variants: -only (formerly e.g. GPL-2.0) and -or-later
(formerly e.g. GPL-2.0+). We did not systematically noted distinguish
between these variants, so GPL-2.0, GPL2, GPLv2 etc. may mean
GPL-2.0-only or GPL-2.0-or-later. Thus GNU licenses without "+" (e.g.
GPL2+) were left without the variant suffix, i.e. non SPDX compliant.

Note: This commit just fixes format of the license names, no
verification has been done if the specified license information is
actually correct!

[1]: https://spdx.org/licenses/
---
 community/6tunnel/APKBUILD                         | 2 +-
 community/R/APKBUILD                               | 2 +-
 community/abiword/APKBUILD                         | 2 +-
 community/abook/APKBUILD                           | 2 +-
 community/acccheck/APKBUILD                        | 2 +-
 community/acf-vlc-daemon/APKBUILD                  | 2 +-
 community/afl/APKBUILD                             | 2 +-
 community/afpfs-ng/APKBUILD                        | 2 +-
 community/aha/APKBUILD                             | 2 +-
 community/aircrack-ng/APKBUILD                     | 2 +-
 community/albatross-themes/APKBUILD                | 2 +-
 community/alien/APKBUILD                           | 2 +-
 community/anytun/APKBUILD                          | 2 +-
 community/apache-ant/APKBUILD                      | 2 +-
 community/arandr/APKBUILD                          | 2 +-
 community/archivemount/APKBUILD                    | 2 +-
 community/arping/APKBUILD                          | 2 +-
 community/asciinema/APKBUILD                       | 2 +-
 community/asio/APKBUILD                            | 2 +-
 community/aspcud/APKBUILD                          | 2 +-
 community/asterisk-chan-dongle/APKBUILD            | 2 +-
 community/atheme-iris/APKBUILD                     | 2 +-
 community/atril/APKBUILD                           | 2 +-
 community/attica/APKBUILD                          | 2 +-
 community/audacity/APKBUILD                        | 2 +-
 community/autoconf2.13/APKBUILD                    | 2 +-
 community/awake/APKBUILD                           | 2 +-
 community/awesome/APKBUILD                         | 2 +-
 community/babl/APKBUILD                            | 2 +-
 community/bannergrab/APKBUILD                      | 2 +-
 community/bareos-webui/APKBUILD                    | 2 +-
 community/bareos/APKBUILD                          | 2 +-
 community/biber/APKBUILD                           | 2 +-
 community/binaryen/APKBUILD                        | 2 +-
 community/binutils-avr/APKBUILD                    | 2 +-
 community/bogofilter/APKBUILD                      | 2 +-
 community/btrbk/APKBUILD                           | 2 +-
 community/bubblewrap/APKBUILD                      | 2 +-
 community/buildbot/APKBUILD                        | 2 +-
 community/bvi/APKBUILD                             | 2 +-
 community/bzr/APKBUILD                             | 2 +-
 community/cabal/APKBUILD                           | 2 +-
 community/cacti/APKBUILD                           | 2 +-
 community/caddy/APKBUILD                           | 2 +-
 community/caja-extensions/APKBUILD                 | 2 +-
 community/caja/APKBUILD                            | 2 +-
 community/camlp4/APKBUILD                          | 2 +-
 community/capitaine-cursors/APKBUILD               | 2 +-
 community/captagent/APKBUILD                       | 2 +-
 community/cargo/APKBUILD                           | 2 +-
 community/cassandra-cpp-driver/APKBUILD            | 2 +-
 community/ccid/APKBUILD                            | 2 +-
 community/cfengine/APKBUILD                        | 2 +-
 community/chntpw/APKBUILD                          | 2 +-
 community/clasp/APKBUILD                           | 2 +-
 community/claws-mail/APKBUILD                      | 2 +-
 community/cloc/APKBUILD                            | 2 +-
 community/clsync/APKBUILD                          | 2 +-
 community/cmus/APKBUILD                            | 2 +-
 community/connman/APKBUILD                         | 2 +-
 community/copy-router-config/APKBUILD              | 2 +-
 community/corebird/APKBUILD                        | 2 +-
 community/cppcheck/APKBUILD                        | 2 +-
 community/dash/APKBUILD                            | 2 +-
 community/davfs2/APKBUILD                          | 2 +-
 community/dcadec/APKBUILD                          | 2 +-
 community/ddrescue/APKBUILD                        | 2 +-
 community/dia/APKBUILD                             | 2 +-
 community/diff-pdf/APKBUILD                        | 2 +-
 community/dnsrecon/APKBUILD                        | 2 +-
 community/docker-py/APKBUILD                       | 2 +-
 community/docker-registry/APKBUILD                 | 2 +-
 community/docker/APKBUILD                          | 2 +-
 community/dockerpy-creds/APKBUILD                  | 2 +-
 community/duo_unix/APKBUILD                        | 2 +-
 community/dynamips/APKBUILD                        | 2 +-
 community/easy-rsa/APKBUILD                        | 2 +-
 community/elasticsearch/APKBUILD                   | 2 +-
 community/elixir/APKBUILD                          | 2 +-
 community/emacs/APKBUILD                           | 2 +-
 community/engrampa/APKBUILD                        | 2 +-
 community/eom/APKBUILD                             | 2 +-
 community/erlang/APKBUILD                          | 2 +-
 community/etckeeper/APKBUILD                       | 2 +-
 community/evtest/APKBUILD                          | 2 +-
 community/exim/APKBUILD                            | 2 +-
 community/ezstream/APKBUILD                        | 2 +-
 community/fann/APKBUILD                            | 2 +-
 community/fbida/APKBUILD                           | 2 +-
 community/ffmpegthumbnailer/APKBUILD               | 2 +-
 community/firejail/APKBUILD                        | 2 +-
 community/firetools/APKBUILD                       | 2 +-
 community/fuse-exfat/APKBUILD                      | 2 +-
 community/fvwm/APKBUILD                            | 2 +-
 community/gammu/APKBUILD                           | 2 +-
 community/gdnsd/APKBUILD                           | 2 +-
 community/geany-plugins/APKBUILD                   | 2 +-
 community/gegl/APKBUILD                            | 2 +-
 community/geocode-glib/APKBUILD                    | 2 +-
 community/geth/APKBUILD                            | 2 +-
 community/ghc/APKBUILD                             | 2 +-
 community/gifsicle/APKBUILD                        | 2 +-
 community/gimp/APKBUILD                            | 2 +-
 community/glances/APKBUILD                         | 2 +-
 community/gnomad2/APKBUILD                         | 2 +-
 community/gnome-colors/APKBUILD                    | 2 +-
 community/gnome-themes-standard/APKBUILD           | 2 +-
 community/gns3-converter/APKBUILD                  | 2 +-
 community/gns3-gui/APKBUILD                        | 2 +-
 community/gns3-server/APKBUILD                     | 2 +-
 community/google-authenticator/APKBUILD            | 2 +-
 community/gource/APKBUILD                          | 2 +-
 community/gringo/APKBUILD                          | 2 +-
 community/gsettings-desktop-schemas/APKBUILD       | 2 +-
 community/gsoap/APKBUILD                           | 2 +-
 community/guvcview/APKBUILD                        | 2 +-
 community/hivex/APKBUILD                           | 2 +-
 community/homer-ui/APKBUILD                        | 2 +-
 community/httpry/APKBUILD                          | 2 +-
 community/hugo/APKBUILD                            | 2 +-
 community/hydrogen/APKBUILD                        | 2 +-
 community/hyphen/APKBUILD                          | 2 +-
 community/ices/APKBUILD                            | 2 +-
 community/icingaweb2-module-director/APKBUILD      | 2 +-
 community/incron/APKBUILD                          | 2 +-
 community/inetutils-syslogd/APKBUILD               | 2 +-
 community/innoextract/APKBUILD                     | 2 +-
 community/inotify-tools-inc/APKBUILD               | 2 +-
 community/ioping/APKBUILD                          | 2 +-
 community/iotop/APKBUILD                           | 2 +-
 community/iouyap/APKBUILD                          | 2 +-
 community/irrlicht/APKBUILD                        | 2 +-
 community/irssi-xmpp/APKBUILD                      | 2 +-
 community/isync/APKBUILD                           | 2 +-
 community/java-jansi-native/APKBUILD               | 2 +-
 community/java-jffi/APKBUILD                       | 2 +-
 community/java-jna/APKBUILD                        | 2 +-
 community/java-lz4/APKBUILD                        | 2 +-
 community/java-postgresql-jdbc/APKBUILD            | 2 +-
 community/java-snappy/APKBUILD                     | 2 +-
 community/jetty-runner/APKBUILD                    | 2 +-
 community/john/APKBUILD                            | 2 +-
 community/jpegoptim/APKBUILD                       | 2 +-
 community/jreen/APKBUILD                           | 2 +-
 community/jruby/APKBUILD                           | 2 +-
 community/junit/APKBUILD                           | 2 +-
 community/kbuild/APKBUILD                          | 2 +-
 community/keepassx/APKBUILD                        | 2 +-
 community/keybinder3/APKBUILD                      | 2 +-
 community/kiwiirc/APKBUILD                         | 2 +-
 community/knot/APKBUILD                            | 2 +-
 community/lasem/APKBUILD                           | 2 +-
 community/lastpass-cli/APKBUILD                    | 2 +-
 community/leafpad/APKBUILD                         | 2 +-
 community/lensfun/APKBUILD                         | 2 +-
 community/letsencrypt-nosudo/APKBUILD              | 2 +-
 community/libabw/APKBUILD                          | 2 +-
 community/libcdr/APKBUILD                          | 2 +-
 community/libcmis/APKBUILD                         | 2 +-
 community/libcoap/APKBUILD                         | 2 +-
 community/libcoro/APKBUILD                         | 2 +-
 community/libcouchbase/APKBUILD                    | 2 +-
 community/libdbi-drivers/APKBUILD                  | 2 +-
 community/libe-book/APKBUILD                       | 2 +-
 community/libetonyek/APKBUILD                      | 2 +-
 community/libewf/APKBUILD                          | 2 +-
 community/libexttextcat/APKBUILD                   | 2 +-
 community/libfreehand/APKBUILD                     | 2 +-
 community/libftdi1/APKBUILD                        | 2 +-
 community/libhdhomerun/APKBUILD                    | 2 +-
 community/libindicator/APKBUILD                    | 2 +-
 community/libixion/APKBUILD                        | 2 +-
 community/liblangtag/APKBUILD                      | 2 +-
 community/libmatekbd/APKBUILD                      | 2 +-
 community/libmateweather/APKBUILD                  | 2 +-
 community/libmbim/APKBUILD                         | 2 +-
 community/libmpdclient/APKBUILD                    | 2 +-
 community/libmspub/APKBUILD                        | 2 +-
 community/libmwaw/APKBUILD                         | 2 +-
 community/libndp/APKBUILD                          | 2 +-
 community/libnsl/APKBUILD                          | 2 +-
 community/libodfgen/APKBUILD                       | 2 +-
 community/liborcus/APKBUILD                        | 2 +-
 community/libosinfo/APKBUILD                       | 2 +-
 community/libpagemaker/APKBUILD                    | 2 +-
 community/libplist/APKBUILD                        | 2 +-
 community/libqmi/APKBUILD                          | 2 +-
 community/libreoffice/APKBUILD                     | 2 +-
 community/libreswan/APKBUILD                       | 2 +-
 community/libspectre/APKBUILD                      | 2 +-
 community/libstaroffice/APKBUILD                   | 2 +-
 community/libteam/APKBUILD                         | 2 +-
 community/libvirt-glib/APKBUILD                    | 2 +-
 community/libvisio/APKBUILD                        | 2 +-
 community/libwpd/APKBUILD                          | 2 +-
 community/libwpg/APKBUILD                          | 2 +-
 community/libwps/APKBUILD                          | 2 +-
 community/libzmf/APKBUILD                          | 2 +-
 community/lshw/APKBUILD                            | 2 +-
 community/lua-cqueues-pushy/APKBUILD               | 2 +-
 community/lua-dromozoa-utf8/APKBUILD               | 2 +-
 community/lua-resty-http/APKBUILD                  | 2 +-
 community/lua-sleep/APKBUILD                       | 2 +-
 community/lxcfs/APKBUILD                           | 2 +-
 community/macchanger/APKBUILD                      | 2 +-
 community/makepasswd/APKBUILD                      | 2 +-
 community/marco/APKBUILD                           | 2 +-
 community/mate-applets/APKBUILD                    | 2 +-
 community/mate-backgrounds/APKBUILD                | 2 +-
 community/mate-calc/APKBUILD                       | 2 +-
 community/mate-common/APKBUILD                     | 2 +-
 community/mate-control-center/APKBUILD             | 2 +-
 community/mate-desktop/APKBUILD                    | 2 +-
 community/mate-icon-theme-faenza/APKBUILD          | 2 +-
 community/mate-icon-theme/APKBUILD                 | 2 +-
 community/mate-indicator-applet/APKBUILD           | 2 +-
 community/mate-media/APKBUILD                      | 2 +-
 community/mate-menus/APKBUILD                      | 2 +-
 community/mate-notification-daemon/APKBUILD        | 2 +-
 community/mate-panel/APKBUILD                      | 2 +-
 community/mate-polkit/APKBUILD                     | 2 +-
 community/mate-power-manager/APKBUILD              | 2 +-
 community/mate-screensaver/APKBUILD                | 2 +-
 community/mate-sensors-applet/APKBUILD             | 2 +-
 community/mate-session-manager/APKBUILD            | 2 +-
 community/mate-settings-daemon/APKBUILD            | 2 +-
 community/mate-system-monitor/APKBUILD             | 2 +-
 community/mate-terminal/APKBUILD                   | 2 +-
 community/mate-themes/APKBUILD                     | 2 +-
 community/mate-utils/APKBUILD                      | 2 +-
 community/maven/APKBUILD                           | 2 +-
 community/mbedtls/APKBUILD                         | 2 +-
 community/midori/APKBUILD                          | 2 +-
 community/minetest/APKBUILD                        | 2 +-
 community/modemmanager/APKBUILD                    | 2 +-
 community/mongodb-tools/APKBUILD                   | 2 +-
 community/monitoring-plugins/APKBUILD              | 2 +-
 community/monkey/APKBUILD                          | 2 +-
 community/mozo/APKBUILD                            | 2 +-
 community/mpc/APKBUILD                             | 2 +-
 community/mpd/APKBUILD                             | 2 +-
 community/mpv/APKBUILD                             | 2 +-
 community/msgpack-c/APKBUILD                       | 2 +-
 community/mtex2mml/APKBUILD                        | 2 +-
 community/multitail/APKBUILD                       | 2 +-
 community/mumudvb/APKBUILD                         | 2 +-
 community/mutagen/APKBUILD                         | 2 +-
 community/mysecureshell/APKBUILD                   | 2 +-
 community/mythes/APKBUILD                          | 2 +-
 community/nbd/APKBUILD                             | 2 +-
 community/ncmpc/APKBUILD                           | 2 +-
 community/nedit/APKBUILD                           | 2 +-
 community/neovim/APKBUILD                          | 2 +-
 community/netatalk/APKBUILD                        | 2 +-
 community/nextcloud-client/APKBUILD                | 2 +-
 community/notmuch/APKBUILD                         | 2 +-
 community/numix-themes/APKBUILD                    | 2 +-
 community/nuttcp/APKBUILD                          | 2 +-
 community/nx-libs/APKBUILD                         | 2 +-
 community/nxapi/APKBUILD                           | 2 +-
 community/obnam/APKBUILD                           | 2 +-
 community/ocaml/APKBUILD                           | 2 +-
 community/ocamlbuild/APKBUILD                      | 2 +-
 community/offlineimap/APKBUILD                     | 2 +-
 community/opam/APKBUILD                            | 2 +-
 community/opencpn/APKBUILD                         | 2 +-
 community/openjdk7/APKBUILD                        | 2 +-
 community/openlibm/APKBUILD                        | 2 +-
 community/openspecfun/APKBUILD                     | 2 +-
 community/optipng/APKBUILD                         | 2 +-
 community/osinfo-db-tools/APKBUILD                 | 2 +-
 community/osinfo-db/APKBUILD                       | 2 +-
 community/ospd-ancor/APKBUILD                      | 2 +-
 community/ospd-ovaldi/APKBUILD                     | 2 +-
 community/ospd-ssh-keyscan/APKBUILD                | 2 +-
 community/ospd-w3af/APKBUILD                       | 2 +-
 community/patchelf/APKBUILD                        | 2 +-
 community/pdsh/APKBUILD                            | 2 +-
 community/perl-class-load-xs/APKBUILD              | 2 +-
 community/perl-datetime-format-builder/APKBUILD    | 2 +-
 community/perl-datetime-format-strptime/APKBUILD   | 2 +-
 community/perl-io-prompt-tiny/APKBUILD             | 2 +-
 community/perl-iptables-chainmgr/APKBUILD          | 2 +-
 community/perl-iptables-parse/APKBUILD             | 2 +-
 community/perl-list-moreutils-xs/APKBUILD          | 2 +-
 community/perl-module-implementation/APKBUILD      | 2 +-
 community/perl-mojolicious/APKBUILD                | 2 +-
 community/perl-net-dns-sec/APKBUILD                | 2 +-
 community/perl-test-postgresql/APKBUILD            | 2 +-
 community/perl-text-quoted/APKBUILD                | 2 +-
 community/perl-try-tiny/APKBUILD                   | 2 +-
 community/pflogsumm/APKBUILD                       | 2 +-
 community/php5-suhosin/APKBUILD                    | 2 +-
 community/php5/APKBUILD                            | 2 +-
 community/php7/APKBUILD                            | 2 +-
 community/phpldapadmin/APKBUILD                    | 2 +-
 community/phpmyadmin/APKBUILD                      | 2 +-
 community/picocom/APKBUILD                         | 2 +-
 community/pluma/APKBUILD                           | 2 +-
 community/portablexdr/APKBUILD                     | 2 +-
 community/postsrsd/APKBUILD                        | 2 +-
 community/py-argh/APKBUILD                         | 2 +-
 community/py-batinfo/APKBUILD                      | 2 +-
 community/py-dicttoxml/APKBUILD                    | 2 +-
 community/py-django-compressor/APKBUILD            | 2 +-
 community/py-ethtool/APKBUILD                      | 2 +-
 community/py-evtx/APKBUILD                         | 2 +-
 community/py-geoip/APKBUILD                        | 2 +-
 community/py-gpiozero/APKBUILD                     | 2 +-
 community/py-gtkglext/APKBUILD                     | 2 +-
 community/py-impacket/APKBUILD                     | 2 +-
 community/py-ipaddr/APKBUILD                       | 2 +-
 community/py-jsonrpclib/APKBUILD                   | 2 +-
 community/py-ldap3/APKBUILD                        | 2 +-
 community/py-libcloud/APKBUILD                     | 2 +-
 community/py-logilab-common/APKBUILD               | 2 +-
 community/py-msgpack/APKBUILD                      | 2 +-
 community/py-packaging/APKBUILD                    | 2 +-
 community/py-pygit2/APKBUILD                       | 2 +-
 community/py-rencode/APKBUILD                      | 2 +-
 community/py-rtslib/APKBUILD                       | 2 +-
 community/py-sensehat/APKBUILD                     | 2 +-
 community/py-slowaes/APKBUILD                      | 2 +-
 community/py-udev/APKBUILD                         | 2 +-
 community/py-watchdog/APKBUILD                     | 2 +-
 community/py-zipstream/APKBUILD                    | 2 +-
 community/py-zmq/APKBUILD                          | 2 +-
 community/py-zope-component/APKBUILD               | 2 +-
 community/py3-aiohttp-cors/APKBUILD                | 2 +-
 community/py3-aiohttp/APKBUILD                     | 2 +-
 community/py3-aiohttp1-cors/APKBUILD               | 2 +-
 community/py3-aiohttp1/APKBUILD                    | 2 +-
 community/py3-async-timeout/APKBUILD               | 2 +-
 community/py3-multidict/APKBUILD                   | 2 +-
 community/py3-qt5/APKBUILD                         | 2 +-
 community/py3-yarl/APKBUILD                        | 2 +-
 community/qt5-qtbase/APKBUILD                      | 2 +-
 community/qt5-qtdeclarative/APKBUILD               | 2 +-
 community/qt5-qtgraphicaleffects/APKBUILD          | 2 +-
 community/qt5-qtimageformats/APKBUILD              | 2 +-
 community/qt5-qtmultimedia/APKBUILD                | 2 +-
 community/qt5-qtquickcontrols/APKBUILD             | 2 +-
 community/qt5-qtscript/APKBUILD                    | 2 +-
 community/qt5-qtserialport/APKBUILD                | 2 +-
 community/qt5-qtsvg/APKBUILD                       | 2 +-
 community/qt5-qttools/APKBUILD                     | 2 +-
 community/qt5-qttranslations/APKBUILD              | 2 +-
 community/qt5-qtwebkit/APKBUILD                    | 2 +-
 community/qt5-qtxmlpatterns/APKBUILD               | 2 +-
 community/qt5-websockets/APKBUILD                  | 2 +-
 community/qt5-x11extras/APKBUILD                   | 2 +-
 community/racktables/APKBUILD                      | 2 +-
 community/rawtherapee/APKBUILD                     | 2 +-
 community/rdfind/APKBUILD                          | 2 +-
 community/recon-ng/APKBUILD                        | 2 +-
 community/redshift/APKBUILD                        | 2 +-
 community/remind/APKBUILD                          | 2 +-
 community/repmgr/APKBUILD                          | 2 +-
 community/retawq/APKBUILD                          | 2 +-
 community/rethinkdb/APKBUILD                       | 2 +-
 community/rng-tools/APKBUILD                       | 2 +-
 community/roundcubemail/APKBUILD                   | 2 +-
 community/rover/APKBUILD                           | 2 +-
 community/rpm/APKBUILD                             | 2 +-
 community/rsound/APKBUILD                          | 2 +-
 community/rt4/APKBUILD                             | 2 +-
 community/rust/APKBUILD                            | 2 +-
 community/safekeep/APKBUILD                        | 2 +-
 community/salt/APKBUILD                            | 2 +-
 community/scapy/APKBUILD                           | 2 +-
 community/setconf/APKBUILD                         | 2 +-
 community/shotwell/APKBUILD                        | 2 +-
 community/sigar/APKBUILD                           | 2 +-
 community/soundtouch/APKBUILD                      | 2 +-
 community/spacefm/APKBUILD                         | 2 +-
 community/sphinx/APKBUILD                          | 2 +-
 community/sslstrip/APKBUILD                        | 2 +-
 community/stow/APKBUILD                            | 2 +-
 community/stunnel/APKBUILD                         | 2 +-
 community/suricata/APKBUILD                        | 2 +-
 community/sxiv/APKBUILD                            | 2 +-
 community/syncthing/APKBUILD                       | 2 +-
 community/syncthing13/APKBUILD                     | 2 +-
 community/syslog-summary/APKBUILD                  | 2 +-
 community/targetcli/APKBUILD                       | 2 +-
 community/terminator/APKBUILD                      | 2 +-
 community/terraform/APKBUILD                       | 2 +-
 community/tg/APKBUILD                              | 2 +-
 community/tinc-pre/APKBUILD                        | 2 +-
 community/tint2/APKBUILD                           | 2 +-
 community/tinyssh/APKBUILD                         | 2 +-
 community/tomahawk/APKBUILD                        | 2 +-
 community/tomcat-native/APKBUILD                   | 2 +-
 community/torsocks/APKBUILD                        | 2 +-
 community/tpm/APKBUILD                             | 2 +-
 community/tvheadend/APKBUILD                       | 2 +-
 community/ubridge/APKBUILD                         | 2 +-
 community/ucl/APKBUILD                             | 2 +-
 community/ucspi-tcp6/APKBUILD                      | 2 +-
 community/udevil/APKBUILD                          | 2 +-
 community/uhttpmock/APKBUILD                       | 2 +-
 community/uncrustify/APKBUILD                      | 2 +-
 community/unibilium/APKBUILD                       | 2 +-
 community/upx/APKBUILD                             | 2 +-
 community/vino/APKBUILD                            | 2 +-
 community/virt-manager/APKBUILD                    | 2 +-
 community/virtualbricks/APKBUILD                   | 2 +-
 community/vlc/APKBUILD                             | 2 +-
 community/volatility/APKBUILD                      | 2 +-
 community/volumeicon/APKBUILD                      | 2 +-
 community/vorbis-tools/APKBUILD                    | 2 +-
 community/vte3/APKBUILD                            | 2 +-
 community/wavemon/APKBUILD                         | 2 +-
 community/wbar/APKBUILD                            | 2 +-
 community/webkit2gtk/APKBUILD                      | 2 +-
 community/whois/APKBUILD                           | 2 +-
 community/wine/APKBUILD                            | 2 +-
 community/wiredtiger/APKBUILD                      | 2 +-
 community/wireshark/APKBUILD                       | 2 +-
 community/wiringpi/APKBUILD                        | 2 +-
 community/wrk/APKBUILD                             | 2 +-
 community/x2goserver/APKBUILD                      | 2 +-
 community/xapian-bindings/APKBUILD                 | 2 +-
 community/xapian-core/APKBUILD                     | 2 +-
 community/xapian-omega/APKBUILD                    | 2 +-
 community/xbindkeys/APKBUILD                       | 2 +-
 community/xkcdpass/APKBUILD                        | 2 +-
 community/xmltv/APKBUILD                           | 2 +-
 community/xpdf/APKBUILD                            | 2 +-
 community/xpra/APKBUILD                            | 2 +-
 community/xxhash/APKBUILD                          | 2 +-
 community/yad/APKBUILD                             | 2 +-
 community/yadifa/APKBUILD                          | 2 +-
 community/yarn/APKBUILD                            | 2 +-
 community/yelp-tools/APKBUILD                      | 2 +-
 community/yelp-xsl/APKBUILD                        | 2 +-
 community/ympd/APKBUILD                            | 2 +-
 community/zenity/APKBUILD                          | 2 +-
 community/zoneminder/APKBUILD                      | 2 +-
 community/zram-init/APKBUILD                       | 2 +-
 community/zsnes/APKBUILD                           | 2 +-
 community/zziplib/APKBUILD                         | 2 +-
 main/a2ps/APKBUILD                                 | 2 +-
 main/a52dec/APKBUILD                               | 2 +-
 main/abcde/APKBUILD                                | 2 +-
 main/abi-compliance-checker/APKBUILD               | 2 +-
 main/abuild/APKBUILD                               | 2 +-
 main/acct/APKBUILD                                 | 2 +-
 main/acf-alpine-baselayout/APKBUILD                | 2 +-
 main/acf-alpine-conf/APKBUILD                      | 2 +-
 main/acf-amavisd-new/APKBUILD                      | 2 +-
 main/acf-apk-tools/APKBUILD                        | 2 +-
 main/acf-asterisk/APKBUILD                         | 2 +-
 main/acf-awall/APKBUILD                            | 2 +-
 main/acf-chrony/APKBUILD                           | 2 +-
 main/acf-clamav/APKBUILD                           | 2 +-
 main/acf-clamsmtp/APKBUILD                         | 2 +-
 main/acf-core/APKBUILD                             | 2 +-
 main/acf-dansguardian/APKBUILD                     | 2 +-
 main/acf-db/APKBUILD                               | 2 +-
 main/acf-dhcp/APKBUILD                             | 2 +-
 main/acf-dnscache/APKBUILD                         | 2 +-
 main/acf-dnsmasq/APKBUILD                          | 2 +-
 main/acf-dovecot/APKBUILD                          | 2 +-
 main/acf-fetchmail/APKBUILD                        | 2 +-
 main/acf-freeradius3/APKBUILD                      | 2 +-
 main/acf-freeswitch-vmail/APKBUILD                 | 2 +-
 main/acf-freeswitch/APKBUILD                       | 2 +-
 main/acf-gross/APKBUILD                            | 2 +-
 main/acf-heimdal/APKBUILD                          | 2 +-
 main/acf-iproute2-qos/APKBUILD                     | 2 +-
 main/acf-ipsec-tools/APKBUILD                      | 2 +-
 main/acf-iptables/APKBUILD                         | 2 +-
 main/acf-jquery/APKBUILD                           | 2 +-
 main/acf-kamailio/APKBUILD                         | 2 +-
 main/acf-lib/APKBUILD                              | 2 +-
 main/acf-lighttpd/APKBUILD                         | 2 +-
 main/acf-lvm2/APKBUILD                             | 2 +-
 main/acf-mariadb/APKBUILD                          | 2 +-
 main/acf-mdadm/APKBUILD                            | 2 +-
 main/acf-nsd/APKBUILD                              | 2 +-
 main/acf-openldap/APKBUILD                         | 2 +-
 main/acf-opennhrp/APKBUILD                         | 2 +-
 main/acf-openntpd/APKBUILD                         | 2 +-
 main/acf-openssh/APKBUILD                          | 2 +-
 main/acf-openssl/APKBUILD                          | 2 +-
 main/acf-openvpn/APKBUILD                          | 2 +-
 main/acf-pingu/APKBUILD                            | 2 +-
 main/acf-postfix/APKBUILD                          | 2 +-
 main/acf-postgresql/APKBUILD                       | 2 +-
 main/acf-ppp/APKBUILD                              | 2 +-
 main/acf-provisioning/APKBUILD                     | 2 +-
 main/acf-quagga/APKBUILD                           | 2 +-
 main/acf-samba/APKBUILD                            | 2 +-
 main/acf-skins/APKBUILD                            | 2 +-
 main/acf-snort/APKBUILD                            | 2 +-
 main/acf-squid/APKBUILD                            | 2 +-
 main/acf-tcpproxy/APKBUILD                         | 2 +-
 main/acf-tinydns/APKBUILD                          | 2 +-
 main/acf-unbound/APKBUILD                          | 2 +-
 main/acf-weblog/APKBUILD                           | 2 +-
 main/ack/APKBUILD                                  | 2 +-
 main/acl/APKBUILD                                  | 2 +-
 main/acpi/APKBUILD                                 | 2 +-
 main/adwaita-icon-theme/APKBUILD                   | 2 +-
 main/alpine-baselayout/APKBUILD                    | 2 +-
 main/alpine-sdk/APKBUILD                           | 2 +-
 main/alpine/APKBUILD                               | 2 +-
 main/alsa-lib/APKBUILD                             | 2 +-
 main/altermime/APKBUILD                            | 2 +-
 main/amavisd-new/APKBUILD                          | 2 +-
 main/ansible/APKBUILD                              | 2 +-
 main/antiword/APKBUILD                             | 2 +-
 main/aoetools/APKBUILD                             | 2 +-
 main/apache-mod-auth-ntlm-winbind/APKBUILD         | 2 +-
 main/apache-mod-fcgid/APKBUILD                     | 2 +-
 main/apache2-mod-wsgi/APKBUILD                     | 2 +-
 main/apache2/APKBUILD                              | 2 +-
 main/apcupsd/APKBUILD                              | 2 +-
 main/api-sanity-checker/APKBUILD                   | 2 +-
 main/aports-build/APKBUILD                         | 2 +-
 main/appstream-glib/APKBUILD                       | 2 +-
 main/apr-util/APKBUILD                             | 2 +-
 main/apr/APKBUILD                                  | 2 +-
 main/argp-standalone/APKBUILD                      | 2 +-
 main/aria2/APKBUILD                                | 2 +-
 main/asciidoc/APKBUILD                             | 2 +-
 main/aspell-de/APKBUILD                            | 2 +-
 main/aspell-fr/APKBUILD                            | 2 +-
 main/aspell-ru/APKBUILD                            | 2 +-
 main/aspell-uk/APKBUILD                            | 2 +-
 main/aspell/APKBUILD                               | 2 +-
 main/asterisk/APKBUILD                             | 2 +-
 main/at-spi2-atk/APKBUILD                          | 2 +-
 main/at-spi2-core/APKBUILD                         | 2 +-
 main/atk/APKBUILD                                  | 2 +-
 main/atkmm/APKBUILD                                | 2 +-
 main/atop/APKBUILD                                 | 2 +-
 main/attr/APKBUILD                                 | 2 +-
 main/audit/APKBUILD                                | 2 +-
 main/augeas/APKBUILD                               | 2 +-
 main/aumix/APKBUILD                                | 2 +-
 main/autoconf/APKBUILD                             | 2 +-
 main/automake/APKBUILD                             | 2 +-
 main/avahi-ui/APKBUILD                             | 2 +-
 main/avahi/APKBUILD                                | 2 +-
 main/avfs/APKBUILD                                 | 2 +-
 main/awall/APKBUILD                                | 2 +-
 main/awstats/APKBUILD                              | 2 +-
 main/axel/APKBUILD                                 | 2 +-
 main/backuppc/APKBUILD                             | 2 +-
 main/bacula/APKBUILD                               | 2 +-
 main/bash-completion/APKBUILD                      | 2 +-
 main/bash/APKBUILD                                 | 2 +-
 main/bbsuid/APKBUILD                               | 2 +-
 main/bc/APKBUILD                                   | 2 +-
 main/beep/APKBUILD                                 | 2 +-
 main/binutils/APKBUILD                             | 2 +-
 main/bison/APKBUILD                                | 2 +-
 main/bitlbee/APKBUILD                              | 2 +-
 main/bluez-firmware/APKBUILD                       | 2 +-
 main/bluez/APKBUILD                                | 2 +-
 main/bmd-tools/APKBUILD                            | 2 +-
 main/bridge-utils/APKBUILD                         | 2 +-
 main/brlaser/APKBUILD                              | 2 +-
 main/btrfs-progs/APKBUILD                          | 2 +-
 main/busybox-initscripts/APKBUILD                  | 2 +-
 main/busybox/APKBUILD                              | 2 +-
 main/bwm-ng/APKBUILD                               | 2 +-
 main/byacc/APKBUILD                                | 2 +-
 main/byobu/APKBUILD                                | 2 +-
 main/ca-certificates/APKBUILD                      | 2 +-
 main/cabextract/APKBUILD                           | 2 +-
 main/cairo/APKBUILD                                | 2 +-
 main/cairomm/APKBUILD                              | 2 +-
 main/ccache/APKBUILD                               | 2 +-
 main/cciss_vol_status/APKBUILD                     | 2 +-
 main/cd-discid/APKBUILD                            | 2 +-
 main/cdparanoia/APKBUILD                           | 2 +-
 main/cdrkit/APKBUILD                               | 2 +-
 main/cdw/APKBUILD                                  | 2 +-
 main/cegui06/APKBUILD                              | 2 +-
 main/cgdb/APKBUILD                                 | 2 +-
 main/cgit/APKBUILD                                 | 2 +-
 main/charybdis/APKBUILD                            | 2 +-
 main/check/APKBUILD                                | 2 +-
 main/checkbashisms/APKBUILD                        | 2 +-
 main/chrony/APKBUILD                               | 2 +-
 main/cifs-utils/APKBUILD                           | 2 +-
 main/ciwiki/APKBUILD                               | 2 +-
 main/cjdns/APKBUILD                                | 2 +-
 main/ckbcomp/APKBUILD                              | 2 +-
 main/cksfv/APKBUILD                                | 2 +-
 main/clamav/APKBUILD                               | 2 +-
 main/cloog/APKBUILD                                | 2 +-
 main/clucene/APKBUILD                              | 2 +-
 main/cmocka/APKBUILD                               | 2 +-
 main/cmph/APKBUILD                                 | 2 +-
 main/cogl/APKBUILD                                 | 2 +-
 main/collectd/APKBUILD                             | 2 +-
 main/conntrack-tools/APKBUILD                      | 2 +-
 main/coova-chilli/APKBUILD                         | 2 +-
 main/coreutils/APKBUILD                            | 2 +-
 main/cppunit/APKBUILD                              | 2 +-
 main/cpufreqd/APKBUILD                             | 2 +-
 main/cpufrequtils/APKBUILD                         | 2 +-
 main/cpulimit/APKBUILD                             | 2 +-
 main/cracklib-words/APKBUILD                       | 2 +-
 main/cracklib/APKBUILD                             | 2 +-
 main/crconf/APKBUILD                               | 2 +-
 main/cryptsetup/APKBUILD                           | 2 +-
 main/ctags/APKBUILD                                | 2 +-
 main/cunit/APKBUILD                                | 2 +-
 main/cups-filters/APKBUILD                         | 2 +-
 main/cups/APKBUILD                                 | 2 +-
 main/cutter/APKBUILD                               | 2 +-
 main/cvechecker/APKBUILD                           | 2 +-
 main/cvs/APKBUILD                                  | 2 +-
 main/cython/APKBUILD                               | 2 +-
 main/d-feet/APKBUILD                               | 2 +-
 main/daq/APKBUILD                                  | 2 +-
 main/darkice/APKBUILD                              | 2 +-
 main/dconf/APKBUILD                                | 2 +-
 main/ddate/APKBUILD                                | 2 +-
 main/debootstrap/APKBUILD                          | 2 +-
 main/dejagnu/APKBUILD                              | 2 +-
 main/dev86/APKBUILD                                | 2 +-
 main/dhcpcd-ui/APKBUILD                            | 2 +-
 main/dhcpcd/APKBUILD                               | 2 +-
 main/diffutils/APKBUILD                            | 2 +-
 main/distcc/APKBUILD                               | 2 +-
 main/djbdns/APKBUILD                               | 2 +-
 main/dnsmasq/APKBUILD                              | 2 +-
 main/dnssec-root/APKBUILD                          | 2 +-
 main/dosfstools/APKBUILD                           | 2 +-
 main/dovecot/APKBUILD                              | 2 +-
 main/dtc/APKBUILD                                  | 2 +-
 main/duply/APKBUILD                                | 2 +-
 main/dvgrab/APKBUILD                               | 2 +-
 main/elfutils/APKBUILD                             | 2 +-
 main/email2trac/APKBUILD                           | 2 +-
 main/enchant/APKBUILD                              | 2 +-
 main/espeak/APKBUILD                               | 2 +-
 main/ethtool/APKBUILD                              | 2 +-
 main/eudev/APKBUILD                                | 2 +-
 main/exiv2/APKBUILD                                | 2 +-
 main/exo/APKBUILD                                  | 2 +-
 main/f2fs-tools/APKBUILD                           | 2 +-
 main/fail2ban/APKBUILD                             | 2 +-
 main/farstream/APKBUILD                            | 2 +-
 main/farstream0.1/APKBUILD                         | 2 +-
 main/fastjar/APKBUILD                              | 2 +-
 main/fish/APKBUILD                                 | 2 +-
 main/flex/APKBUILD                                 | 2 +-
 main/fribidi/APKBUILD                              | 2 +-
 main/fsarchiver/APKBUILD                           | 2 +-
 main/fuse/APKBUILD                                 | 2 +-
 main/gapk/APKBUILD                                 | 2 +-
 main/garcon/APKBUILD                               | 2 +-
 main/gcr/APKBUILD                                  | 2 +-
 main/gdb/APKBUILD                                  | 2 +-
 main/gengetopt/APKBUILD                            | 2 +-
 main/ghostscript/APKBUILD                          | 2 +-
 main/gigolo/APKBUILD                               | 2 +-
 main/git/APKBUILD                                  | 2 +-
 main/gitolite/APKBUILD                             | 2 +-
 main/glib-networking/APKBUILD                      | 2 +-
 main/gmp/APKBUILD                                  | 2 +-
 main/gnats/APKBUILD                                | 2 +-
 main/gnuchess/APKBUILD                             | 2 +-
 main/goaccess/APKBUILD                             | 2 +-
 main/gpicview/APKBUILD                             | 2 +-
 main/grub/APKBUILD                                 | 2 +-
 main/gtk-doc/APKBUILD                              | 2 +-
 main/gtk-murrine-engine/APKBUILD                   | 2 +-
 main/gtk-xfce-engine/APKBUILD                      | 2 +-
 main/gtkman/APKBUILD                               | 2 +-
 main/gummiboot/APKBUILD                            | 2 +-
 main/gvpe/APKBUILD                                 | 2 +-
 main/gzip/APKBUILD                                 | 2 +-
 main/halberd/APKBUILD                              | 2 +-
 main/haserl/APKBUILD                               | 2 +-
 main/help2man/APKBUILD                             | 2 +-
 main/hexchat/APKBUILD                              | 2 +-
 main/hicolor-icon-theme/APKBUILD                   | 2 +-
 main/highlight/APKBUILD                            | 2 +-
 main/htop/APKBUILD                                 | 2 +-
 main/hunspell-en/APKBUILD                          | 2 +-
 main/hunspell-pt-br/APKBUILD                       | 2 +-
 main/hunspell-pt/APKBUILD                          | 2 +-
 main/hunspell/APKBUILD                             | 2 +-
 main/hvtools/APKBUILD                              | 2 +-
 main/hwdata/APKBUILD                               | 2 +-
 main/hypermail/APKBUILD                            | 2 +-
 main/icon-naming-utils/APKBUILD                    | 2 +-
 main/iftop/APKBUILD                                | 2 +-
 main/igmpproxy/APKBUILD                            | 2 +-
 main/imap/APKBUILD                                 | 2 +-
 main/indent/APKBUILD                               | 2 +-
 main/inotify-tools/APKBUILD                        | 2 +-
 main/installkernel/APKBUILD                        | 2 +-
 main/intltool/APKBUILD                             | 2 +-
 main/iproute2-qos/APKBUILD                         | 2 +-
 main/iproute2/APKBUILD                             | 2 +-
 main/ipset/APKBUILD                                | 2 +-
 main/iptables/APKBUILD                             | 2 +-
 main/iptraf-ng/APKBUILD                            | 2 +-
 main/ipvsadm/APKBUILD                              | 2 +-
 main/ircservices/APKBUILD                          | 2 +-
 main/irqbalance/APKBUILD                           | 2 +-
 main/irssi/APKBUILD                                | 2 +-
 main/iscsi-scst/APKBUILD                           | 2 +-
 main/iso-codes/APKBUILD                            | 2 +-
 main/itstool/APKBUILD                              | 2 +-
 main/jack/APKBUILD                                 | 2 +-
 main/java-common/APKBUILD                          | 2 +-
 main/jbig2dec/APKBUILD                             | 2 +-
 main/jsoncpp/APKBUILD                              | 2 +-
 main/jwm/APKBUILD                                  | 2 +-
 main/kamailio/APKBUILD                             | 2 +-
 main/kbd/APKBUILD                                  | 2 +-
 main/keyutils/APKBUILD                             | 2 +-
 main/kmod/APKBUILD                                 | 2 +-
 main/knock/APKBUILD                                | 2 +-
 main/ksymoops/APKBUILD                             | 2 +-
 main/lame/APKBUILD                                 | 2 +-
 main/ldapvi/APKBUILD                               | 2 +-
 main/ldb/APKBUILD                                  | 2 +-
 main/lddtree/APKBUILD                              | 2 +-
 main/libaio/APKBUILD                               | 2 +-
 main/libassuan/APKBUILD                            | 2 +-
 main/libasyncns/APKBUILD                           | 2 +-
 main/libatomic_ops/APKBUILD                        | 2 +-
 main/libavc1394/APKBUILD                           | 2 +-
 main/libc0.9.32/APKBUILD                           | 2 +-
 main/libcdio-paranoia/APKBUILD                     | 2 +-
 main/libcdio/APKBUILD                              | 2 +-
 main/libcrystalhd/APKBUILD                         | 2 +-
 main/libdbi/APKBUILD                               | 2 +-
 main/libdv/APKBUILD                                | 2 +-
 main/libee/APKBUILD                                | 2 +-
 main/libestr/APKBUILD                              | 2 +-
 main/libfprint/APKBUILD                            | 2 +-
 main/libgcab/APKBUILD                              | 2 +-
 main/libgee/APKBUILD                               | 2 +-
 main/libgit2/APKBUILD                              | 2 +-
 main/libgsasl/APKBUILD                             | 2 +-
 main/libgss/APKBUILD                               | 2 +-
 main/libgudev/APKBUILD                             | 2 +-
 main/libiec61883/APKBUILD                          | 2 +-
 main/libisoburn/APKBUILD                           | 2 +-
 main/liblastfm/APKBUILD                            | 2 +-
 main/libmaxminddb/APKBUILD                         | 2 +-
 main/libmp3splt/APKBUILD                           | 2 +-
 main/libmpeg2/APKBUILD                             | 2 +-
 main/libmspack/APKBUILD                            | 2 +-
 main/libmtp/APKBUILD                               | 2 +-
 main/libnetfilter_acct/APKBUILD                    | 2 +-
 main/libnetfilter_conntrack/APKBUILD               | 2 +-
 main/libnetfilter_cthelper/APKBUILD                | 2 +-
 main/libnetfilter_cttimeout/APKBUILD               | 2 +-
 main/libnetfilter_log/APKBUILD                     | 2 +-
 main/libnetfilter_queue/APKBUILD                   | 2 +-
 main/libnfnetlink/APKBUILD                         | 2 +-
 main/libnftnl/APKBUILD                             | 2 +-
 main/libnice/APKBUILD                              | 2 +-
 main/libnl/APKBUILD                                | 2 +-
 main/liboping/APKBUILD                             | 2 +-
 main/libotr/APKBUILD                               | 2 +-
 main/libotr3/APKBUILD                              | 2 +-
 main/libproxy/APKBUILD                             | 2 +-
 main/libquvi-scripts/APKBUILD                      | 2 +-
 main/libquvi/APKBUILD                              | 2 +-
 main/librevenge/APKBUILD                           | 2 +-
 main/librsync/APKBUILD                             | 2 +-
 main/libseccomp/APKBUILD                           | 2 +-
 main/libsecret/APKBUILD                            | 2 +-
 main/libsndfile/APKBUILD                           | 2 +-
 main/libsoup/APKBUILD                              | 2 +-
 main/libspf2/APKBUILD                              | 2 +-
 main/libtasn1/APKBUILD                             | 2 +-
 main/libusb/APKBUILD                               | 2 +-
 main/libvncserver/APKBUILD                         | 2 +-
 main/libwebsockets/APKBUILD                        | 2 +-
 main/libxfce4ui/APKBUILD                           | 2 +-
 main/libxfce4util/APKBUILD                         | 2 +-
 main/links/APKBUILD                                | 2 +-
 main/linux-hardened/APKBUILD                       | 2 +-
 main/linux-rpi/APKBUILD                            | 2 +-
 main/linux-vanilla/APKBUILD                        | 2 +-
 main/lksctp-tools/APKBUILD                         | 2 +-
 main/logrotate/APKBUILD                            | 2 +-
 main/logtail/APKBUILD                              | 2 +-
 main/loudmouth/APKBUILD                            | 2 +-
 main/lsyncd/APKBUILD                               | 2 +-
 main/lttng-ust/APKBUILD                            | 2 +-
 main/lua-bitlib/APKBUILD                           | 2 +-
 main/lua-cmsgpack/APKBUILD                         | 2 +-
 main/lua-crypto/APKBUILD                           | 2 +-
 main/lua-curl/APKBUILD                             | 2 +-
 main/lua-json4/APKBUILD                            | 2 +-
 main/lua-pc/APKBUILD                               | 2 +-
 main/lua-posixtz/APKBUILD                          | 2 +-
 main/lua-pty/APKBUILD                              | 2 +-
 main/lua-uuid/APKBUILD                             | 2 +-
 main/lua-xctrl/APKBUILD                            | 2 +-
 main/lxpolkit/APKBUILD                             | 2 +-
 main/lxsession/APKBUILD                            | 2 +-
 main/lxterminal/APKBUILD                           | 2 +-
 main/lzip/APKBUILD                                 | 2 +-
 main/mailcap/APKBUILD                              | 2 +-
 main/make/APKBUILD                                 | 2 +-
 main/mc/APKBUILD                                   | 2 +-
 main/mcabber/APKBUILD                              | 2 +-
 main/mdadm/APKBUILD                                | 2 +-
 main/mercurial/APKBUILD                            | 2 +-
 main/meson/APKBUILD                                | 2 +-
 main/mg/APKBUILD                                   | 2 +-
 main/minicom/APKBUILD                              | 2 +-
 main/mkinitfs/APKBUILD                             | 2 +-
 main/monkeysphere/APKBUILD                         | 2 +-
 main/mosh/APKBUILD                                 | 2 +-
 main/motif/APKBUILD                                | 2 +-
 main/mousepad/APKBUILD                             | 2 +-
 main/mp3splt-gtk/APKBUILD                          | 2 +-
 main/mp3splt/APKBUILD                              | 2 +-
 main/mpc1/APKBUILD                                 | 2 +-
 main/mpg123/APKBUILD                               | 2 +-
 main/msmtp/APKBUILD                                | 2 +-
 main/mt-st/APKBUILD                                | 2 +-
 main/mtx/APKBUILD                                  | 2 +-
 main/multisort/APKBUILD                            | 2 +-
 main/mupdf/APKBUILD                                | 2 +-
 main/myrepos/APKBUILD                              | 2 +-
 main/nagios-plugins/APKBUILD                       | 2 +-
 main/nagios/APKBUILD                               | 2 +-
 main/nasm/APKBUILD                                 | 2 +-
 main/net-tools/APKBUILD                            | 2 +-
 main/netcf/APKBUILD                                | 2 +-
 main/nettle/APKBUILD                               | 2 +-
 main/newt/APKBUILD                                 | 2 +-
 main/nftables/APKBUILD                             | 2 +-
 main/ngircd/APKBUILD                               | 2 +-
 main/nikto/APKBUILD                                | 2 +-
 main/npth/APKBUILD                                 | 2 +-
 main/nspr/APKBUILD                                 | 2 +-
 main/nss-pam-ldapd/APKBUILD                        | 2 +-
 main/obex-data-server/APKBUILD                     | 2 +-
 main/omxplayer/APKBUILD                            | 2 +-
 main/open-iscsi/APKBUILD                           | 2 +-
 main/open-isns/APKBUILD                            | 2 +-
 main/openbox/APKBUILD                              | 2 +-
 main/openipmi/APKBUILD                             | 2 +-
 main/opennhrp/APKBUILD                             | 2 +-
 main/openpgm/APKBUILD                              | 2 +-
 main/openvswitch/APKBUILD                          | 2 +-
 main/orage/APKBUILD                                | 2 +-
 main/ortp/APKBUILD                                 | 2 +-
 main/p7zip/APKBUILD                                | 2 +-
 main/parallel/APKBUILD                             | 2 +-
 main/parted/APKBUILD                               | 2 +-
 main/patchutils/APKBUILD                           | 2 +-
 main/pax-utils/APKBUILD                            | 2 +-
 main/paxctl/APKBUILD                               | 2 +-
 main/perl-cache-simple-timedexpiry/APKBUILD        | 2 +-
 main/perl-capture-tiny/APKBUILD                    | 2 +-
 main/perl-class-accessor/APKBUILD                  | 2 +-
 main/perl-class-inspector/APKBUILD                 | 2 +-
 main/perl-class-returnvalue/APKBUILD               | 2 +-
 main/perl-class-tiny/APKBUILD                      | 2 +-
 main/perl-clone/APKBUILD                           | 2 +-
 main/perl-convert-uulib/APKBUILD                   | 2 +-
 main/perl-crypt-openssl-rsa/APKBUILD               | 2 +-
 main/perl-crypt-rijndael/APKBUILD                  | 2 +-
 main/perl-css-squish/APKBUILD                      | 2 +-
 main/perl-data-optlist/APKBUILD                    | 2 +-
 main/perl-data-uuid/APKBUILD                       | 2 +-
 main/perl-datetime-format-mail/APKBUILD            | 2 +-
 main/perl-datetime-format-w3cdtf/APKBUILD          | 2 +-
 main/perl-datetime-locale/APKBUILD                 | 2 +-
 main/perl-datetime/APKBUILD                        | 2 +-
 main/perl-dbix-dbschema/APKBUILD                   | 2 +-
 main/perl-devel-stacktrace-ashtml/APKBUILD         | 2 +-
 main/perl-devel-stacktrace/APKBUILD                | 2 +-
 main/perl-fcgi-procmanager/APKBUILD                | 2 +-
 main/perl-file-listing/APKBUILD                    | 2 +-
 main/perl-file-sharedir/APKBUILD                   | 2 +-
 main/perl-filesys-notify-simple/APKBUILD           | 2 +-
 main/perl-hash-multivalue/APKBUILD                 | 2 +-
 main/perl-html-quoted/APKBUILD                     | 2 +-
 main/perl-http-body/APKBUILD                       | 2 +-
 main/perl-http-cookies/APKBUILD                    | 2 +-
 main/perl-http-daemon/APKBUILD                     | 2 +-
 main/perl-http-negotiate/APKBUILD                  | 2 +-
 main/perl-ipc-run3/APKBUILD                        | 2 +-
 main/perl-list-allutils/APKBUILD                   | 2 +-
 main/perl-list-someutils-xs/APKBUILD               | 2 +-
 main/perl-locale-maketext-fuzzy/APKBUILD           | 2 +-
 main/perl-locale-maketext-lexicon/APKBUILD         | 2 +-
 main/perl-log-dispatch/APKBUILD                    | 2 +-
 main/perl-mail-spamassassin/APKBUILD               | 2 +-
 main/perl-math-round/APKBUILD                      | 2 +-
 main/perl-module-implementation/APKBUILD           | 2 +-
 main/perl-module-versions-report/APKBUILD          | 2 +-
 main/perl-net-http/APKBUILD                        | 2 +-
 main/perl-net-rblclient/APKBUILD                   | 2 +-
 main/perl-netaddr-ip/APKBUILD                      | 2 +-
 main/perl-package-deprecationmanager/APKBUILD      | 2 +-
 main/perl-params-util/APKBUILD                     | 2 +-
 main/perl-params-validate/APKBUILD                 | 2 +-
 main/perl-params-validationcompiler/APKBUILD       | 2 +-
 main/perl-path-tiny/APKBUILD                       | 2 +-
 main/perl-regexp-common-net-cidr/APKBUILD          | 2 +-
 main/perl-regexp-common/APKBUILD                   | 2 +-
 main/perl-regexp-ipv6/APKBUILD                     | 2 +-
 main/perl-scope-guard/APKBUILD                     | 2 +-
 main/perl-specio/APKBUILD                          | 2 +-
 main/perl-sub-install/APKBUILD                     | 2 +-
 main/perl-test-deep/APKBUILD                       | 2 +-
 main/perl-test-failwarnings/APKBUILD               | 2 +-
 main/perl-test-longstring/APKBUILD                 | 2 +-
 main/perl-test-mockrandom/APKBUILD                 | 2 +-
 main/perl-test-nowarnings/APKBUILD                 | 2 +-
 main/perl-test-number-delta/APKBUILD               | 2 +-
 main/perl-test-sharedfork/APKBUILD                 | 2 +-
 main/perl-test2-plugin-nowarnings/APKBUILD         | 2 +-
 main/perl-text-autoformat/APKBUILD                 | 2 +-
 main/perl-text-password-pronounceable/APKBUILD     | 2 +-
 main/perl-text-reform/APKBUILD                     | 2 +-
 main/perl-text-template/APKBUILD                   | 2 +-
 main/perl-tree-dag_node/APKBUILD                   | 2 +-
 main/perl-www-robotrules/APKBUILD                  | 2 +-
 main/perl-yaml-syck/APKBUILD                       | 2 +-
 main/perl/APKBUILD                                 | 2 +-
 main/phodav/APKBUILD                               | 2 +-
 main/pidgin-sipe/APKBUILD                          | 2 +-
 main/pinentry/APKBUILD                             | 2 +-
 main/polkit-gnome/APKBUILD                         | 2 +-
 main/postfix/APKBUILD                              | 2 +-
 main/powertop/APKBUILD                             | 2 +-
 main/ppp/APKBUILD                                  | 2 +-
 main/pptpd/APKBUILD                                | 2 +-
 main/proxychains-ng/APKBUILD                       | 2 +-
 main/pth/APKBUILD                                  | 2 +-
 main/py-bcrypt/APKBUILD                            | 2 +-
 main/py-bluez/APKBUILD                             | 2 +-
 main/py-chardet/APKBUILD                           | 2 +-
 main/py-cliapp/APKBUILD                            | 2 +-
 main/py-country/APKBUILD                           | 2 +-
 main/py-cryptography/APKBUILD                      | 2 +-
 main/py-curl/APKBUILD                              | 2 +-
 main/py-django-treebeard/APKBUILD                  | 2 +-
 main/py-docutils/APKBUILD                          | 2 +-
 main/py-funcsigs/APKBUILD                          | 2 +-
 main/py-fuse/APKBUILD                              | 2 +-
 main/py-gst0.10/APKBUILD                           | 2 +-
 main/py-hgtools/APKBUILD                           | 2 +-
 main/py-irc/APKBUILD                               | 2 +-
 main/py-larch/APKBUILD                             | 2 +-
 main/py-libvirt/APKBUILD                           | 2 +-
 main/py-nose/APKBUILD                              | 2 +-
 main/py-openssl/APKBUILD                           | 2 +-
 main/py-paramiko/APKBUILD                          | 2 +-
 main/py-pbr/APKBUILD                               | 2 +-
 main/py-phonenumbers/APKBUILD                      | 2 +-
 main/py-psycopg2/APKBUILD                          | 2 +-
 main/py-pynacl/APKBUILD                            | 2 +-
 main/py-requests/APKBUILD                          | 2 +-
 main/py-tornado/APKBUILD                           | 2 +-
 main/py-tracing/APKBUILD                           | 2 +-
 main/py-ttystatus/APKBUILD                         | 2 +-
 main/py-twitter/APKBUILD                           | 2 +-
 main/py-unidecode/APKBUILD                         | 2 +-
 main/py-urlgrabber/APKBUILD                        | 2 +-
 main/py-urwid/APKBUILD                             | 2 +-
 main/py2-cairo/APKBUILD                            | 2 +-
 main/py3-cairo/APKBUILD                            | 2 +-
 main/qemu/APKBUILD                                 | 2 +-
 main/qpdf/APKBUILD                                 | 2 +-
 main/qt/APKBUILD                                   | 2 +-
 main/quagga/APKBUILD                               | 2 +-
 main/quvi/APKBUILD                                 | 2 +-
 main/ragel/APKBUILD                                | 2 +-
 main/rdiff-backup/APKBUILD                         | 2 +-
 main/re2c/APKBUILD                                 | 2 +-
 main/recode/APKBUILD                               | 2 +-
 main/rest/APKBUILD                                 | 2 +-
 main/ristretto/APKBUILD                            | 2 +-
 main/rrdcollect/APKBUILD                           | 2 +-
 main/rsnapshot/APKBUILD                            | 2 +-
 main/rsync/APKBUILD                                | 2 +-
 main/rsyslog/APKBUILD                              | 2 +-
 main/ruby-augeas/APKBUILD                          | 2 +-
 main/samba/APKBUILD                                | 2 +-
 main/sc/APKBUILD                                   | 2 +-
 main/screen/APKBUILD                               | 2 +-
 main/scstadmin/APKBUILD                            | 2 +-
 main/sdl_image/APKBUILD                            | 2 +-
 main/seabios/APKBUILD                              | 2 +-
 main/sems/APKBUILD                                 | 2 +-
 main/serf/APKBUILD                                 | 2 +-
 main/shorewall-core/APKBUILD                       | 2 +-
 main/shorewall/APKBUILD                            | 2 +-
 main/shorewall6/APKBUILD                           | 2 +-
 main/sipp/APKBUILD                                 | 2 +-
 main/sipsak/APKBUILD                               | 2 +-
 main/sircbot/APKBUILD                              | 2 +-
 main/skytraq-datalogger/APKBUILD                   | 2 +-
 main/slim/APKBUILD                                 | 2 +-
 main/sntpc/APKBUILD                                | 2 +-
 main/soxr/APKBUILD                                 | 2 +-
 main/spamassassin/APKBUILD                         | 2 +-
 main/speedtest-cli/APKBUILD                        | 2 +-
 main/spice-gtk/APKBUILD                            | 2 +-
 main/spice-protocol/APKBUILD                       | 2 +-
 main/spice/APKBUILD                                | 2 +-
 main/sprunge/APKBUILD                              | 2 +-
 main/squid/APKBUILD                                | 2 +-
 main/sshpass/APKBUILD                              | 2 +-
 main/ssmtp/APKBUILD                                | 2 +-
 main/stfl/APKBUILD                                 | 2 +-
 main/strongswan/APKBUILD                           | 2 +-
 main/subversion/APKBUILD                           | 2 +-
 main/swig/APKBUILD                                 | 2 +-
 main/syslog-ng/APKBUILD                            | 2 +-
 main/sysstat/APKBUILD                              | 2 +-
 main/taglib/APKBUILD                               | 2 +-
 main/talloc/APKBUILD                               | 2 +-
 main/tango-icon-theme/APKBUILD                     | 2 +-
 main/tcpflow/APKBUILD                              | 2 +-
 main/tcpproxy/APKBUILD                             | 2 +-
 main/tdb/APKBUILD                                  | 2 +-
 main/tevent/APKBUILD                               | 2 +-
 main/the_silver_searcher/APKBUILD                  | 2 +-
 main/thin-provisioning-tools/APKBUILD              | 2 +-
 main/thunar-archive-plugin/APKBUILD                | 2 +-
 main/thunar-vcs-plugin/APKBUILD                    | 2 +-
 main/thunar/APKBUILD                               | 2 +-
 main/tig/APKBUILD                                  | 2 +-
 main/tinc/APKBUILD                                 | 2 +-
 main/tinyproxy/APKBUILD                            | 2 +-
 main/tree/APKBUILD                                 | 2 +-
 main/tslib/APKBUILD                                | 2 +-
 main/tsocks/APKBUILD                               | 2 +-
 main/ttf-liberation/APKBUILD                       | 2 +-
 main/tumbler/APKBUILD                              | 2 +-
 main/txt2man/APKBUILD                              | 2 +-
 main/tzdata/APKBUILD                               | 2 +-
 main/u-boot/APKBUILD                               | 2 +-
 main/udev-init-scripts/APKBUILD                    | 2 +-
 main/udisks/APKBUILD                               | 2 +-
 main/udisks2/APKBUILD                              | 2 +-
 main/ulogd/APKBUILD                                | 2 +-
 main/umix/APKBUILD                                 | 2 +-
 main/unixodbc/APKBUILD                             | 2 +-
 main/upower/APKBUILD                               | 2 +-
 main/usb-modeswitch/APKBUILD                       | 2 +-
 main/usbredir/APKBUILD                             | 2 +-
 main/usbutils/APKBUILD                             | 2 +-
 main/userspace-rcu/APKBUILD                        | 2 +-
 main/util-linux/APKBUILD                           | 2 +-
 main/uvncrepeater/APKBUILD                         | 2 +-
 main/uwsgi/APKBUILD                                | 2 +-
 main/v4l-utils/APKBUILD                            | 2 +-
 main/v86d/APKBUILD                                 | 2 +-
 main/vala/APKBUILD                                 | 2 +-
 main/valgrind/APKBUILD                             | 2 +-
 main/vanessa_adt/APKBUILD                          | 2 +-
 main/vanessa_logger/APKBUILD                       | 2 +-
 main/vanessa_socket/APKBUILD                       | 2 +-
 main/vblade/APKBUILD                               | 2 +-
 main/vsftpd/APKBUILD                               | 2 +-
 main/vte/APKBUILD                                  | 2 +-
 main/weechat/APKBUILD                              | 2 +-
 main/wget/APKBUILD                                 | 2 +-
 main/which/APKBUILD                                | 2 +-
 main/wipe/APKBUILD                                 | 2 +-
 main/wireless-tools/APKBUILD                       | 2 +-
 main/wv/APKBUILD                                   | 2 +-
 main/xautolock/APKBUILD                            | 2 +-
 main/xclip/APKBUILD                                | 2 +-
 main/xfburn/APKBUILD                               | 2 +-
 main/xfce4-appfinder/APKBUILD                      | 2 +-
 main/xfce4-battery-plugin/APKBUILD                 | 2 +-
 main/xfce4-clipman-plugin/APKBUILD                 | 2 +-
 main/xfce4-cpufreq-plugin/APKBUILD                 | 2 +-
 main/xfce4-cpugraph-plugin/APKBUILD                | 2 +-
 main/xfce4-dev-tools/APKBUILD                      | 2 +-
 main/xfce4-mixer/APKBUILD                          | 2 +-
 main/xfce4-notifyd/APKBUILD                        | 2 +-
 main/xfce4-panel/APKBUILD                          | 2 +-
 main/xfce4-power-manager/APKBUILD                  | 2 +-
 main/xfce4-screenshooter/APKBUILD                  | 2 +-
 main/xfce4-session/APKBUILD                        | 2 +-
 main/xfce4-settings/APKBUILD                       | 2 +-
 main/xfce4-taskmanager/APKBUILD                    | 2 +-
 main/xfce4-terminal/APKBUILD                       | 2 +-
 main/xfce4-volumed/APKBUILD                        | 2 +-
 main/xfce4-whiskermenu-plugin/APKBUILD             | 2 +-
 main/xfconf/APKBUILD                               | 2 +-
 main/xfdesktop/APKBUILD                            | 2 +-
 main/xfwm4-themes/APKBUILD                         | 2 +-
 main/xfwm4/APKBUILD                                | 2 +-
 main/xmlto/APKBUILD                                | 2 +-
 main/xrdp/APKBUILD                                 | 2 +-
 main/yaboot/APKBUILD                               | 2 +-
 main/yeahconsole/APKBUILD                          | 2 +-
 main/zd1211-firmware/APKBUILD                      | 2 +-
 main/zeromq/APKBUILD                               | 2 +-
 main/zmap/APKBUILD                                 | 2 +-
 main/znc/APKBUILD                                  | 2 +-
 testing/accountsservice/APKBUILD                   | 2 +-
 testing/agg/APKBUILD                               | 2 +-
 testing/alttab/APKBUILD                            | 2 +-
 testing/amule/APKBUILD                             | 2 +-
 testing/apache2-mod-authnz-external/APKBUILD       | 2 +-
 testing/apache2-mod-perl/APKBUILD                  | 2 +-
 testing/apt-dater-host/APKBUILD                    | 2 +-
 testing/apt-dater/APKBUILD                         | 2 +-
 testing/aqemu/APKBUILD                             | 2 +-
 testing/argon2/APKBUILD                            | 2 +-
 testing/arp-scan/APKBUILD                          | 2 +-
 testing/artifactory-oss/APKBUILD                   | 2 +-
 testing/atool/APKBUILD                             | 2 +-
 testing/aufs-util/APKBUILD                         | 2 +-
 testing/autocutsel/APKBUILD                        | 2 +-
 testing/aws-cli/APKBUILD                           | 2 +-
 testing/beard/APKBUILD                             | 2 +-
 testing/biblatex/APKBUILD                          | 2 +-
 testing/bird/APKBUILD                              | 2 +-
 testing/blender/APKBUILD                           | 2 +-
 testing/bobcat/APKBUILD                            | 2 +-
 testing/buildbot-slave/APKBUILD                    | 2 +-
 testing/capstone/APKBUILD                          | 2 +-
 testing/catcodec/APKBUILD                          | 2 +-
 testing/celery/APKBUILD                            | 2 +-
 testing/checkpolicy/APKBUILD                       | 2 +-
 testing/clapf/APKBUILD                             | 2 +-
 testing/closure-compiler/APKBUILD                  | 2 +-
 testing/cloudfoundry-cli/APKBUILD                  | 2 +-
 testing/cntlm/APKBUILD                             | 2 +-
 testing/colord-gtk/APKBUILD                        | 2 +-
 testing/colord/APKBUILD                            | 2 +-
 testing/colormake/APKBUILD                         | 2 +-
 testing/consul/APKBUILD                            | 2 +-
 testing/containerd/APKBUILD                        | 2 +-
 testing/copyq/APKBUILD                             | 2 +-
 testing/cpd/APKBUILD                               | 2 +-
 testing/cpiped/APKBUILD                            | 2 +-
 testing/cpupower/APKBUILD                          | 2 +-
 testing/createrepo_c/APKBUILD                      | 2 +-
 testing/criu/APKBUILD                              | 2 +-
 testing/crypto++/APKBUILD                          | 2 +-
 testing/ctorrent-dnh/APKBUILD                      | 2 +-
 testing/daemontools/APKBUILD                       | 2 +-
 testing/dante/APKBUILD                             | 2 +-
 testing/darktable/APKBUILD                         | 2 +-
 testing/deluge/APKBUILD                            | 2 +-
 testing/dep/APKBUILD                               | 2 +-
 testing/dnsenum/APKBUILD                           | 2 +-
 testing/dnssec-tools/APKBUILD                      | 2 +-
 testing/dspam/APKBUILD                             | 2 +-
 testing/dstat/APKBUILD                             | 2 +-
 testing/dynagen/APKBUILD                           | 2 +-
 testing/ecasound/APKBUILD                          | 2 +-
 testing/eigen/APKBUILD                             | 2 +-
 testing/ejabberd/APKBUILD                          | 2 +-
 testing/emby/APKBUILD                              | 2 +-
 testing/esptool/APKBUILD                           | 2 +-
 testing/etcd/APKBUILD                              | 2 +-
 testing/evolution-ews/APKBUILD                     | 2 +-
 testing/fatback/APKBUILD                           | 2 +-
 testing/fatresize/APKBUILD                         | 2 +-
 testing/ffcall/APKBUILD                            | 2 +-
 testing/fgt/APKBUILD                               | 2 +-
 testing/filebeat/APKBUILD                          | 2 +-
 testing/filezilla/APKBUILD                         | 2 +-
 testing/flawfinder/APKBUILD                        | 2 +-
 testing/flickcurl/APKBUILD                         | 2 +-
 testing/fontforge/APKBUILD                         | 2 +-
 testing/fuse3/APKBUILD                             | 2 +-
 testing/fwknop/APKBUILD                            | 2 +-
 testing/gatling/APKBUILD                           | 2 +-
 testing/gdnsd/APKBUILD                             | 2 +-
 testing/geos/APKBUILD                              | 2 +-
 testing/getmail/APKBUILD                           | 2 +-
 testing/ginger/APKBUILD                            | 2 +-
 testing/gingerbase/APKBUILD                        | 2 +-
 testing/git-cola/APKBUILD                          | 2 +-
 testing/git-review/APKBUILD                        | 2 +-
 testing/go-bindata/APKBUILD                        | 2 +-
 testing/goobook/APKBUILD                           | 2 +-
 testing/googler/APKBUILD                           | 2 +-
 testing/gosu/APKBUILD                              | 2 +-
 testing/gpa/APKBUILD                               | 2 +-
 testing/gpg-remailer/APKBUILD                      | 2 +-
 testing/gutenprint/APKBUILD                        | 2 +-
 testing/hamlib/APKBUILD                            | 2 +-
 testing/handbrake/APKBUILD                         | 2 +-
 testing/handlebars/APKBUILD                        | 2 +-
 testing/hexer/APKBUILD                             | 2 +-
 testing/hfst/APKBUILD                              | 2 +-
 testing/hping3/APKBUILD                            | 2 +-
 testing/httrack/APKBUILD                           | 2 +-
 testing/i2c-tools/APKBUILD                         | 2 +-
 testing/icingaweb2-module-businessprocess/APKBUILD | 2 +-
 testing/icingaweb2-module-fileshipper/APKBUILD     | 2 +-
 testing/icingaweb2-module-generictts/APKBUILD      | 2 +-
 testing/icingaweb2-module-pnp/APKBUILD             | 2 +-
 testing/icmake/APKBUILD                            | 2 +-
 testing/idris/APKBUILD                             | 2 +-
 testing/infiniband-diags/APKBUILD                  | 2 +-
 testing/iprange/APKBUILD                           | 2 +-
 testing/irclog2html/APKBUILD                       | 2 +-
 testing/jabber-roster/APKBUILD                     | 2 +-
 testing/jo/APKBUILD                                | 2 +-
 testing/kexec-tools/APKBUILD                       | 2 +-
 testing/keychain/APKBUILD                          | 2 +-
 testing/kimchi/APKBUILD                            | 2 +-
 testing/knot-resolver/APKBUILD                     | 2 +-
 testing/kubernetes/APKBUILD                        | 2 +-
 testing/ladspa/APKBUILD                            | 2 +-
 testing/laszip/APKBUILD                            | 2 +-
 testing/lazperf/APKBUILD                           | 2 +-
 testing/lbzip2/APKBUILD                            | 2 +-
 testing/libbson/APKBUILD                           | 2 +-
 testing/libcli/APKBUILD                            | 2 +-
 testing/libcypher-parser/APKBUILD                  | 2 +-
 testing/libdwarf/APKBUILD                          | 2 +-
 testing/libfilezilla/APKBUILD                      | 2 +-
 testing/libgeotiff/APKBUILD                        | 2 +-
 testing/libgnomecanvas/APKBUILD                    | 2 +-
 testing/libibmad/APKBUILD                          | 2 +-
 testing/libibumad/APKBUILD                         | 2 +-
 testing/libieee1284/APKBUILD                       | 2 +-
 testing/libimobiledevice/APKBUILD                  | 2 +-
 testing/libmdf/APKBUILD                            | 2 +-
 testing/libmodbus/APKBUILD                         | 2 +-
 testing/libneo4j-client/APKBUILD                   | 2 +-
 testing/libpipeline/APKBUILD                       | 2 +-
 testing/libplist/APKBUILD                          | 2 +-
 testing/librtlsdr/APKBUILD                         | 2 +-
 testing/libselinux/APKBUILD                        | 2 +-
 testing/libsemanage/APKBUILD                       | 2 +-
 testing/libsepol/APKBUILD                          | 2 +-
 testing/libsigsegv/APKBUILD                        | 2 +-
 testing/libsmi/APKBUILD                            | 2 +-
 testing/libspatialite/APKBUILD                     | 2 +-
 testing/libspiro/APKBUILD                          | 2 +-
 testing/libtbb/APKBUILD                            | 2 +-
 testing/libuninameslist/APKBUILD                   | 2 +-
 testing/libupnpp/APKBUILD                          | 2 +-
 testing/libusbmuxd/APKBUILD                        | 2 +-
 testing/libxml++-2.6/APKBUILD                      | 2 +-
 testing/libxml++/APKBUILD                          | 2 +-
 testing/lightdm/APKBUILD                           | 2 +-
 testing/linuxconsoletools/APKBUILD                 | 2 +-
 testing/litespeed/APKBUILD                         | 2 +-
 testing/lizardfs/APKBUILD                          | 2 +-
 testing/logstash/APKBUILD                          | 2 +-
 testing/lshell/APKBUILD                            | 2 +-
 testing/lttng-tools/APKBUILD                       | 2 +-
 testing/lua-uuid/APKBUILD                          | 2 +-
 testing/luakit/APKBUILD                            | 2 +-
 testing/lxqt-build-tools/APKBUILD                  | 2 +-
 testing/lzlib/APKBUILD                             | 2 +-
 testing/mailutils/APKBUILD                         | 2 +-
 testing/man-db/APKBUILD                            | 2 +-
 testing/mapnik/APKBUILD                            | 2 +-
 testing/mblaze/APKBUILD                            | 2 +-
 testing/mednafen/APKBUILD                          | 2 +-
 testing/meep/APKBUILD                              | 2 +-
 testing/megatools/APKBUILD                         | 2 +-
 testing/meld/APKBUILD                              | 2 +-
 testing/mhddfs/APKBUILD                            | 2 +-
 testing/mlocate/APKBUILD                           | 2 +-
 testing/mongo-c-driver/APKBUILD                    | 2 +-
 testing/mongo-php7-driver/APKBUILD                 | 2 +-
 testing/mongo-php7-library/APKBUILD                | 2 +-
 testing/mopidy/APKBUILD                            | 2 +-
 testing/most/APKBUILD                              | 2 +-
 testing/motion/APKBUILD                            | 2 +-
 testing/msgpuck/APKBUILD                           | 2 +-
 testing/mtd-utils/APKBUILD                         | 2 +-
 testing/mu/APKBUILD                                | 2 +-
 testing/mxml/APKBUILD                              | 2 +-
 testing/ncmpcpp/APKBUILD                           | 2 +-
 testing/ndpi/APKBUILD                              | 2 +-
 testing/neomutt/APKBUILD                           | 2 +-
 testing/netdata/APKBUILD                           | 2 +-
 testing/netdisco/APKBUILD                          | 2 +-
 testing/netsink/APKBUILD                           | 2 +-
 testing/netsurf/APKBUILD                           | 2 +-
 testing/nimble/APKBUILD                            | 2 +-
 testing/nitro/APKBUILD                             | 2 +-
 testing/node-closurecompiler-externs/APKBUILD      | 2 +-
 testing/nomp/APKBUILD                              | 2 +-
 testing/nototools/APKBUILD                         | 2 +-
 testing/numactl/APKBUILD                           | 2 +-
 testing/nzbget/APKBUILD                            | 2 +-
 testing/oath-toolkit/APKBUILD                      | 8 ++++----
 testing/obs-studio/APKBUILD                        | 2 +-
 testing/octave/APKBUILD                            | 2 +-
 testing/ofono/APKBUILD                             | 2 +-
 testing/opencc/APKBUILD                            | 2 +-
 testing/openconnect/APKBUILD                       | 2 +-
 testing/opensm/APKBUILD                            | 2 +-
 testing/openssh-askpass/APKBUILD                   | 2 +-
 testing/opensubdiv/APKBUILD                        | 2 +-
 testing/openttd-opengfx/APKBUILD                   | 2 +-
 testing/openttd/APKBUILD                           | 2 +-
 testing/opmsg/APKBUILD                             | 2 +-
 testing/ossec-hids/APKBUILD                        | 2 +-
 testing/ostinato/APKBUILD                          | 2 +-
 testing/otrs/APKBUILD                              | 2 +-
 testing/p0f/APKBUILD                               | 2 +-
 testing/pacparser/APKBUILD                         | 2 +-
 testing/pam_sqlite3/APKBUILD                       | 2 +-
 testing/pass/APKBUILD                              | 2 +-
 testing/pastebinc/APKBUILD                         | 2 +-
 testing/pcsxr/APKBUILD                             | 2 +-
 testing/pdfcrack/APKBUILD                          | 2 +-
 testing/peervpn/APKBUILD                           | 2 +-
 testing/pelican/APKBUILD                           | 2 +-
 testing/percona-toolkit/APKBUILD                   | 2 +-
 testing/perl-glib-ex-objectbits/APKBUILD           | 2 +-
 testing/perl-session-storage-secure/APKBUILD       | 2 +-
 testing/perl-snmp-info/APKBUILD                    | 2 +-
 testing/perl-test-api/APKBUILD                     | 2 +-
 testing/perl-test-roo/APKBUILD                     | 2 +-
 testing/perl-www-curl/APKBUILD                     | 2 +-
 testing/php7-couchbase/APKBUILD                    | 2 +-
 testing/physlock/APKBUILD                          | 2 +-
 testing/pixiewps/APKBUILD                          | 2 +-
 testing/platformio-core/APKBUILD                   | 2 +-
 testing/plzip/APKBUILD                             | 2 +-
 testing/policycoreutils/APKBUILD                   | 2 +-
 testing/postgis/APKBUILD                           | 2 +-
 testing/pwsafe/APKBUILD                            | 2 +-
 testing/py-actdiag/APKBUILD                        | 2 +-
 testing/py-ansi2html/APKBUILD                      | 2 +-
 testing/py-application/APKBUILD                    | 2 +-
 testing/py-apsw/APKBUILD                           | 2 +-
 testing/py-argcomplete/APKBUILD                    | 2 +-
 testing/py-arrow/APKBUILD                          | 2 +-
 testing/py-astral/APKBUILD                         | 2 +-
 testing/py-astroid/APKBUILD                        | 2 +-
 testing/py-augeas/APKBUILD                         | 2 +-
 testing/py-banknumber/APKBUILD                     | 2 +-
 testing/py-barcodenumber/APKBUILD                  | 2 +-
 testing/py-blockdiag/APKBUILD                      | 2 +-
 testing/py-boto3/APKBUILD                          | 2 +-
 testing/py-botocore/APKBUILD                       | 2 +-
 testing/py-cairosvg/APKBUILD                       | 2 +-
 testing/py-cassandra-driver/APKBUILD               | 2 +-
 testing/py-cjson/APKBUILD                          | 2 +-
 testing/py-codecov/APKBUILD                        | 2 +-
 testing/py-coverage/APKBUILD                       | 2 +-
 testing/py-coveralls/APKBUILD                      | 2 +-
 testing/py-cssutils/APKBUILD                       | 2 +-
 testing/py-django-debug-toolbar/APKBUILD           | 2 +-
 testing/py-dulwich/APKBUILD                        | 2 +-
 testing/py-elasticsearch/APKBUILD                  | 2 +-
 testing/py-enchant/APKBUILD                        | 2 +-
 testing/py-ev/APKBUILD                             | 2 +-
 testing/py-exconsole/APKBUILD                      | 2 +-
 testing/py-fedmsg/APKBUILD                         | 2 +-
 testing/py-feedgenerator/APKBUILD                  | 2 +-
 testing/py-flake8-isort/APKBUILD                   | 2 +-
 testing/py-flask-enterprise/APKBUILD               | 2 +-
 testing/py-flask-psycopg2/APKBUILD                 | 2 +-
 testing/py-google-apputils/APKBUILD                | 2 +-
 testing/py-hearplanetapi/APKBUILD                  | 2 +-
 testing/py-hurry-filesize/APKBUILD                 | 2 +-
 testing/py-hypothesis/APKBUILD                     | 2 +-
 testing/py-ibanlib/APKBUILD                        | 2 +-
 testing/py-isbn/APKBUILD                           | 2 +-
 testing/py-kerberos/APKBUILD                       | 2 +-
 testing/py-libacl/APKBUILD                         | 2 +-
 testing/py-libnacl/APKBUILD                        | 2 +-
 testing/py-logilab-astng/APKBUILD                  | 2 +-
 testing/py-lxc-python2/APKBUILD                    | 2 +-
 testing/py-mongo/APKBUILD                          | 2 +-
 testing/py-napalm/APKBUILD                         | 2 +-
 testing/py-ncclient/APKBUILD                       | 2 +-
 testing/py-newt_syrup/APKBUILD                     | 2 +-
 testing/py-nmap/APKBUILD                           | 2 +-
 testing/py-ntplib/APKBUILD                         | 2 +-
 testing/py-nwdiag/APKBUILD                         | 2 +-
 testing/py-osourcer/APKBUILD                       | 2 +-
 testing/py-pika/APKBUILD                           | 2 +-
 testing/py-poppler/APKBUILD                        | 2 +-
 testing/py-praw/APKBUILD                           | 2 +-
 testing/py-progressbar/APKBUILD                    | 2 +-
 testing/py-pybles/APKBUILD                         | 2 +-
 testing/py-pycountry/APKBUILD                      | 2 +-
 testing/py-pycryptodome/APKBUILD                   | 2 +-
 testing/py-pygfm/APKBUILD                          | 2 +-
 testing/py-pygtail/APKBUILD                        | 2 +-
 testing/py-pyparted/APKBUILD                       | 2 +-
 testing/py-pyphen/APKBUILD                         | 2 +-
 testing/py-pyzor/APKBUILD                          | 2 +-
 testing/py-qt/APKBUILD                             | 2 +-
 testing/py-redmine/APKBUILD                        | 2 +-
 testing/py-relatorio/APKBUILD                      | 2 +-
 testing/py-rpio/APKBUILD                           | 2 +-
 testing/py-runstatus/APKBUILD                      | 2 +-
 testing/py-s3transfer/APKBUILD                     | 2 +-
 testing/py-seqdiag/APKBUILD                        | 2 +-
 testing/py-sphinx-theme-epfl/APKBUILD              | 2 +-
 testing/py-sphinxcontrib-gist/APKBUILD             | 2 +-
 testing/py-sphinxcontrib-git/APKBUILD              | 2 +-
 testing/py-sphinxcontrib-images/APKBUILD           | 2 +-
 testing/py-sphinxcontrib-manpage/APKBUILD          | 2 +-
 testing/py-sphinxcontrib-mercurial/APKBUILD        | 2 +-
 testing/py-sphinxcontrib-whoosh/APKBUILD           | 2 +-
 testing/py-stdnum/APKBUILD                         | 2 +-
 testing/py-telegram-bot/APKBUILD                   | 2 +-
 testing/py-tzlocal/APKBUILD                        | 2 +-
 testing/py-unicorn-hat/APKBUILD                    | 2 +-
 testing/py-urlobject/APKBUILD                      | 2 +-
 testing/py-vatnumber/APKBUILD                      | 2 +-
 testing/py-wbdata/APKBUILD                         | 2 +-
 testing/py-whoispy/APKBUILD                        | 2 +-
 testing/py-xlib/APKBUILD                           | 2 +-
 testing/py-zeroconf/APKBUILD                       | 2 +-
 testing/py-zope-configuration/APKBUILD             | 2 +-
 testing/py-zope-deprecation/APKBUILD               | 2 +-
 testing/py3-aiohttp-debugtoolbar/APKBUILD          | 2 +-
 testing/py3-aiohttp-jinja2/APKBUILD                | 2 +-
 testing/py3-aiohttp-session/APKBUILD               | 2 +-
 testing/py3-pygpgme/APKBUILD                       | 2 +-
 testing/py3-unoconv/APKBUILD                       | 2 +-
 testing/pylint/APKBUILD                            | 2 +-
 testing/qperf/APKBUILD                             | 2 +-
 testing/qt-creator/APKBUILD                        | 2 +-
 testing/qt5-qtconnectivity/APKBUILD                | 2 +-
 testing/qt5-qtlocation/APKBUILD                    | 2 +-
 testing/qt5-qtquickcontrols2/APKBUILD              | 2 +-
 testing/qt5-qtremoteobjects/APKBUILD               | 2 +-
 testing/qt5-qtsensors/APKBUILD                     | 2 +-
 testing/qt5-qtwebchannel/APKBUILD                  | 2 +-
 testing/rabbitmq-server/APKBUILD                   | 2 +-
 testing/radare2/APKBUILD                           | 2 +-
 testing/radicale/APKBUILD                          | 2 +-
 testing/rcs/APKBUILD                               | 2 +-
 testing/reaver-wps-fork-t6x/APKBUILD               | 2 +-
 testing/recoll/APKBUILD                            | 2 +-
 testing/refpolicy/APKBUILD                         | 2 +-
 testing/rlwrap/APKBUILD                            | 2 +-
 testing/sane/APKBUILD                              | 2 +-
 testing/sbt/APKBUILD                               | 2 +-
 testing/sch-cake-hardened/APKBUILD                 | 2 +-
 testing/setroot/APKBUILD                           | 2 +-
 testing/shadowsocks-libev/APKBUILD                 | 2 +-
 testing/shellinabox/APKBUILD                       | 2 +-
 testing/shine/APKBUILD                             | 2 +-
 testing/shotcut/APKBUILD                           | 2 +-
 testing/simple-scan/APKBUILD                       | 2 +-
 testing/snapraid/APKBUILD                          | 2 +-
 testing/softhsm/APKBUILD                           | 2 +-
 testing/spreed-webrtc/APKBUILD                     | 2 +-
 testing/sqm-scripts/APKBUILD                       | 2 +-
 testing/sslh/APKBUILD                              | 2 +-
 testing/stargazer/APKBUILD                         | 2 +-
 testing/stoken/APKBUILD                            | 2 +-
 testing/subtitleeditor/APKBUILD                    | 2 +-
 testing/swaks/APKBUILD                             | 2 +-
 testing/tanidvr/APKBUILD                           | 2 +-
 testing/tcc/APKBUILD                               | 2 +-
 testing/tcpreplay/APKBUILD                         | 2 +-
 testing/tcsh/APKBUILD                              | 2 +-
 testing/td-agent-bit/APKBUILD                      | 2 +-
 testing/thermald/APKBUILD                          | 2 +-
 testing/tiptop/APKBUILD                            | 2 +-
 testing/tlp/APKBUILD                               | 2 +-
 testing/ts/APKBUILD                                | 2 +-
 testing/tsung/APKBUILD                             | 2 +-
 testing/ttf-font-awesome/APKBUILD                  | 2 +-
 testing/twemproxy/APKBUILD                         | 2 +-
 testing/ucspi-tcp/APKBUILD                         | 2 +-
 testing/udpcast/APKBUILD                           | 2 +-
 testing/upmpdcli/APKBUILD                          | 2 +-
 testing/ustr/APKBUILD                              | 2 +-
 testing/uucp/APKBUILD                              | 2 +-
 testing/vdr/APKBUILD                               | 2 +-
 testing/viewnior/APKBUILD                          | 2 +-
 testing/vips/APKBUILD                              | 2 +-
 testing/virt-what/APKBUILD                         | 2 +-
 testing/vpnc/APKBUILD                              | 2 +-
 testing/watchman/APKBUILD                          | 2 +-
 testing/websockify/APKBUILD                        | 2 +-
 testing/wicd/APKBUILD                              | 2 +-
 testing/windowmaker/APKBUILD                       | 2 +-
 testing/wine-staging/APKBUILD                      | 2 +-
 testing/wireguard-hardened/APKBUILD                | 2 +-
 testing/wireguard-tools/APKBUILD                   | 2 +-
 testing/wireguard-vanilla/APKBUILD                 | 2 +-
 testing/wkhtmltopdf/APKBUILD                       | 2 +-
 testing/wmi-client/APKBUILD                        | 2 +-
 testing/wok/APKBUILD                               | 2 +-
 testing/wpa_actiond/APKBUILD                       | 2 +-
 testing/wput/APKBUILD                              | 2 +-
 testing/wqy-zenhei/APKBUILD                        | 2 +-
 testing/x11vnc/APKBUILD                            | 2 +-
 testing/xf86-input-wacom/APKBUILD                  | 2 +-
 testing/xfce-polkit/APKBUILD                       | 2 +-
 testing/xfce4-mailwatch-plugin/APKBUILD            | 2 +-
 testing/xfce4-sensors-plugin/APKBUILD              | 2 +-
 testing/xonotic-data/APKBUILD                      | 2 +-
 testing/xonotic/APKBUILD                           | 2 +-
 testing/xournal/APKBUILD                           | 2 +-
 testing/yodl/APKBUILD                              | 2 +-
 testing/zbar/APKBUILD                              | 2 +-
 testing/zerotier-one/APKBUILD                      | 2 +-
 testing/zim/APKBUILD                               | 2 +-
 testing/zsh-syntax-highlighting/APKBUILD           | 2 +-
 unmaintained/acf-provisioning-algo/APKBUILD        | 2 +-
 unmaintained/acf-provisioning-cisco/APKBUILD       | 2 +-
 unmaintained/acf-provisioning-cyberdata/APKBUILD   | 2 +-
 unmaintained/acf-provisioning-linksys/APKBUILD     | 2 +-
 unmaintained/acf-provisioning-polycom/APKBUILD     | 2 +-
 unmaintained/acf-provisioning-snom/APKBUILD        | 2 +-
 unmaintained/beecrypt/APKBUILD                     | 2 +-
 unmaintained/geary/APKBUILD                        | 2 +-
 unmaintained/ocfs2-tools/APKBUILD                  | 2 +-
 unmaintained/sipwise-sems/APKBUILD                 | 2 +-
 unmaintained/sword/APKBUILD                        | 2 +-
 unmaintained/usbip-utils/APKBUILD                  | 2 +-
 unmaintained/webkitgtk/APKBUILD                    | 2 +-
 1530 files changed, 1533 insertions(+), 1533 deletions(-)

diff --git a/community/6tunnel/APKBUILD b/community/6tunnel/APKBUILD
index a46f2a0437ab..e2e399ec9b15 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 c345e7a5b6c5..b574714ca395 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 1651e290d2b3..aa3708d44e23 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 1f26e4a39f5c..a1a4a221da13 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 45f4a1013061..8a3d90307ff9 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 ccb0ecd7575b..0eca325cc2cf 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 e1219b4d0a2e..9f8481e64eef 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 926cefaafad5..5ec078771761 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 7128b38bd9d7..30e3efc12433 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 a406e5df21bf..74fad0ef0e52 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 6492e0741d73..d597e2ce1397 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 ed69c7c7255b..ea827136ef78 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 11aabe0e7f4a..b7c7b95040b0 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 a7b82ab542c0..658baeec3be6 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 d816ab1b97d9..7396643d69fc 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 5dca042d8759..8c8e006c7dc1 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 d464c7cab762..c29136ec3964 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 e6d56a159178..dc5189e60140 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 bf5e8f22c659..9f8116678c5c 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 fd5381a14dc6..c623272dbc6a 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 77d83372168c..79607cbdcaf3 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 7e08da9c8bbf..83439f5fbdfa 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 c612eb0e26fa..6dbb54512d57 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 de61c454758b..91366a213908 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 301417b5dd68..23aa2168d536 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 727d25eef643..443b409c0146 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 cf610955f343..faae05630d26 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 62b7be11fc89..e4ae6dbc6081 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 994728270cc1..3b7efc42b13f 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 cc23355c7dea..ab2102c47014 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 60a73fd8eff9..cc7aa2173fa6 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 3ea1eb760a4b..4fbb886c3af8 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 e1659015d128..beb84b2d0014 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 a229eb8084bb..2e18346afe9d 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 c2dc2f9bf526..d337b388dca8 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 99fb2ad51bb9..bef2c37ea04f 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 2953367ee6d1..696cc4bfedb4 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 d33b1303e09c..e2ecf4978d12 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 9d9698b66a8a..207c6a945ce6 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 7d73fadd902e..8aada1e9583a 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 e518081b1649..7c4bc8484eae 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 76ff24b7c4c9..cf825d6f931f 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 8b32671c61c3..197a03d450ca 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 1d020410f7b9..0d235aab5044 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 008b37fac3f4..1ba7c77b984f 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 4a6b652fda7d..2acec9693bad 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 a4fbd37f74e3..beac9f559a89 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 653a84781588..1b7ed9b557bc 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 321559becb16..fb98e3a0bdd1 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 0ca60973511e..4aa01f057e1f 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 6ab55679a90d..4e6236614827 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 c5c82141037f..d550493047d6 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 2572eed4785a..b525c2893028 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 e878a787f6e6..86f00e4e07f6 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 7a5b8392230f..018b0842ae2e 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 23a334df4b27..68b7483b0126 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 2242d8fd8a46..f76eb5712523 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 f5f1ae57fe43..e06d4e0fc989 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 7f2cad93ce4a..2c1a7e96fa5b 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 e84228dfd216..3b7a296437b1 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 9ab306f3ae8c..bdf0a20e9afc 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 ad0fc9a37248..347d54723226 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 0f7a5f00bf59..f84078eda7e2 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 3e855de69946..f9352be29665 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 357a2fa8d4c0..faa498121fdb 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 47a359de7159..37bcc6edccfb 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 f8e39d696f76..7320baa23b2c 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 d8c82f358287..2b0fff5b2e22 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 4cb28f10b81a..430676e963ca 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 8726a2baf692..28064df3e6f0 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 e2bce61addac..254a790c7d95 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 7c9490b44a03..71ef739d85c1 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 2c7f90f45af4..fdbed11084cb 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 57f30d97271e..1bf6067ff303 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 5efc216cf553..8ea50ffb48f1 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 fd83a83f6491..2573d2d5ff57 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 1b59914803e1..dac27b43bbd8 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 cee64164b175..1dccab8e5501 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 08193a861deb..a78d9f58182a 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 24d386a97769..05b76da9b887 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 583b4355eb35..af39c0817e40 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 175e0d26ffe1..804671534937 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 4cfab43ed617..1ddc5700c7fa 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 9e4825941802..a8e43b6d7475 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 520210e9a3b8..0a98dc6cfb0d 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 7470a69fb70d..2972152a1f0a 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 1288b4c2f771..d102f2a90e08 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 7ef5fb6ed6a0..82727c0dd473 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 3e16f2955248..15f6aa705c2b 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 339f9f736c6e..5563bcee0b54 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 7b4bec0f8da2..cdc1d5e1330e 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 2f68354cae9e..b2daefef3cc7 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 353b5e94d49d..237112e1a91a 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 3e9e77823f52..e1cb3a03b075 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 3ff943e5faa9..d7a03febe64d 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 951772df15d4..5d42536bd457 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 9e009f841b93..350f645bf5c5 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 e3852295d89c..0b6df284255a 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 8fd0cfa77e9e..615b34616515 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 76b50c65802a..2c7bf6602c87 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 9b922eb4aebf..f1c529315704 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 7dc4d6bce9be..610019356b8c 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 1e212aec7038..9fe1e2d356ef 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 b83323a207e4..ae5a1d7ab9f2 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 f95e5c68bbdf..436f9bce8623 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 97231a484eec..da380374492e 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 78a35086984f..d9601698dc24 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 7f6833760b65..bb041877a861 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 906ad75e037c..92ac68615f5e 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 96b14981519d..6fe588e93bd0 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 e10bcf17e37c..5c06471d8ceb 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 77f36fc1016a..d0b46479b274 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 77983dca13d0..81d53f11dd02 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 53058a8dbf9e..675e81e50ab5 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 f925c815bcab..b18a022e02d5 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 a99a560b5f5c..dad992486bbc 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 b7f3ef52cd64..2bc3b98d3354 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 f60b7c765337..32e03e2f12a7 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 5baf23d0accb..01d32cc96f59 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 49e7fa19c3e2..9c5b9e422764 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 e7c9ccda6ace..d47716a40ac7 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 6025435fd9bc..6cc35afeea5c 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 09299c6391f3..26c94b1db0af 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 873154e63d14..41b0583dfd75 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 2c12cecf6723..2133eedc1e0f 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 a53ed9449e80..3b3c29158b86 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 c020bbc7d856..707222a12c15 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 caec1b35dd11..d49588744cbb 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 f7c7f4d21196..4922a43ee038 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 34bcf7eeb45f..5acbc732a8d1 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 d2828f571692..d3e43a5c6349 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 e7bc39e9be69..4cd27eb97eb2 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 4dee6c792ccf..174ebb0ae111 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 d80556bfd8a7..69e859a43945 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 d2c8cca97c17..9e8b318faa52 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 3ecf36e0a1f7..0ea2a3277a72 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 b91bf8e59881..a4cef43167df 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 f11484808eca..c813ddaefc64 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 b148d30903b2..07977a139dc6 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 9af31496b947..55b2d3d5b297 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 13b6b0d272cf..7fccd2909249 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 4e6e9694580d..3a82d185c13e 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 9b668002a95f..0b6fcfc3acf4 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 d124f2310713..b75465566ed8 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 ac284ce839a0..3e22b7fe4ae0 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 8a8bdb946f50..71c39342c234 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 b353ae46fefb..7825d6faa599 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 9d71ceea9e18..8a9b3735f8a4 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 af902383a7b6..75b613a06a0d 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 3b76ff5aadc6..f5fef4532d83 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 978856da9118..58f510545596 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 bf9870868450..c5c36cae2271 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 f736b912cce6..d043add160e2 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 53dbf2356f4d..c18069d50c38 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 3d8ef415d4be..067c701fe907 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 42d6bffe877a..40b858862880 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 51c09d7f14a7..f3d525b0020e 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 a8c1dd9e5ec4..8ea9ec8e182d 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 90485bfd7c77..1a3654667626 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 65f17759ea98..8a356b5d8c1f 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 1370449f6a60..ffe8042fb1b6 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 1484602d9ef3..d30a87a1d258 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 90678c76ca43..81b8e6ec658a 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 eebf0a1a1628..fa541de01e42 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 a1b2aab849bb..11afd63c9c36 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 9b5a3e3c86de..5064dc3445fd 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 330add4609cc..ed7babe01f05 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 f7c97e8ab501..9842331767c5 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 7cdbd0628c9c..5754d617921e 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 04ce69823b76..c683f7259f1e 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 4ec404ffcfcf..4e86c9b228f9 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 eb05c2cbafd8..00e0e936a235 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 48e8cd3ca59e..65d1a9c4304c 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 840e0d0fe4be..34cba86632b3 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 f4712c21ad7c..83c312447f19 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 1a182d900055..6b5bfe61e6ec 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 bb64963b1f7f..7d466e43cf3e 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 660abfda9a8f..2386d70acf7d 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 b10df3ad0ccf..7c9f9ca453fb 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 33390cfa7ec1..52e9d4372e34 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 167934883c61..9e4c52952f78 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 5b8de8648342..f0c8787fd1a4 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 b1cf9f43f7d1..e4b29202c658 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 287f97b8a25c..2fe2e03af1c7 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 0d89638f5e0b..b3f207070420 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 2833adde267f..73c424f2a453 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 68a4073b2def..309c018957a5 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 8be8e8eb12b6..0d89c5855899 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 5f134090d2dc..1795776f659a 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 c2f073de96c6..b8f5c9124a3b 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 974d46ba51b6..cda0f8fac030 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 0ec30f3a3e24..d172f642fcf2 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 4262f469e025..db96fc7308fa 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 795e8c37c11d..70ee04884ad9 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 be6c4d9e5066..9bc45cc4dad9 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 bd97d382dc15..3ac19d5b591e 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 e0a816297488..a337d2c908a0 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 e97e982d4480..33f6b10d808b 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 08345be68bf8..6ae2b7b29dfc 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 1043f6bf6a23..5a7b9869a8b9 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 346bb9faafd7..1f0931b2e1d6 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 6a43cb2da67a..fb1cd8980257 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 f83d8bfb05de..9a871914cd57 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 f269f1dd2f07..b7987b1c3249 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 efe19246f0ca..ea06b123909e 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 3935f156341b..1f3bf7ee9d78 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 cbd9c421d43f..77c0a5a50ee3 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 48803d8d0762..262ae099a3e4 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 83ca5963e23e..438bf01aad59 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 eda353c97d04..2463111f4f40 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 7e4a9cd4e1d3..b974257292f3 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 f5ba3b37e56a..7b02004033da 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 5f415f76027f..4621c78ab14b 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 7fba479c75df..3eea52f621a8 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 badd4d8778d3..2b1f3610f74b 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 210eeb6b5895..d220a1ad3ecf 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 3c30387ed759..47a6b3dedef2 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 64a5a214243b..933452445e66 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 d15a53473e68..6bd6b4456e47 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 97d02cc5be4c..66099dacf8b4 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 7232bd290661..f01806e9b7e6 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 eb4e54dfd04b..d4b56aa28dcc 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 1c1596997517..7041df9ca65c 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 a758835ab256..d07d34d04837 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 17d92e5687de..5a6582a7aa3c 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 3c7396038ebf..78d271ae9e12 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 2585e24e7686..72c58a01edd2 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 087d122c05ea..596b7edd6179 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 d6af8b8007b1..7ba13fe66b97 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 b1115d95f34b..223e2e25af07 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 57c7935df71b..79ad567b9b97 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 2f20ae92453e..42270fc20184 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 63aa3706779c..27180f110ad5 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 2125b372c030..bae9227a03d4 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 b4b724c8f391..67feef203562 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 3d173a044fb5..4f264aff3013 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 8913003c638a..a05ca1a8b5d8 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 9c775281fd63..4599053246b3 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 e3d454f5dc40..298b2d9c55fc 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 cc81a8fc9e82..6cd425f04253 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 ce45ff012695..642ded3ac5e6 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 81f8f8e99087..765b09cf3e48 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 5a5fa4d87489..3ec30c8abb74 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 c2fe141182a8..0d0dad17557f 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 b82f962ebb94..f7b5a99d38e7 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 f58c60cd9b7f..fd649301eb30 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 e6251f2e534a..a44fe4a41e43 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 2c8b62d9047d..19a346fcdce0 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 6dc45d2a4922..6de9d3428c64 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 d30012b9e9e1..99cc715fe2e2 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 88c80e2b3a34..cd56554d209e 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 e5bdf28afbed..5923a75ab884 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 7cceb5fea331..13c98d761cbd 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 86258bf48be8..0a7a6ba9102f 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 0399b53081a1..32e157fabed9 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 d516ec2d1336..52a445258a2d 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 9a807a3fc3e1..e91a512898ba 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 742f646ccdc2..4a47a39936d2 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 029cf7af805c..98c0c100bcbd 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 9b8bc4bebe3a..50038103febf 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 8965b1f8fe44..33ae7c2669c9 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 f7feb14473df..62f26c7d5b53 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 e114335c82ee..434f160be3d0 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 7123209d0085..e9ca404e7e59 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 32dfaed6b0f5..a8a30e506534 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 30ff3df0c8d6..1dd2834c3268 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 4f72787a9a24..2b86618041cd 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 96b82f6795a1..929ba245cb53 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 6f32502b5e4c..67d21ef2868d 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 ed17fe8c58d0..fcc36ad87aec 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 5b9a7b1f97c9..3af4a9c65ea6 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 ddd485ddfed8..bf3eef09e3b7 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 da2c80aaa5dd..37a859dc2223 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 f483f7bc0218..71f4b9bb1c63 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 8037d27f9579..5e6ea089fcae 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 5043735103c8..60db84b74fb3 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 cd9814b47e5f..9b79187d0188 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 6e1068de8e3e..8f89dcdb4ba9 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 003ba3230017..1c0a6365dc78 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 4978793c7897..389198ef0d93 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 441234194ab2..8152ff30b83e 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 273aae7c5da1..5836f7966fa3 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 6ab2fdc3b04f..9d0f3a063c67 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 81d1ef74b283..6600454fb2bd 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 34231165feda..02c6e3611cdd 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 bc697ccde2fd..21ea82a255cb 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 db67082d806d..6e306922ee0e 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 e3f3cc398531..30683b598266 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 c304088ba589..f2aba4be93d1 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 2ab9daf4c5f7..e35f47633c4a 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 023a3e7f6f66..c29bd7229878 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 2e2bd7d01be0..a80e8302b06e 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 ec69865c6218..3239804dbbe5 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 d0b07c57c660..bc6536321bef 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 084cfe172e08..a784bb01160d 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 87e6bb4ef661..b6f17a26c492 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 22fb34337283..ed70a35a51a8 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 9d04cca36fc4..374d3615f005 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 47cccb1817c8..70757b2dbe09 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 e011685125bb..3d0c46eca7d2 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 1eb19cfc3920..f6ea52c7de52 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 13aaa1580ee2..90a42df69774 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 6f9caabf45cd..224bd0dd1ca6 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 d26a5aa1763c..3a85cced69e8 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 0f58eec2a0ef..8721501ea832 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 d7cf8f4538d1..c923defa5af8 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 4080a6cb94d9..06801da70bcc 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 97d92954bc4e..e27350818330 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 15a37b5f2c70..5d9103ae63bd 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 098ce3ce6391..a24fdf17f8bb 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 ac7331e38e7b..59a3b6a93624 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 3f2f76510176..4526de27ee2b 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 ef3321aa4032..34f4495c7bd1 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 b5be3bc4daaf..34318636f9eb 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 43d9c96fc581..cd157fa8c2db 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 2272c923df39..e055ea265fe3 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 b954637ce84e..54a8a31431ea 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 edeaadbe6f1a..c70ed4c8acdf 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 fd4b0dae822f..d59a8b5c82bc 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 c3c2bbaa8a25..09d5dfbeedc1 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 512d63ab3777..e6ecfc7b9fd3 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 f4871c9f1bd8..86f9d2f84a15 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 5479dfa326ad..97d296ebc198 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 aa3bbdb91b1f..e069114cd9c8 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 1debd73985c9..59d401887443 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 5ae883a827be..a9adbe6b7cfc 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 998e3ee55c2a..0b0ccea1172e 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 186f149a26dc..3129b41bdbe6 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 c47d80b1b7a0..b4919df740be 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 536a575acf6a..8915a3408ff4 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 dcd26aca1aaf..6cb5af58c480 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 36bea1d41928..7c1937166110 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 a6ccded3db3e..d38c7dc60cce 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 e058723bf7e5..4faa48cb4413 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 b43567d84047..494cdf70d64b 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 b8a497b97424..cbf89e6902d5 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 d77ed81a61a9..9dd8ba274aea 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 bb49ff09102f..4761cdbb5a27 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 ad5569eab2c0..20679e272062 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 bcf63a5a652c..988a896bfd5a 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 6f2a74460f0f..8592f57954c9 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 e1e02c8db50a..d85b3fbc0a00 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 51203042121f..4499077ebb61 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 73018ea90067..de4b06ff9d43 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 4247fba80ec4..6c6147e692fc 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 cf5433699c60..e449795ba23b 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 2ad852e266b5..791ce0c0e0ff 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 765e09053e98..6c6324f8cfb1 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 74952a34cc5b..5d2b96f870f3 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 91588433cde7..3e470a55da5a 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 ab0b6aa12035..9b930125ad1d 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 b39541308ee3..63d06e0e9ebd 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 9fac4937bd34..88ac4b59f449 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 f6b0e6c85362..cb2024352d79 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 95f08f8868db..5b867ebc123d 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 c8fbdf089cb7..65dde4f57c90 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 969985b3e264..c9f45927a1f9 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 703486254d96..3a5e139a1015 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 200c4424abe5..3d91fcb3a68c 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 b175afcc6fe0..4c5ec3a9aa5a 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 42f9153266c9..3a4c75a18d8d 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 1e3e064e896e..ce9ce96f5f9e 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 5f47c8c29836..4c1ad1c57b0e 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 376208a6b2c3..ced97ddaa3b5 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 38caffdab6d5..1d4b7086b6d2 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 d7111adf63e5..b464dfa4cb16 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 0cab13579e78..6c4f8717f5b7 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 9fa85b5b8a37..daa629d61cfb 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 0a835586219f..4600282083b3 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 5959adf626b3..1eb9b46c12c3 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 b8907920fc21..86299b51cbea 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 8267441ca619..dce3a65050aa 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 207d793b8b58..2fd6d57f8671 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 b581fd57af4b..ebc83aa8017d 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 8318313565a2..7aff63dbb009 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 b09022d0c88f..b50732aab5fa 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 9ebe0a59265e..cbfafc1c94dc 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 289a1c78e35b..58fb84cb7f3e 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 5420501ccf2e..e04752630d12 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 75bf57b06115..382b7b2ee5c0 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 1d1756a735d6..eaf059700ce7 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 7f98dcda0fd2..625bbf82fcd8 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 fb32c5dd1601..3e7c7a10800f 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 46057cfae6d1..e36bd645ce23 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 f0882b88a5ee..f1ef89b378e8 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 9cbed9e26411..708e3db14e90 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 b143c2ffa595..ecb185c0b05d 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 4589655b9d97..4a3c6fb4fc11 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 858531fa1f0f..9a2585a74e1f 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 4b83c582ab82..b5624d893508 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 12432672de1f..3d3fe045b0ec 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 027390ff5d6e..402593470602 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 5824ca700bbd..7f14711824be 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 941a61a0a4a3..16222bd3069e 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 4f02e9a9e7e1..c3bdb4d0f9e1 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 e57cf467e58f..d04c36e56a11 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 c2c69ccd641e..5a878d63a7df 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 b9e73b9ae0a0..cb7374889a61 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 817ba15fa3e5..6faa5e21d20f 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 159b0d7a3e75..6bf1fd457224 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 2137ab735893..84c306dc08ac 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 f221a6221b47..c64f8cc8f2a4 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 69304e01736d..06dbaefe5c4d 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 72f442440197..c112e2e514b9 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 f24916610e7f..69403cbab3c1 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 80f6b8a1f53b..00132c34803d 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 90119e42d521..19b35b02c26e 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 1c71bbc2eb91..11612c8815df 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 d5dfa90b9653..a1263b0f0fa3 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 15163466d2e5..089b5362d8fc 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 9cd07c5bbcae..8a4d4b9ed4d5 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 6e80b30c243e..a9f569383443 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 2217063772db..0fc58b6ab575 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 aae76821e308..811add828976 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 31302c8a9841..23dc2709d24e 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 ff890fa1de60..8e7c5b79dd74 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 5fae70cec6b7..47a3f2ec14ab 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 58bd25b018b5..122700ffb339 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 e336d6106a66..7eb7ea979076 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 e0187a478c2b..cede2e766782 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 99482645703a..6a757992771f 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 25875a311850..649adc62be41 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 cf6c8d5d6267..f2409cf74ad7 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 d7cd9ff5f20c..066ff722d871 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 a6eb1fa0579a..a023fe7c00e4 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 6f00dd7c676b..394685aa4d90 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 1920c2f6e3e2..2fec8a4844da 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 f83d1b569cbe..fcc710356943 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 6681a1155cd8..876e1c3ba588 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 98bccda05361..b0d89abb87ac 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 9225892acb15..a25c6d725656 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 383be904b526..4d9a1b65e122 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 e6d6ee04389b..28a866eaf8f7 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 2d04cad815d0..3b04bd26d441 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 c70437f54a1b..78b9c624b070 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 88e3efff061c..bab2e6e176af 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 2dca462fd7f3..35fdbbf19a63 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 e001f33f266a..7c8ccc38182b 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 f317c82f8dc0..20cddcdbeea5 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 5e291e5d330e..39b216f64b47 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 a4749fbf9b6d..3cd8b4aa1c0a 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 d406a43f9253..ed4ca35977d8 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 bb73f6c340de..d8960c8e6e11 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 61aae61a056d..3da22a3c93b3 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 5a713a977f59..cfecd253c66e 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 5ea3182a68bd..64b6a75ad27a 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 75a84620aa86..ce052ecbe21e 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 911110230989..0f2f294f344b 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 60ce7af663ea..61e093917061 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 3064598a85d9..cbe4fceb66a6 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 7396da739d45..0a94ed72d634 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 6c1a0fdbf2f9..966093551fe0 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 4a56d2684a72..89715ef5e8e6 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 cb0dc354ddd0..97dc81030bc4 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 1bb06cb2467c..d382859c72fe 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 4eb56b09d995..76c55041e70e 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 861404c6bc90..8e012d49b777 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 adc3d6a6018a..1f1366e7d57a 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 79b6ef7a8ee9..c8154844ff17 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 e30448628bf7..faa515e4ddba 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 f5e5c76dd26e..bea733124fac 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 4ebcd14907ca..5746b25db71b 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 5855945c14cb..3e8a7a2639d6 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 b7503e13e986..14d07004f716 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 54058d581020..4a970cc17377 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 1821b2e669ad..e54f106d1ebf 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 17686c659981..bfaf7be44f94 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 0fbe36c36797..ab60abac08ab 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 8da0462f09a7..f65925a2322e 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 fc76c0b63021..6df113dbe03e 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 ae61f1b6e0ab..9ca105991866 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 6900a6bf6652..c492379b7fdc 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 b40a8ceac520..d370529c04ff 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 b33578d1aabf..704c5a828d00 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 7361f3e0b862..57f65aa33bce 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 0279472631a2..f5a2845045cd 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 726aefb2c06b..8370ac52e482 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 e37757d35092..37da976dc39e 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 05eaf2645e60..58cfa74ef212 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 293ac0e27cdf..26e92d9a36e2 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 3af0f81256ed..561d995788aa 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 d85b107728f0..9397689e0f27 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 d0f8b66c1328..ec6a62dfe087 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 eec68c4557db..9b028d31760f 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 ece979d985cc..8c712fc2eb21 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 ba4f54245944..f111cba7919e 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 b74081a3a684..35011436d47f 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 770b2630efce..0f248ec2c748 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 701379202a17..acc2c4d2976a 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 23f7ce6059a8..763c86cf2fb6 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 c35fb8f51605..547404d850bc 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 ab6eb9a114f3..12377a1072fb 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 fd97a88ed35b..69630051eb31 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 483cb28183b1..163868619ad1 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 884eb7725744..750cb1e4af47 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 59047cf68bce..7b133e17f55f 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 f559a9514a6f..86ec548a4e1f 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 9479b21bf967..945ba894a13e 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 d9d7106daa2f..db1fae8800b9 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 bb42685a24e0..40911fb449fc 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 887586b7ef5e..75bbe295c946 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 7db31bb50064..0c2172af5bef 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 ff5f535cbd87..e0b2879bf879 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 e8eb918b38ec..4c165bb00d09 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 b032224e9a6e..fcaf23887961 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 48c994705e7c..183d69aa0325 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 b1dd13f58eab..85972236cec7 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 e699834295e9..48672b2425f6 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 3f9695ef20d2..fa94b9f8f2ad 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 e89227f5d4e5..6d50a747532c 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 30e151089ad5..689bed98a4c9 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 0d88c268f08b..744a6fb08f7c 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 beaf8880a225..867aeb6bc665 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 48bd7fe0c0d6..27914a0c02ef 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 43faaf6a311e..c9acfe906b50 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 4411b8cd5324..97b41283ed09 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 9fd9600ee744..01d532f31bc5 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 5d7c75abb3f0..a6783b1764e3 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 fcb8971a11f8..c0f81bfd7a31 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 8479b58e6e83..3b39d17e8892 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 626ff9f6b66d..993ab5a7c679 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 74a70bb75e75..63cf2f0f2a8c 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 24c672b5db39..7fdc2f82b26b 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 1186a5133d82..ccf5138b2714 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 cac1293f7d40..bc27737ebc5b 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 67d0ebf4fb0a..23f71ca73f88 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 83447ddf2c48..4113918a8232 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 7990c46839cb..49b83ea8486c 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 cbd8aa421731..e7a35f9aecf6 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 3cd54e633c63..1e5691d47839 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 f7ee7e2a0db7..b20ee28d162b 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 e9ce10ab024f..7fe214a49507 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 9d7b5ce55d6e..44eb44105a1e 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 29d29c2b00b7..f199b9753a03 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 2b6c0f311523..d6719f073dcf 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 9e2aab44a743..8d56da652f44 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 d8750b5e7eaf..2f5177be9fdc 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 0a75b5ebfeda..598eee29199a 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 6551818fecaf..0d208a3c3c9f 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 a091a5231f29..2944f07fce7d 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 634e5fd8a4a0..540591d7929f 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 32084044a073..510a108d23b0 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 e1e557365f5f..c1e78a21a1a2 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 daca4519753f..4763e1dc5f97 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 766c1e8a29d1..b70ae1add274 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 4d76fbc2c841..07d0c7a6a17b 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 255b7b2b09e0..b31d7b669191 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 b871a984ac24..f04e02278c96 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 880eb8aaa9bd..2a41a2068451 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 36fe92d7a0e8..459f3be466a5 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 9a90f9d7b31b..502eba166e1b 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 c0c56dadd1e2..19997bee1078 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 62150d6d94f5..d8dc08a14e9e 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 2ea7567753f9..51db7f236b0c 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 d5f3d5884989..8c6488149051 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 3fb338a929ce..207cf38dd5c0 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 7c5cac17376e..aa0195eeea10 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 e1cfd6df41a7..8f1efb3ebe20 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 6a1485534ba1..fea2c90b45dc 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 a6e49d035bdf..17de0c2f5c8e 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 a71a121bc762..d0e3d4a272dc 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 d4614715c7ea..07975e4d1226 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 bac6d6998907..0636e6c5f83f 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 616733621f52..890bd41840db 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 a60ec8247d37..e64c279aac31 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 4fdc00fb7c1e..7e9eb556b7d5 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 c7be784450c3..72e5970737c8 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 412bfa2bc918..2cf97a32d801 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 0457707b1dda..bcaf7494a349 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 6c2f62332fcb..7bc0c42a7273 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 800bafd8bb54..317a48641024 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 3c0145676e0d..a889e7c0cd25 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 5b98c47e4393..b954fb03d652 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 6fd806e3dd04..3c7d1059c2f1 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 2a58ebff9819..be59ab6b4b72 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 a19439a332c7..725a5003162e 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 b39c9f250e81..71c0e83167ed 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 755c696a1e85..c37688467268 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 f79e822081a6..b0fb2caabdaa 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 6b099b604def..33479cad5164 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 2f65b15568f4..54e1797065fc 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 b44b30bd062b..dd2ab3d44bd4 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 2c56c6151253..ce04e0707ccb 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 b405837f9215..d0e5a7901380 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 587d35c692e4..b8e8e40da804 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 1aa9a1271920..0a63738da22b 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 fb65583cb2a3..b0d95b85a32c 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 0cf797dd9294..937921b5a08a 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 a25f246b6e69..3c6fcfaab0a7 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 65878da63663..04d04b296e46 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 9c4977465202..ff373e9815b7 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 2ede77741c61..ee959e3555fc 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 9a4d0b6bd804..35e3bbe29e82 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 f83012ad34fa..be159c5af69b 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 a97cedbb0950..d39df3ba4e62 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 7dc4cd212938..4d3564916dd4 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 e6bed5b8b02d..c1eb47aceca7 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 b1e5bbb3e5a7..d8efbc27dcc6 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 cf8c5b253272..07c7016b1861 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 75899f8c1e4a..7fa4887962d6 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 4b3398ef4b01..58c2b11b0eb5 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 1ee2c94b7d34..e06a30c79dd4 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 22976d51599a..c439c9908a92 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 cbbf989affa5..625a1b53502e 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 1fe3792c2f68..6feacd5b6938 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 2a2843030c7c..f339ff377640 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 0973fd3881ea..e823d646ac1d 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 76b6858c6c6b..953c33a7ec01 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 5af7e9571ab2..f4b5084a8b86 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 adb861182669..360dda89f2b5 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 78469efd200e..3e74139c579e 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 bfa03befddd1..21d566e544e4 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 902129812ebf..08b9075a67ef 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 54c71d462bda..394a52f423f8 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 e6ea7c5d1076..c57821209fc3 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 4266acd8bc7f..4b29f3be3285 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 af186f380627..e8468cc6e301 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 b7fbfcc2b691..45c2967f9bc8 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 ebeb231370b9..9b1c4d59a121 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 0d8ae2ca351c..41236c16e58a 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 ea8e020db554..4d7d2f19fa41 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 6feb2c2e5fea..3a3a444e0772 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 a82fb1e78c3a..bb49d94d08df 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 ecc23d221cc1..25e1f9d07111 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 064fa35c4745..ae91294dc2f3 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 87c264a07859..13c78942a7d3 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 e9f360a597cb..77a70909bedd 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 445382bd58f1..ce7f204239d2 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 65db52da6cac..649ab5c389fb 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 042f5136e670..3a376440028a 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 a116779c8891..9fdcd0058c81 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 033ea6cd39e2..b50c1827bf3d 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 3644d718f934..931c6bdf87cb 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 bdca169d5933..7da9cfdf6978 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 fdbc46b4286b..be50fbc1c189 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 57adfdf23912..93dcb396ce50 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 2d3192ed0764..bcaf843f2979 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 cf9c4242f020..74ed9bb501c5 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 2f01f14050f3..aca6f6246bc2 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 7e3b2a068364..2f962d54262f 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 22711a94788b..6e788d8f7261 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 01c340248faf..ca4538763785 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 ffa6a1ec2f4c..fa7ad43de5b5 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 24f005bb6429..19de8204455c 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 5e78c15fc447..482d5008f940 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 2acba1eddf27..f92028869f9e 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 ba972439322e..8dc131e24754 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 7d7465e1406a..804884cd4890 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 872736ffaa4c..1c9b2a864be4 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 f63e40ea7633..d885c377d444 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 05fa87e4aa4b..78e222ba0d78 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 b7d4fbb13f20..61e43e604b8e 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 dda2b73a66a3..3ed15f851118 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 95607b8b73f3..fe03b8dfa026 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 f5da65272c7b..dd760ba4345c 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 d7fd87a135e6..05e6b5e5ceff 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 3b8aa9ac3574..26ec74352244 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 471de1919dc1..ba38ffaaf2f9 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 1f4fdb54a1bb..257d24c12658 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 296936b2465e..48e737c78593 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 1b479a1a9d63..f11541547ccd 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 da6b4a47cd60..45ea15c59b05 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 bb21ac723b5c..6053bf4d597f 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 26bae4b41406..8b3dcae21f2c 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 74b7a64bf8ed..0f71549895f3 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 9fb22bf5d486..ee267b43c83c 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 0dcaeeee76c5..8fb6c60e512f 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 4f880f70a578..225e7b6a00d5 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 4d1692236bc6..c006bacf3845 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 44c613cc6c18..4077ae31d644 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 b083890a72ec..a35a3407031c 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 65017daab280..e22fdcf584a2 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 3520a0a3b061..608dbe339402 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 7d6686838e42..ac74cbc9ed5e 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 6cf5d86dd83a..a0815bc65e86 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 2fa6432e0f5a..497e5c9c25c6 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 ab7eb8bf282e..2344a5a2c474 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 2beeb5aeb34e..fe793d508b0f 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 85b826a1cedc..68597b53272c 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 2c39336a72f5..c9993add6740 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 a1ec641f540e..1456fc9980b9 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 8a4f8f9f362e..da46a4800294 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 74806697a37c..f47d631648ff 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 e23c6f335a23..a5b25be24536 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 55ea76e3692d..ce4b082872df 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 fd596efed808..ccc9b8016b1e 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 ecf847a009d2..315cfeb77a2c 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 8002b40d9e43..7129f89b783c 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 1f2faee5a4ae..59a9c563c06c 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 3b3d92c8ee56..79c4f4b2b5ec 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 bb332c9d2d00..9bc05a42cb6e 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 f723c2ffca0e..13346b847c72 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 3f300fed5060..627567efd9e7 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 ddf0c0470d5e..dfb250c2af58 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 17e55d6834d8..2ded3e6ec5dd 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 349634c1b390..741d766dfc99 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 ddb3cc91d79d..e30311718c57 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 2c06f2f773cf..af4837829b9f 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 3fd8a7ebd05d..0cb7a85b12c9 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 3d3894b37340..d360ef995de2 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 b27bb1a5ebeb..7c9855654e50 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 5a086d395c93..c1e0969c79d0 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 d20a20d6b145..8e0c6d892eda 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 588c87ba1478..6e08374c9922 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 990394e66cdf..c45f6745ff8f 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 02b7342edaa0..df424fa8818d 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 8a2eac30135c..b52fe0ecf605 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 ad8357c7adcb..1332ed4a61bb 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 a08a5f7bf8c3..01a295ca3e0c 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 36f9ef00ce2c..3695b28f216f 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 3a3ef81d4322..f577b6b4c881 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 694f4e269774..2683d588dea0 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 42e6271f6f95..1de3e564996e 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 ae9a91e72c80..abab2d4a1a0b 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 5ea4daf62340..3f4c90a703a0 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 66a752f3df16..e7a1b2161da7 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 2d9a52f3a42d..f8786edbaec1 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 c85fc71b8f2e..15f804436c43 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 c7c6252ceb98..2a069261a3c0 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 b594cd8cf54e..20fe4e68adfd 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 623d98281c75..7ba873524d4d 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 10fbb38d40c8..f23e1726f92e 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 b69d51e728f0..095cea532d2c 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 3341e5d72182..99d73637a3c2 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 8e70620b45d1..cd159fa72d4b 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 dd24776ef72f..39d227603c82 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 e8bc9ea1928f..8b981c6a3ee6 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 d27f40fb2664..ce563bee3b32 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 aa1e4e455ba0..e99fa794a445 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 8561f334e44c..30abd27f8a02 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 acb3cac34386..84a3540d0a1a 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 42b9083fda92..3944fb7a94dd 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 c4b80b6377cf..5dfb3ce6ea70 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 1ad6a0d048a1..4b9697d7747c 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 dd2595a322ba..994ddd77f34c 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 a5df234c5a2b..2fede6412395 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 665aa7ae4259..df8c80799b8a 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 7e3dbc108d29..5c27222dc458 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 9ccedd4e6e79..7c5866a199d3 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 686498305b31..dd52c8b5ddd6 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 af758dd9d1a9..91f15f2755aa 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 ed54a1c115eb..69be4dfabd90 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 65dc07a52fe9..9590228aafcb 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 7148f4e6f483..690affeef358 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 df63c2f06c46..a1e72b39fdec 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 883c92641ca7..38904871f60d 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 34dfbad8345d..5dd2e2cf799d 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 63db21004420..c89d83968382 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 74b645814cea..40d0f6d726b0 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 e6b5243540e8..cd5ce6db1b29 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 fdbb9d3e9743..0929a77378d1 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 cf0da0c29df7..aea0834138e2 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 cf4b3b4338ab..8201b94980c4 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 1e5d9b1440d9..f7eb24ba21f4 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 ac8999493ec9..2e3d92e4ca13 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 02437c118345..afc0f38fadf3 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 cd415f876d9d..f690f42b8d15 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 e34b48182e71..fdc491f225cd 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 4dffa17b0cd6..b3299d68d202 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 329705b358f9..dc2ced0b5ced 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 82369b8858d5..ac71c6f8e04d 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 f028f0867985..c410ba7d306a 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 99e0cd2e1f44..15312b2b2a27 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 31878a239a81..3065b8888857 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 778d7fe6e6a3..2a06267b4412 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 8e2ba6854409..12ecc43bb403 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 144c5a7dac84..83cd31f99851 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 176627f81111..ae3504ffc6d2 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 96a23e0e1483..4265fab9fffd 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 89aecf7ff169..d023e6bf2c98 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 ce813242ea8a..883352d606f1 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 0ea6f25555f0..5491f9d8aea2 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 0185c2d4f047..22881605cf98 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 c8b33791730f..7d24742d8070 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 e7be9aaf1cb5..c1bdf7e495d0 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 f6a40a0a4820..61faa8e070ea 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 2c25a2792b89..64118b09b1d5 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 522f427a8e87..203dbf95ebf8 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 249536a59e75..15dc18293745 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 4d22d8b6c9a1..27855d6d87ae 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 75b74da477a3..2e24ca63b24b 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 7528563de245..8dedd123decf 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 6851a8c44e49..05fa8ea36f1a 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 b9a195a49992..c0a8e4c24fb4 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 275678fd6126..2bfc1c144847 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 1abf7be6a2e3..282c3313e7de 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 fafb39f44d2f..2aba071f30d8 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 e4eddd8b3395..c8aa0de4273f 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 3dc9c394406b..5f6a6aceeff3 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 e8b9f7ddfefd..08cd571a0297 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 9bde8840d2a3..af4336408cc0 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 e635ec62af5b..509bddec2dde 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 2f3903de4125..e4c61eacea4d 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 a6dc591ef704..b123a9ced52a 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 d65057e29c15..55a573198e91 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 baceb31dbddf..af1a8d62deb1 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 71da7b9b4e19..bc9fced03199 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 9d35b253ceb7..6d70f293374d 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 4c42a54b4178..fe58f0078a22 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 a34699b15535..09bc93588321 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 dc5211804eb4..fca92c35ce0f 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 cf402d737d68..f24034c99ae2 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 2121cffa8a33..9a6e34092be2 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 d3087dca0869..7d22b9c6f96d 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 b309e4c12601..a8a9e937acb5 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 7bae7217ada8..734b8ea62547 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 df1a81983b5c..b5527029a2cc 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 798f744113d8..ee9d4785dc5a 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 dc596b0416de..660528c961d7 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 9689d0e3ab55..0f1c98b4295c 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 9685e2661d37..83088eb6d08d 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 aea893862a06..4fc238fedc90 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 b1567d6b3357..2e0de9aef75a 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 7bcac50a136b..6eb7a72bda99 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 6d4650a80412..1b16327895cc 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 0a80bc5238a1..95e1db015207 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 2d9ef5964c3c..aeab7d85ff40 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 c225af2b5518..7337df80338f 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 ff38b2afc2d2..98fde340dce5 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 16ca1a91e9a8..31643dcadfe3 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 1cc072a0c642..726ab37eb3d3 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 cd7e4d1659e3..dd3ff9a5692d 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 70691a13d0e6..94024b459e17 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 2c496f97506f..cba3fd4af8a7 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 e1f5f49492b9..5b908abdc06f 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 ad84a89573c7..7c353fa6e9ba 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 7d0b40107ae2..6552a588db98 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 cde84fe39c0d..e117d3fb916a 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 bb6b253ab1b1..c2fa9b143726 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 e84367d687c2..b776f3109405 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 d3558f40df9d..58830f5907b5 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 2a16faec51a8..357f9c5ee912 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 cfab6145db78..c472980d8fe9 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 97ee8238f781..ea756ab53a39 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 87745d02c085..55921faa368f 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 639644ea67a3..5794efdd54f8 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 490d773c0cad..85bd6c69acf8 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 d6c3c31912b1..926403e3d39f 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 8814866bfda4..d35c12f8116a 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 3976266b0dda..1b961171c1ea 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 70f0a55588ca..323368b3cb82 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 bd2f76ef9b95..3dd2a36cc3c6 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 ccd97dc5f24f..0938a6217a17 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 930fc4a65fcb..9ce05963b4be 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 3e808b0258ec..c9c828da6a6c 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 a485f8bae92e..bb682d89f053 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 7caf5a1ade0b..40f8ca0ea60f 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 aab4281e80df..5dd1ec5cba2f 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 0b68a16d737a..1b29522f42b5 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 1fcb1c127a0d..b9944df12541 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 62605465a62a..1da72f27499f 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 fb1c4331dae9..eb1619ff6a86 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 a8867b0cf735..5bad6d1d98e5 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 1e67c6748e39..d7508246a92e 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 3aeb362ab571..a8407093d9a2 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 89248448d283..03e4bc441cf5 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 78e4fb5730a2..1df848dd1b55 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 e7d9d220bf03..5dff81a52799 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 0d5ea4305acd..55f38372b27d 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 534da129b600..8419e55358e2 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 066f791fc95c..2088bf928910 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 c5782d58b247..c10a60947836 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 1e9cb019fa02..722df758e144 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 80ecc5ebbc1f..6903f871a433 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 4df6e40af342..d959b9f52e44 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 00bc380aa5b5..f5af46379cf3 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 66b3644e9580..fb89f9449d35 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 2f2489822759..809347aa2f51 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 4bd570a37c49..f60c6fe3ff5a 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 00cbd0cf91be..3db1a0c6c36f 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 c86c3affb7c5..39e52851518e 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 60adf45d24ee..a3abf44343a5 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 12a94bbd364f..020a6860f51f 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 b056eacdf6d0..5c97ae5bd78e 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 72412a08b07f..6b2a17660e13 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 12e2fcf58d8d..c93fa4198dcc 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 3b19d5ad1a24..4858ebbef21c 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 6d21a88359c2..ffb5bd1f7edd 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 ead0bea9b929..67f303aef47b 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 e356aa37587a..1e5406cfdedb 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 b825fd43997a..eb3a25c46664 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 2319779730ea..ca55d97eb954 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 d25b510b6977..31414bfa912b 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 55d6c0e32fd7..df7da02c03f3 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 eb5d12e25b72..29522c8f6cf1 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 36009c6e9f8c..37b0a1e2a5cb 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 ffd3a9d1cba0..b18ec76dc062 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 ff47f8468d8a..ed75ced8d76d 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 8b7adcfb9edc..054ce2320615 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 b147903e1e3a..c6eeb89630c6 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 8310d57afcc9..aaf5d9067c57 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 0875e19f9033..5ec0daced4af 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 4b0b0e3578ae..8078077503ce 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 125edce67d83..930b1b2c24c2 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 4f48c38de48b..a433a651c849 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 c853acce45f9..7cacbb7f408d 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 95d1fea4db96..93ffc0d46663 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 39eb649cf9ec..05364b1f8b41 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 7aad47977a9b..0def09b54b57 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 03e28a00c9bb..e8480505bc52 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 6cdb0d9e5482..480336b1547a 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 ec16f09e22d1..31f23485e7de 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 441783a44fe5..3099f634b08d 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 9b7f7898ed0e..0c15c847e80c 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 33f146f3e257..3490a95d7696 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 bd4ad8578eaf..5a2e2a7126f5 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 2f988f6be02e..eb8aa27e363f 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 fce15dcc4dc4..666ddd1bb432 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 73a002da7c7c..1db2ae2f131e 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 5cb04727241a..6bcaec1bb870 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 7bff4113c853..09fc0a6684b9 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 ded5e1828964..1acd67aa7b39 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 365c8e935b81..fdc38742c3fb 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 64a152b1dfe8..24f38cb16458 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 3df5a698aafb..6cd9ee8600e0 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 ffa657b3b4cf..babe7af3cf96 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 86a2ca4fd62f..ac32f12dfbff 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 f759a65603f2..d661d7279f6b 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 0a13c931f12f..838313b15ee0 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 d4450ecaa72e..58ec97d23e09 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 bf778783f03a..b360db30c2b2 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 e65f5aaeed87..a63803c95432 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 82d25a09d15c..7012f6d12199 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 40169d605123..add53f4b051c 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 d75febfc8a7b..3f626cb79592 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 4a7769140e10..b98375f97a4c 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 10736664765c..aa873843d5cd 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 7cbb331e6edb..5ad790e380fe 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 4b65fabebb3f..02674ab4e231 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 1566575161cf..c1f0d004419a 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 ca5bbf18e024..1de5f1f8b812 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 7c13364fb5d7..f183fb6acf48 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 e2669470c25c..1795d2cd9a48 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 e687152cbad9..924bfb8e1108 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 cd81e49ecb90..96f575883ce0 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 b05800445289..c73b12c75545 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 50c85ec6bff9..e90b5f46fdf2 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 343a2509deae..e290d4a5a14e 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 4115be5cfbde..bd09c261e977 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 31e6a3500e4c..caf8383b0d67 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 ddeb16e906ff..feccc752600e 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 12ec804370d4..befd66bcadc2 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 9e73f5040856..94f93f739b67 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 6dd60862d92a..3befc6bd691a 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 14dfa277749e..af3e3eebdc2f 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 43c0c6f83c33..f1500fc3046a 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 5108dd994c1c..248639b9a96d 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 25433e1bf846..2fc32960c412 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 2db94646a927..3ae8ff872932 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 41ce72458b3c..3c55d0e873f7 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 f5ce2f46adb3..6a1394e54e16 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 8dd62f3e6f08..634b4eb0dc07 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 b65ced72d49e..14eac598a866 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 d3ea6d3906d2..ba2b9c3685c0 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 fd91f7a29fc5..8b2496fac3e0 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 ccc179fbd5d5..e75ab79d86e0 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 d8833472669b..e87d0d679180 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 14599cb2f84b..78998f214177 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 6e1524e79793..caf3c6cf8a35 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 6199baa2d784..b2a301e9e8fe 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 1c9872a15165..7de0a07f061c 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 65b471b56574..484cb87e1c30 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 b48a8dc470e0..adcba2cd2086 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 8c28b6f77e0a..fdb87f8cb40c 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 8662b1497077..d29385e91add 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 d1c65c6f21dc..baee5baabff8 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 4b1763d2fdc1..aa65f146d352 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 781db606e110..eae39e207443 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 fb0dfc52d227..5bb188fef5c9 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 188100a38810..98ec4740b155 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 b3fd49dcf506..d2dcf16bc5f3 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 aafa31f8d6a5..12f276ccefb8 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 b39e16cdea79..93c15423eb36 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 33562e0b50af..291cb71118a0 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 44837932d8d8..3d48a6075581 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 90ad406d260f..3b9ce635c6bd 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 bb839fd29563..c76297e13a8f 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 49c8af467cbc..f5e3e59ee268 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 af42a8568c89..74aa09aa545f 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 58fbf06c31e2..2ae8d33b3d08 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 b575628e7397..1a33ada426d2 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 1186479590fe..bf1fb114e0fc 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 03713323f5a3..61261aa9cc83 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 29f76b10b560..c464feb5ac43 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 d21f775c2aaa..4ac02993795c 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 807d805da2c0..c3bfaf42ddb3 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 0dffd29a6421..1fe694651742 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 709e9cdb826a..3c8b25444d85 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 749c3d802c69..a0de55df0468 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 b1deee7d8cc2..d660f4fd3068 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 0b89574fb3ae..ad3db98d1c13 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 ee76846336b4..ad61bf96fcf3 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 6c1bdd273bb2..5091da2a9aad 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 a8fd24764b75..1e9f07a759e4 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 c309c297283b..3204be40da74 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 be4d32dd8f2b..89718aa3d3ce 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 fd55e3ab5590..aee50fda25d1 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 65e0c8b104da..16ce47cda347 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 3334f9bd081b..9c8bbd926cee 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 93a8b0100aec..aebe5c6e0d6b 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 8c6c9c375eac..1dfd80d24134 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 6f80b29fe564..00e97d612ea2 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 822e2819750a..df9857c8f91e 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 0b03ece8fc89..49f90ccf39d2 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 ba083c6620b6..31b0aca72f77 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 4156c1e355d0..3775199802f0 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 9471bf99eafe..cd7102a7f35c 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 83a1d8abe8de..35853d5ba052 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 aac999ec4d69..108fc3134750 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 e9665cb5fd08..60f7aeaea452 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 fe3e9a0486ed..6b604e738d3f 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 7419a976eb56..ec09e806bc52 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 f13871e7c934..9043baf1f11f 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 0f10333c7fd6..11e69607580d 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 462e989b93f3..e2521d1d200e 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 891946e68000..918cf28910b2 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 b98b3c1351b9..f663d800b9ba 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 82ed3f575d1c..faaf225b6f58 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 5c54b31d9e50..88e545bce68e 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 abfe53f5ed3c..5f663216c031 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 66e996f7f961..007361d3c940 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 86dc6476909f..fcb38345a6d9 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 554d0543cbea..893a97839eab 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 79792de7c916..3ac98c59364d 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 7d5884a6ea07..6b410f8dd760 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 b7cbad953317..622f9cdb12e9 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 6903bdcd9b8a..f3f4e401bf28 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 9d5b6aceaed2..5441ab6621cf 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 76e1242d4068..9a38732c89b3 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 9b273f78fa11..bce3ef12b732 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 4160cbd272bf..4d1638f18b7d 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 edc73c2c6183..5e82af3460b1 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 4dc1f4482146..0f68f66e6a7f 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 64f39a7245b3..356c3d019785 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 2814a80e58bd..c5d0597b763a 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 16f1d5ba4efa..9def4c8dc240 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 4d4e28703acf..a98afcea8ff8 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 ffe2dd1d9c24..7e215cc1b33e 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 d91cae1a846e..2c47e72416bd 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 131ccdc4fba6..dbfed45ce47e 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 1e5446ed4f8c..7d08cb084d4c 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 288cda84cc19..bd2aba1de8c0 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 8339fb732e32..ffcd33f93757 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 8284e5f85bb0..1abf787e17b7 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 2fd5687dc7f5..c245ec56071c 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 07a9c909efa5..78bdf8e7f132 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 0d674a0dcbbe..62d05a4ee98d 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 373c82c3c7ae..c45eed5d8b8f 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 539b8b18130f..1d51b1356033 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 e6b36bedaba0..4a96eadf7c86 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 fb063f20806e..21d1912d9a13 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 96115d2daf5b..75ba929e0b59 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 905b5f9603cb..2fe64c3d5faf 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 7fa25e5adb8c..14940c12c6a2 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 0525c1c19f86..2f785f5ae7d4 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 03665f9b52fd..490d40bd1c1f 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 e9cb5a53ccde..1cd917c95e2e 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 8ba5a027ca58..d49329811d90 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 beb0b74e6ec8..1d410a1581ef 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 4de96c8257bf..f696799a3cca 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 74d5a5e4c763..bbc45532c2a2 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 36d19007bd3f..337c039bf994 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 39b4a3bf6c64..dceac3d70082 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 b441964c9c62..444bcef2bcff 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 061f08455d57..905a1564a1e2 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 20667ca3a781..6c0cb265e518 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 35342c73e330..4fc92bae0636 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 9334a897511a..15cfd4541530 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 b5d743a0a6d5..7461c1a48969 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 3583cc5b67a3..d701a2dde588 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 dc6d34dde12c..dff1e7b5b72e 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 9a407317804a..b117bd1252a9 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 a10844acd807..4d5e3e3fab25 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 cc3034f8bb9e..d0c7a9c76804 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 d544d412406d..91026e47c0d0 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 a9decf9288ef..aaf627c3e4ee 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 140c7934e198..fc56665d14f0 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 49c925019bcc..bdf6d234280f 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 4b131238a4b9..2acadc3bef87 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 f6d968e1c62a..a67f0523eb5c 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 4fb38fe43505..9aa15a1ffa6e 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 038c42177ef5..24759f0f652b 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 4bc767af526b..9da9df2f9708 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 3b27e688ea5d..4c7b4c7b96c6 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 da4752fc7a9b..74d15223f51e 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 e17b252f6f61..3202c42130ed 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 3305804380fb..57ddbbf861b7 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 57c89f79ecb5..ee5006eadcf7 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 7d8ecfa4a2c1..82d7d27da849 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 4f8cab781d0e..fe16ee6e7ee6 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 5ea5aaee1a76..f0bb1c19fb63 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 bef210d27c33..4ac9b7c9c742 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 9beff52ade7c..7cec821fe87f 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 35288013321d..8e16b290443c 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 1b095e9fb911..b254b75da3f9 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 4338749d0713..a278faaace0b 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 3d7cef0d71cc..301556abc168 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 0f7946be8ffb..7a19456fb0b3 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 c33761c3c68b..07a0bab0de2b 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 fdb83a53fa90..cd298da73cbe 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 3e39ceed85ca..109004e7366c 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 8733debc9913..179b77873709 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 b8118a65e2c5..44113f78397b 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 974e60ec905c..8931d66bf798 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 52188bacf16a..66deb1fc83bd 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 3c805c9e6f8e..092f67d7afce 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 25be5016189c..5846f1d575cf 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 ac81d9b54f1f..b76becc52525 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 bb2a482558f4..6c8d93a8fc39 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 68b4f9ffccdc..9c188bc180b4 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 a2491139cb26..e7afe1f237d1 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 629d33fea09e..ad3fdd83faea 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 80a091b0d4fe..3d72b6a50e58 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 fa854a48f0ec..b61a7ffd39dc 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 19fa543d17e2..83586f2222e8 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 8f36bb79ad73..0299abaddafc 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 78d71540f608..2a72f5d7a0ee 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 eef272209ddd..adc245dcdd06 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 312d38bbd43c..d88cfbecc1c6 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 eb370ed8667b..702c343a04dd 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 b8ba82cf77de..41397d2b8ef3 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 0216489d1b96..d0c57b08e503 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 31b9a5626a18..4269b876e904 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 05622ab9e097..c1cbe76b4cb1 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 3a7b38578b93..5cf35e0d08c8 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 2365984a3b50..b42427cd61ab 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 4928d42f934a..20c2b79467ed 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 65b62cbd52ee..ae6801ad1a89 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 4bd579e9634d..9af1209a6fd1 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 8cd142fd01e2..011028c9385c 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 4f9e004a349f..ecbcc124742c 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 5cba65aa2617..25bef27efa64 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 15864b252509..1a5354023ac2 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 1268e31d22ee..2967a12b620d 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 9416da757daa..7edb4b27e890 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 de34d601076b..2d7d4e27abac 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 65caffab0a2c..924ba2665846 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 aa3651a99450..60607ac52bc1 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 e488f617e790..9d31d60b4b03 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 aba93faff94a..b3215cf18ec8 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 cb82deba81a0..e6ec95912291 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 7fbb52cdedf1..5fca22e5ae80 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 63fa14020565..63dd1e1fdcb1 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 bc1ea4d07933..836f02f36592 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 fb106d87314b..6fa759aabcc8 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 01e4e378383a..deacb753516a 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 9bc2c9d09538..a38ddfb49a53 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 ff115b1b86bd..6124efb2809e 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 0c33db69eae3..178f312a825b 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 8fe7573a9f2d..a32573f07c21 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 8624fc8ecdbc..f61aae92a5b3 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 5b0afc4ea6e9..72bd53f1c93b 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 6c2d22b9c2bf..6dbc27d7d83d 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 e4af307b1005..2c0ac9c66a31 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 d21ce8be1faa..302d2e2de612 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 e26ab0b35829..bd889d1223a1 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 bdfa4bcc0061..c47985496518 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 a32a14722fc2..fe3b7dd50eee 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 5ac1f3ceb431..5440620740c3 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 2b7ac29849f3..7abf1a9d8c08 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 42cd5b4ebd07..798547fb0a95 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 f7774fb8fbfb..d1dcf146e7d1 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 2fa0dff095d2..7ad3ef7cad7f 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 a5a2e07348ef..bad28d6670df 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 0e31e18d86e5..55441f72ed44 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 b2b216911c21..491aabfd398a 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 b69d8fb0a17c..e9ec369ae110 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 7ca170bcd8d2..235cf452d476 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 3d6fac4f8ec4..26368cdaf2ea 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 9715dab78202..354b0ff31dac 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 0de6d4d1004a..f547199a74d8 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 0350677a492f..7aaff958e502 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 07e7dc4083cc..e56b0319ab3d 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 4cd914dbb83c..5b32f235bbc1 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 d0fe24302e37..a25704ca55df 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 cdcb3f0b4dc1..afbda665357e 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 9f7c1db3726e..50126bcf0c87 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 bcdfc5f70d7c..69ecf74b279d 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 15d6b73282be..356242e88980 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 1194fc1c31dc..0e0c8391e765 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 0ffa325e748f..ef842de8bac2 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 8ecd8226f99e..6aada2e300ea 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 3e205a082166..b91a3620a3ab 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 5eef74583523..5e1b3509e8d4 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 d0db782891b7..4714384aabe1 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 69dcbd42eb7b..c8e95eaaa3f0 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 3ef3a78748ce..8e0a248dcadd 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 c2f4bcd29368..35cf0d4d23e8 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 ee2b16f8049a..352820bc7a2e 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 a1bdc404aaf3..fbd01d2a6619 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 7c7cbcb9b9b2..f00b35b81d7d 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 dde3f0e46af5..1ccf66eb9a6a 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 47bd2e523dad..2cc20a9c8154 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 d0c7fb6beccf..3bd928cb318b 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 d5516d98bf91..366d0d42b4b6 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 d7dc08f1cf46..889d2fc71ea0 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 26ace8903106..3be01c0dce67 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 17ef3c4aba56..81e88738e136 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 f47b419dda26..52ca7494cf39 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 d376fe243b27..de6a3817d07b 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 ba71db9d31bc..bbb0aafc02f4 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 beab64f9ce29..1115702ff9b7 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 6f688cd2dd25..eb1a4bc4d57d 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 3456d3a3f177..acb7338287b2 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 56d0d1ab4ba3..ea2d61d46dc8 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 c528ac66966a..fe1bf8eab649 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 93cbce174fee..6288c20da80b 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 c0581c092ef3..9a59b2ea3838 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 5f98581d0632..cabf4ceaf49e 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 566778fa359b..1a3173364e72 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 2cfcdd4f5172..9863c29580af 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 1634f9c2a3b1..81532c2e05d3 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 95df9459676e..895d60a6c196 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 408b70950727..e82313a83bc0 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 c4db10c2fc58..a459a44f17fc 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 01b0de4b514a..5f12a203718e 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 fab9be8f8197..34735101b841 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 ac081672d81a..7aa5328c2a6e 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 6330a1422faa..b08831c1fb08 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 01c9f704a410..6e5e92ef3343 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 ff129c4dd746..b90ef45192ff 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 6d2ba1c76c37..583cde5a6adf 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 11efa0e30620..bab0790c309f 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 de53e5364b8d..a272ce56978a 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 9728d3776991..1a9d3c613275 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 d63fc96df54a..d9a6273570b1 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 f3fdf55a0b96..1af049e8aa75 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 4be75d2db98e..dfed1492e427 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 04c778b363ec..b8409c204f46 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 a63550856d2a..9d52c257aae9 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 b63a80f925a7..f4e6e9bc9816 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 ff8fbfe53d0b..56db20ca0d37 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 5ede3c6095b2..4e6f43b8625d 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 830e9eae8f74..afc9f18b11e8 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 f2e1fef085b6..f9dde3f8a0b1 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 28016d9196fd..7aeb12633a62 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 35ecc8abd6d6..995d6759dec9 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 3b51df7f65bf..3951feeaa17e 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 346191bbfa63..c87262e11ba6 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 e26cc306a8a6..5872c22c0ae7 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 f7ff87e6bd7c..dfac474f47e1 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 0939112d1022..d621a3fd7cdd 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 b58af9ac4eae..6e70975b295e 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 fbfdac7242c2..c2f7ea163bf8 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 a04850ced043..d8310350ac8e 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 e3a2a88e2d38..8108b4f89867 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 0ce3cf9fbbf9..b9534c836da6 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 514fcbcc2680..1f6a0c9e03fe 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 7c74f960b81e..f392274e2a27 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 0fba84c0be13..5fed6e17aef1 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 7ea628b4d381..2dbdce277445 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 b04deae24594..80c32a1793b9 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 27184f446305..7ccfe83b7ed1 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 bd9d062c939e..5112afd7227d 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 1a5f2811f995..d75b9b0be1d3 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 3f2bd5252c67..21d908b27809 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 d53cc5fe4c97..cc763799e5f9 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 bb97e77374c3..4238a7b0be65 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 dd794ee7a37e..250821120720 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 d875bcbc047d..76a3bffb6319 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 68237ebf6d79..771fc7b5e161 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 24f807372695..08e344eae665 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 897abae78982..db36ccae0a34 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 2c284cb799ae..a44946d6d45c 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 a988a8ea2181..ec204af7249a 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 d5edd0eedf31..5c7cf825e6cf 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 a2244b2bcded..fdb388e540b1 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 466e5be5866b..c766f48809e6 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 80c8cab2e4c2..6f85b8fe7c2a 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 f3289bfd2026..36d9aebadd96 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 4879362b8f19..780a5be822a1 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 7b81fd7df15d..a8c080752bf7 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 8a42c05cb0a5..f6420827394e 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 8591494393d9..6b0406be1882 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 6137447ad4ce..b229d2908182 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 a63cecbf74d3..228d82d3bc2e 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 d5aae215e5df..10e8af4314c5 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 7688b4a6cd06..5475eb009bef 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 88931af84922..31c6bb87e683 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 0eccfa40b884..7f3b699683a0 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 d5e9c879350a..65e28eb92ae7 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 a044f7fa7308..3f54b0cd1eff 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 3f04e6c9b871..d2c6491a6507 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 4582db88abca..1cb02196f3b2 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 63a257b34d6b..47631e9a1c41 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 e636c4b554d9..507720f8de4f 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 c276c373579e..2617eb1b9521 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 f6cd54283677..6708c56537b4 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 c4f0ac97e938..5a623bc3eebd 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 a7d7065361c7..52d68118f0fa 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 1508391cbde5..1407b475e89d 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 a45e1eed9d1b..588865de9cd7 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 4c6d28c1370a..2d2d30e65445 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 c3b37cd411aa..e4f075b7aab1 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 41cfe88d7197..d4db9b91d818 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 389929415e4d..9537fc6e2bb1 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 c40b452d1249..592747b005ba 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 ccd2d6ead719..ae5fadb4930d 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 8ce695a01f31..21b0d04286d4 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 3a7c0ea02e33..100ab40c96f2 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 9d2db6a565a0..ecbc16321f17 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 7fdcca0a7c8f..d58c66ce51ac 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 f8de66737dd1..5c5590a25d57 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 c9287be0bdd6..ba30a876e879 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 518ef39dd837..736f32cd2b21 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 9b855bb5d23c..c029bb25bb58 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 b3070aeef8fa..7b01b04c7601 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 76109697ce00..7ce2373a43d5 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 34cf31b9e888..80841645c30a 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 886188a9aa42..c4ece6a0717f 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 ba2664869355..757c7ec316cc 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 8863d73c90e7..fdfd82dfa6b7 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 9575d8702169..5577eeb86ccd 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 e85c94e5428b..d35fbdfd2ae5 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 1c148aec3ae9..fa2132c39b38 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 305df31285cd..8b02ec0569d3 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 6955f5973abd..0ded41ab80c3 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 01a88d5a67de..18413eecfe92 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 8e55e6caf93e..f29fe7728848 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 bf6a53353da7..de726f5db7a8 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 56b52846ef2b..05afac69a13f 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 f8ee72c4af80..2b57a10bd1cb 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 facb2cf7fbff..16512487fc86 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 802521ecfb89..a91306569b89 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 ecb30740f33f..1b01ca679a85 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 992988606665..b00c9458e568 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 e86d40dc282a..1be2376b5d14 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 dcc10bcb632a..13a00611bdaf 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 3b0f17bae9b3..aed9d34b4b9f 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 03b8f963f9bb..ee75538cd952 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 885cc588e096..2b7189da1a0a 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 3db9a4ecd477..f112d4e0ba1e 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 466b1ddd0801..1c8a72ef558a 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 4f11c661d2be..6c23728d6028 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 9bc92d36c574..691ca37b83cf 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 15250d11c30a..2688509018cb 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 c1dd807d5ac2..0888ad4b7a04 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 d4ca4a3cfe6f..d74c219535dd 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 1b73db11075b..78e222a32e1c 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 c56867f8e6d9..4cf95913d4a4 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 ca675054954c..a78c02cc08a7 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 660429e5062f..6e5fe9e81b4f 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 8f36a6bd8eda..a252ce27a6c6 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 ad871a0dda17..077c110177a2 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 0ea7866a9b05..b8ba979b74b2 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 55130ce628f7..2eed8841ae38 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 fd7011ef3816..fa44725fb633 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 bc2abcc25577..51ed80a6233d 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 b4c6a0073618..6b5bb9515b01 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 457f79455be7..2c6bb2161709 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 45e494afe6a3..999b781f5018 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 743b1953df16..7b413fb16688 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 d6b0c9b01dbd..fa64b5166d85 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 7deb42537b7f..ea317eb2da4f 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 34571e1bcf49..694c27fee523 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 c43c3618a3d4..6f482e2c39e5 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 00dc052c390a..142230616712 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 bd5a3f549224..6be98781b871 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 e6780519cc4d..74623d9158cd 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 8fc3852bee62..077c1cafc47c 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 92b0d32d93d0..f95d0f424672 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 bbc5cdbf93f4..f11282a6f301 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 d3376f08789a..1f693fb85d9d 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 4cc2ebfdac41..c8e3375b3620 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 74a511cef628..5407e93c99e1 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 cbbb58ca13d5..4c7053c7c228 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 d7c26125937a..a0e2b1962037 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 0bd85246037d..626741b38086 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 8bfa68d0e321..367efb8987bd 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 3b3674a5eb92..331f7afb0821 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 e296e7165ed0..6e342290e426 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 600e0a1f6c72..849502f7555f 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 d64ff430e446..8537b7a3f872 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 77d9fa398f11..6e3a9d176b59 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 fb77abeb43c9..c87eeecf64cd 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 e3c26e25aa7c..ef9ca19c7f7e 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 5167c8d48dc4..3deb9d23a304 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 774769dabb7b..4ed76af02863 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 a48222698f41..8eccd0ebd565 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 2b8e2bbbaff3..6f0fef6799c1 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 c106a5aefaae..285f3dc3bf4b 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 4df743867525..2bcfa25f114c 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 713f15d7e30c..00fbc9f3f4cf 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 a444a79d63d9..3cd40675090a 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 a399a917d71c..2dc93429b08d 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 4ba027870add..5816a6f003d1 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 fccbf3f9b8e9..5136559aef8d 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 7cfd2da374db..234cfcd39b1c 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 67e76140f09d..be500ff1f504 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 b4996c74ad62..747a9e2681b0 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 e707200d6a07..6f637fb5ef97 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 d71840cacfbd..9e5f1c55dc21 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 a42371e4a7d4..f2d62ee3d8db 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 d867db059244..79e603687ec6 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 dec6081fd74f..be14eb679ea6 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 7aa1f57e9fd3..94e3260e901c 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 028394b9fca4..107706fcffb9 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 c88d8de3d599..44a185037502 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 3a6c1a7f7409..aa153c08d0a7 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 6b1284ca34cc..bfe2bd3b37ec 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 da15be2fbaa2..d5a5e79e2ae0 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 d38d67834aae..1c53b9ac21bc 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 82dfbfabad9c..9d82e3eae0f8 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 659c12c27eab..628a93faa3eb 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 a873d4ecc079..76d0cf9aafc3 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 908a16dd6269..9c2901bfdd70 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 13b255918789..7ed62d640ff9 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 01f3f5841807..3bf985ef56eb 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 1e7a469ba620..4529bfe3f533 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 af4b01d54e6f..1de3ac716be6 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 058253ab7515..0100d7409d05 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 2c9f665a9080..537f5ff805f9 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 b6a64697dbef..d1df008fb833 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 0b78d1e30456..cc2b62879099 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 8433b63ffc2c..87f1b723eb0d 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 9058f33f55b5..15be58585c20 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 7f6b30a30b00..5481ee676b88 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 937f053e8bbc..97d36742be7a 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 f6048bd16f1d..931aeb67587c 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 544412c122f4..bded9ea2eca9 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 84e3d472157c..49a57b7b9cc5 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 1dd04d779702..7e0f65e3ef14 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 c5641168f782..c9e00bbd3e18 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 5f4844a6c460..1a9c8ed90e44 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 a5cff29773b3..0a664f342536 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 a6c52e8b12f4..994a2c181d98 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 793884a3f4d4..c1c6f122cb1c 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 a0882f704143..88667793d5c8 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 6b0ecc95edae..9f7d492eb227 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 8c368fa81dca..ae2e6b99b9a1 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 c92dca4f290c..e3f3f5da0d10 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 5c34d834e742..34e51b4a61a3 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 60733aefe193..981eee0c1dfd 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 541bb2011db6..89a2ab0d9a87 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 b73b22f8bee3..015def2821ea 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 f0cceb930149..49747e906596 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 7f750c1e5be7..12134e45355a 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 647c7ef01277..a26ebf76e90b 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 d9d45c53e3b0..be76687057a8 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 58f0401a2652..47f2dc9bb2eb 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 6fe9603ca7a9..40f6c7f600c6 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 fd2793200d87..de20d7bbf4ca 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 a63f049f757a..8f21ecc3f12e 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 b64bc17156ac..0e3bab4839bc 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 46b840a649e5..ff88d6aebf46 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 bed4abb80eac..115a712b69cc 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 2724eb3ccf3b..f94071f88df1 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 c01406487927..6599f860fb1f 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 5d402181910f..6cd1732ee040 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 120ee3d91d4f..2f38a193efad 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 04d84f6b899c..c1375da5a3eb 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 f35f5add6823..8e795ff315f2 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 f2204633b30c..9b56e176080c 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 beb9b28ac5a8..a20123140240 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 99121261c476..dd870b621f20 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 0f7516f52f19..b1c56a55d386 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 5998c6514f9f..0f23e53fb10d 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 aa9bca4ed3e4..6aedce925b70 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 00e840c2af53..8ca2f53d9604 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 5e855a7f7794..548b9529cd89 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 99a7b6ea0b32..92c640b382cf 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 8789cda569c8..d2d5a5f9cb58 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 e4adb7223967..7245c23aa360 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 efcd23d8c88e..2af08340b739 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 a707df3c29ad..1adcde132629 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 797b1ac909e3..709344672c41 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 305cdc6c7fe9..ea8e55d3c301 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 b6458380f537..a82ad45dd0ae 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 10fea3d34131..93bea5960c84 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 cffb5d15ee2a..c8bde7628e74 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 472aff054657..f7fc1e1f41e0 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 3cf154385f10..95d031a22043 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 d0914bd5c434..6224486d02dd 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 b2618b1976b7..f525d2eb510f 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 d57ab3033d52..a5889ab51998 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 838ac3b3b70b..4203d3a0ec0d 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 c25833b4d9d2..4bcf8b27401f 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 0c2dc0ec7e2b..8037120c568f 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 60620198d087..fc70f86e97a1 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 d1e12089540f..9ee7379f52ab 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 ce8a75183185..a878d5cb79c2 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 c253e908f634..58b0605df0be 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 912606efac1b..e2f61fc6ebbf 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 5cde6920c23c..e01a91828f03 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 cd456d23d4f9..dd807eedc40a 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 68b3f48757b5..402f80598354 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 ef280bac3ee1..37d0a08d7b94 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 686c1064ad28..15545b79662d 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 906192e972a2..3e0c247685c0 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 d4ef16a361ea..b405f367343f 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 f29265cb75bc..8b477d499374 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 29dd2a53b666..e65bac5ddc20 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 e3bb51392c65..3523ff24c26e 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 742ed8e58d77..541fe4a0ba3c 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 c85ab65ac5a9..e836fd7b35f1 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 484568a3b4f1..269a90bcefe1 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 743aef33131f..620aa83cb0c4 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 d283abe31ed0..f1fd2054b06d 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 c51ccd858c96..d4168239da77 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 2212e6913b92..0ac028a77078 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 df06ecbf0d4c..de4d2e93aed8 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 c92874f74edb..2fafb399d178 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 b82ab90c4d11..93bf886ff60c 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 c5656fe6ffea..ef7ad51be3f8 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 1a2dc12d46d3..4fb2fbfdab82 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 110f8594a216..9862f37579aa 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 846fd68a77e3..c711da32b3c7 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 27df38fa8060..34b32be5149b 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 7c6cf955b452..516ce47599f6 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 c7e21114bde2..135f21aeb10f 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 c76de09489f2..3687f701ec00 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 ef124ece9d8b..564e6a1cf458 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 da3c18096a66..f0b845ad7328 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 534b87ce5538..84700d87490a 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 608d8a394ff7..79752e9c76fd 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 9c1ea7374e49..14302ee44065 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 8f27518cd56b..476ed0e7e342 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 1c1f48570c14..db55bc91ee55 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 10f1d513ff21..924870a06dbb 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 e803d3622a1f..4e8bd69b1938 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 8d9d57efaffc..8d807a1278b4 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 2ef1d1a6f48f..df2d577fa92a 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 13ec4193a16e..3548bdbe937a 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 a1a2aa843502..33fb673fd965 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 fb0f244b6c04..b2683b5139a4 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 9169d3dc9648..8567e40d68cd 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 df08b8a93f47..42391971fd6b 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 3a3f960cdc1c..063f2cd684d1 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 fd904f048c46..9bbd48502163 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 6c7e49bfce40..ec1d864cb946 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"
-- 
GitLab