diff --git a/main/bootmac/APKBUILD b/main/bootmac/APKBUILD
index 10f28ff09..3fe8f4283 100644
--- a/main/bootmac/APKBUILD
+++ b/main/bootmac/APKBUILD
@@ -1,11 +1,11 @@
 maintainer="Dylan Van Assche <me@dylanvanassche.be>"
 pkgname=bootmac
 pkgver=0.7.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Configure MAC addresses at boot"
 url="https://gitlab.postmarketos.org/postmarketOS/bootmac"
 arch="all"
-license="GPLv3-or-later"
+license="GPL-3.0-or-later"
 source="https://gitlab.postmarketos.org/postmarketOS/bootmac/-/archive/v$pkgver/bootmac-v$pkgver.tar.gz"
 depends="bluez-btmgmt bluez-deprecated"
 makedepends="meson"
diff --git a/main/iskey/APKBUILD b/main/iskey/APKBUILD
index 825e44317..f45f67e6f 100644
--- a/main/iskey/APKBUILD
+++ b/main/iskey/APKBUILD
@@ -1,11 +1,11 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=iskey
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Tiny tool to check if a key is pressed"
 url="https://postmarketos.org"
 arch="all"
-license="GPL-2.0"
+license="GPL-3.0-or-later"
 makedepends="meson linux-headers libevdev-dev"
 options="!check"
 _commit="4bc43d2bbf424ca90e11b3ed0c56e925898a130d"
diff --git a/main/pbsplash/APKBUILD b/main/pbsplash/APKBUILD
index 134c45bcd..d040da12b 100644
--- a/main/pbsplash/APKBUILD
+++ b/main/pbsplash/APKBUILD
@@ -2,11 +2,11 @@ maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=pbsplash
 pkgdesc="postmarketOS boot splash screen"
 pkgver=0.3.1
-pkgrel=1
+pkgrel=2
 url="https://git.sr.ht/~calebccff/pbsplash"
 arch="all"
 options="!check" # no testsuite
-license="GPL-3.0"
+license="GPL-3.0-or-later"
 source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~calebccff/pbsplash/archive/$pkgver.tar.gz"
 makedepends="meson tfblib linux-headers"
 
diff --git a/main/postmarketos-installkernel/APKBUILD b/main/postmarketos-installkernel/APKBUILD
index cc5144583..2d759ab46 100644
--- a/main/postmarketos-installkernel/APKBUILD
+++ b/main/postmarketos-installkernel/APKBUILD
@@ -5,11 +5,11 @@
 maintainer="Aelin <aelin@postmarketos.org>"
 pkgname=postmarketos-installkernel
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="postmarketOS script for installing mainline kernels"
-url="https://gitlab.postmarketos.org/postmarketOS/pmaports/tree/main/postmarketos-installkernel"
+url="https://gitlab.postmarketos.org/postmarketOS/pmaports/-/tree/main/main/postmarketos-installkernel"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
 options="!check" # no test suite
 provides="installkernel=3.5-r1"
 provider_priority=100
diff --git a/main/postmarketos-mkinitfs-hook-ci/APKBUILD b/main/postmarketos-mkinitfs-hook-ci/APKBUILD
index e538e09b1..ed38024e3 100644
--- a/main/postmarketos-mkinitfs-hook-ci/APKBUILD
+++ b/main/postmarketos-mkinitfs-hook-ci/APKBUILD
@@ -1,7 +1,7 @@
 # Co-Maintainer: Pablo Correa Gomez <pabloyoyoista@postmarketos.org>
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=postmarketos-mkinitfs-hook-ci
-pkgver=3
+pkgver=4
 pkgrel=0
 pkgdesc="Hook for doing automated CI tests in the initramfs"
 url="https://postmarketos.org"
@@ -10,7 +10,7 @@ source="
 	05-ci.files
 "
 arch="noarch"
