diff --git a/gawk/PKGBUILD b/gawk/PKGBUILD
index 53c3188..910c5c1 100644
--- a/gawk/PKGBUILD
+++ b/gawk/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=gawk
 pkgver=5.3.0
-pkgrel=01
+pkgrel=02
 pkgdesc="GNU version of awk"
 url="https://www.gnu.org/software/gawk/"
 # groups=('base-devel')
@@ -43,12 +43,12 @@ package() {
 
 arch=(x86_64)
 
-license=('GPL')
+license=('GPL-3.0-or-later')
 
 validpgpkeys=('D1967C63788713177D861ED7DF597815937EC0D2') # Arnold Robbins
 
 sha256sums=(378f8864ec21cfceaa048f7e1869ac9b4597b449087caf1eb55e440d30273336  # gawk-5.3.0.tar.gz
 	da1cd0dff94c07476c58bd0d9d8ae8c07b84e38751dd268625f9a7a4e5ffbc32) # gawk-5.3.0.tar.gz.sig
 
-##  8a8133fbcb82ade44eb1d870c6e43462348ef4579fa8a71e7045ca1a7df86d7c  gawk-5.3.0-01-x86_64.pkg.tar.lz
+##  a740f25b92fc519d043d2079bdfd4c6c6dab1fd97380b9abd44eb57c76f7c582  gawk-5.3.0-02-x86_64.pkg.tar.lz
 
diff --git a/gawk/PKGBUILD-arch b/gawk/PKGBUILD-arch
index 6cf40d9..bcd0dca 100644
--- a/gawk/PKGBUILD-arch
+++ b/gawk/PKGBUILD-arch
@@ -3,11 +3,11 @@
 
 pkgname=gawk
 pkgver=5.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU version of awk"
 arch=('x86_64')
 url="https://www.gnu.org/software/gawk/"
-license=('GPL')
+license=('GPL-3.0-or-later')
 depends=('sh' 'glibc' 'mpfr')
 provides=('awk')
 source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
diff --git a/kbd/PKGBUILD b/kbd/PKGBUILD
index e5f6ece..58d448e 100644
--- a/kbd/PKGBUILD
+++ b/kbd/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=kbd
 pkgver=2.6.4
-pkgrel=01
+pkgrel=02
 pkgdesc="Keytable files and keyboard utilities"
 url="http://www.kbd-project.org"
 depends=('glibc' 'pam')
@@ -69,15 +69,15 @@ package() {
 
 arch=(x86_64)
 
-license=('GPL')
+license=('GPL-2.0-or-later')
 
 validpgpkeys=('7F2A3D07298149A0793C9A4EA45ABA544CFFD434') # Alexey Gladkov
 
-sha256sums=(SKIP
+sha256sums=(eb0b2768ab0f577ce91367fb1935c7fc831123c36cd42a4067da80833bb483d5  # kbd
 #	6103cfc3760ddc1ea8e7b6a71ff340670b2942c157abae88bdd0fb747bc64907  # kbd-2.6.3.tar.gz
 #	3bedb57873d4815862dee0349cebc86ad37b0dd4961913cc174049860d34f630  # kbd-2.6.3.tar.sign
 	a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8  # fix-euro2.patch
 	5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4) # vlock.pam
 
-##  1cd7aedfbe8506f5ed280c1765afc54d05465cea437a586d1b743e3b450df819  kbd-2.6.4-01-x86_64.pkg.tar.lz
+##  6ed211d8b952dc6b6e28d272ebcc8a889601b88a36db024f8639ee016aaf0f3a  kbd-2.6.4-02-x86_64.pkg.tar.lz
 
diff --git a/kbd/PKGBUILD-arch b/kbd/PKGBUILD-arch
index 7ef335d..a7d29db 100644
--- a/kbd/PKGBUILD-arch
+++ b/kbd/PKGBUILD-arch
@@ -2,15 +2,13 @@
 
 pkgname=kbd
 pkgver=2.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org"
-license=('GPL')
+license=('GPL-2.0-or-later')
 depends=('glibc' 'pam')
 makedepends=('check' 'git')
-#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
-#        https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver?signed
         'fix-euro2.patch'
 	'vlock.pam')
@@ -26,7 +24,7 @@ validpgpkeys=(
              )
 
 prepare() {
-  cd ${pkgname}
+  cd "${pkgname}"
   # rename keymap files with the same names
   # this is needed because when only name of keymap is specified
   # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
@@ -42,13 +40,13 @@ prepare() {
 }
 
 build() {
-  cd ${pkgname}
+  cd "${pkgname}"
   ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share/kbd --mandir=/usr/share/man --enable-optional-progs
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
 }
 
 check() {
-  cd ${pkgname}
+  cd "${pkgname}"
 
 # This test is expected to fail since kbd-fix-loadkmap-compat.patch modifies the binary format
   sed -e 's|dumpkeys-bkeymap ||' -i tests/Makefile
@@ -57,7 +55,7 @@ check() {
 }
 
 package() {
-  cd ${pkgname}
+  cd "${pkgname}"
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR="${pkgdir}" install
   install -Dm644 ../vlock.pam "${pkgdir}"/etc/pam.d/vlock
 }