diff --git a/kbd-2.5.1-repack.tar.xz b/kbd-2.5.1-repack.tar.xz
index 9cc68b6..ce28f8d 100644
--- a/kbd-2.5.1-repack.tar.xz
+++ b/kbd-2.5.1-repack.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcc23ee4f8d0822be08c6d9554122ab39ee7ac0270112dfa29f2ac1914652b7b
-size 1531780
+oid sha256:e3872189a725f00880db4f2704a0af03b42eaf7f1643ccd80d3ed8786db9ba47
+size 1532100
diff --git a/kbd.changes b/kbd.changes
index e16b91e..5fa2dc6 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Apr 28 08:34:54 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
+
+- Remove additional vfonts, they are freeware, not opensource
+  (bsc#1210678).
+- Adjust license tag, pinephone keymap is under GPL-3.0-or-later.
+
+-------------------------------------------------------------------
+Thu Apr 20 15:17:05 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- Rename 'arabic' keyboard console layout into 'ara' and drop 'korean' symlink
+  (bsc#1210702)
+
 -------------------------------------------------------------------
 Mon Feb 27 19:06:36 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
 
diff --git a/kbd.spec b/kbd.spec
index 1e3efde..38bf384 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -28,7 +28,7 @@ Version:        2.5.1
 Release:        0
 Summary:        Keyboard and Font Utilities
 # git: git://git.altlinux.org/people/legion/packages/kbd.git
-License:        GPL-2.0-or-later
+License:        GPL-2.0-or-later AND GPL-3.0-or-later
 Group:          System/Console
 URL:            http://kbd-project.org/
 # repack_kbd.sh on https://www.kernel.org/pub/linux/utils/kbd/kbd-%%{version}.tar.xz
@@ -165,14 +165,10 @@ DOC=%{buildroot}%{_defaultdocdir}/kbd
 KBD=%{kbd}
 K=%{buildroot}$KBD
 mkdir -p $K/consolefonts
-# First install the fonts from the vfont package
+# First install the fonts from the kbd_fonts directory
 # (allowing kbd to overwrite some of them)
 mkdir -p $DOC/fonts
 install -m 644 fonts/README $DOC/fonts/README.fonts
-install -m 644 fonts/vfont-4.36/README $DOC/fonts/README.vfont-4.36
-install -m 644 fonts/vfont-5.10/README $DOC/fonts/README.vfont-5.10
-install -m 644 fonts/vfont-5.10/SCRIPT $DOC/fonts/SCRIPT.vfont-5.10
-rm -f fonts/vfont-5.10/SCRIPT fonts/*/README
 install -m 644 fonts/*/* $K/consolefonts/
 # Now call kbd install
 echo "# Now call kbd install DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir}"
@@ -194,8 +190,7 @@ if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
   exit 1
 fi
 ln -sf us.map.gz $K/keymaps/i386/qwerty/khmer.map.gz
-ln -sf us.map.gz $K/keymaps/i386/qwerty/korean.map.gz
-ln -sf us.map.gz $K/keymaps/i386/qwerty/arabic.map.gz
+ln -sf us.map.gz $K/keymaps/i386/qwerty/ara.map.gz
 ln -sf us.map.gz $K/keymaps/i386/qwerty/ir.map.gz
 ln -sf us.map.gz $K/keymaps/i386/qwerty/chinese.map.gz
 ln -sf us.map.gz $K/keymaps/i386/qwerty/taiwanese.map.gz
diff --git a/kbd_fonts.tar.bz2 b/kbd_fonts.tar.bz2
index 1f623de..aaf52e8 100644
--- a/kbd_fonts.tar.bz2
+++ b/kbd_fonts.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0e6b31377de1503e6351a0d2ba5c6c7651b2300685a90e6ec45cdf9d71c1726
-size 24112
+oid sha256:e4126946c63d1e6d69fe75552e11c34f6a1977959b714f55e33430a4fb6ef6fd
+size 8013