-license="GPL2"
+license="GPL-3.0-or-later"
 options="!check"
 
 package() {
diff --git a/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD b/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD
index d0701c91b..0998821fb 100644
--- a/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD
+++ b/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD
@@ -1,13 +1,13 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=postmarketos-mkinitfs-hook-debug-shell
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Root shell in the initramfs (security hole, for debugging only)"
 url="https://postmarketos.org"
 depends="postmarketos-mkinitfs devicepkg-utils fbdebug evtest linuxconsoletools reboot-mode libinput libinput-tools"
 source="20-debug-shell.files"
 arch="noarch"
-license="GPL2"
+license="GPL-3.0-or-later"
 options="!check"
 
 package() {
diff --git a/main/postmarketos-mkinitfs-hook-kernel-panic/APKBUILD b/main/postmarketos-mkinitfs-hook-kernel-panic/APKBUILD
index d9e8cd04f..ab37243ce 100644
--- a/main/postmarketos-mkinitfs-hook-kernel-panic/APKBUILD
+++ b/main/postmarketos-mkinitfs-hook-kernel-panic/APKBUILD
@@ -1,13 +1,13 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=postmarketos-mkinitfs-hook-kernel-panic
 pkgver=0.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Script to cause a kernel panic after 30s from the initramfs (for debugging only)"
 url="https://postmarketos.org"
 depends="postmarketos-mkinitfs"
 source="00-kernel-panic.sh"
 arch="noarch"
-license="GPL2"
+license="GPL-3.0-or-later"
 # no tests
 options="!check"
 
diff --git a/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD b/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD
index 3ca297c96..6630d36c5 100644
--- a/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD
+++ b/main/postmarketos-mkinitfs-hook-maximum-attention/APKBUILD
@@ -1,13 +1,13 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=postmarketos-mkinitfs-hook-maximum-attention
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to activate all user-visible outputs from the initramfs (to confirm working kernel, for debugging only)"
 url="https://postmarketos.org"
 depends="postmarketos-mkinitfs"
 source="00-maximum-attention.sh"
 arch="noarch"
-license="GPL2"
+license="GPL-3.0-or-later"
 # no tests
 options="!check"
 
diff --git a/main/postmarketos-mkinitfs-hook-verbose-initfs/APKBUILD b/main/postmarketos-mkinitfs-hook-verbose-initfs/APKBUILD
index 8cc32fab7..cd0809c75 100644
--- a/main/postmarketos-mkinitfs-hook-verbose-initfs/APKBUILD
+++ b/main/postmarketos-mkinitfs-hook-verbose-initfs/APKBUILD
@@ -1,13 +1,13 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=postmarketos-mkinitfs-hook-verbose-initfs
 pkgver=0.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Print all shell commands executed by initramfs to the console"
 url="https://postmarketos.org"
 depends="postmarketos-mkinitfs"
 source="10-verbose-initfs.sh"
 arch="noarch"
-license="GPL2"
+license="GPL-3.0-or-later"
 # no tests
 options="!check"
 
diff --git a/main/postmarketos-test/APKBUILD b/main/postmarketos-test/APKBUILD
index 40630fd4e..592b3f8ec 100644
--- a/main/postmarketos-test/APKBUILD
+++ b/main/postmarketos-test/APKBUILD
@@ -2,11 +2,11 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=postmarketos-test
 pkgver=1.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Common test utilities for postmarketOS"
 url="https://postmarketos.org"
 arch="noarch"
-license="GPL2"
+license="GPL-3.0-or-later"
 depends="devicepkg-utils"
 # The _test split function will take files and prepare them for running
 # in the initramfs test for postmarketos-mkinitfs-hook-ci. The function
diff --git a/main/pxa-mkbootimg/APKBUILD b/main/pxa-mkbootimg/APKBUILD
index 7c379b0bb..43f56dee8 100644
--- a/main/pxa-mkbootimg/APKBUILD
+++ b/main/pxa-mkbootimg/APKBUILD
@@ -1,14 +1,14 @@
 maintainer="András El Koulali <deak311andris@gmail.com>"
 pkgname=pxa-mkbootimg
 pkgver=2020.05.19
-pkgrel=0
+pkgrel=1
 pkgdesc="mkbootimg for the PXA1908 and 1088 chipsets"
 url="https://github.com/osm0sis/pxa-mkbootimg"
 arch="all"
-license="unknown"
+license="Apache-2.0 BSD-3-Clause"
 makedepends="gcc make"
 source="$pkgname-$pkgver.tar.gz::https://github.com/osm0sis/pxa-mkbootimg/archive/$pkgver.tar.gz"
-# no tests
+# check: no tests
 options="!check"
 
 build() {
diff --git a/main/ttyescape/APKBUILD b/main/ttyescape/APKBUILD
index d64eac2d0..603079821 100644
--- a/main/ttyescape/APKBUILD
+++ b/main/ttyescape/APKBUILD
@@ -1,11 +1,11 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=ttyescape
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Daemon to allow users to escape to a tty"
 url="https://gitlab.postmarketos.org/postmarketOS/ttyescape"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="hkdm buffyboard terminus-font kbd"
 subpackages="$pkgname-openrc"
 source="