diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
index 69579523357..97de320ed5c 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
@@ -31,7 +31,7 @@ for x in $(cat /proc/cmdline); do
 done
 
 if [ "${set_keymap}" ]; then
-	sed -i -e "s|\(KEYMAP=\)es|\1${keymap}|" ${rootmnt}/etc/vconsole.conf
+	sed -i -e "s|\(KEYMAP=\).*|\1${keymap}|" ${rootmnt}/etc/vconsole.conf
 fi
 
 # Setup keymap for X.org evdev.
diff --git a/srcpkgs/xbps-casper/template b/srcpkgs/xbps-casper/template
index f661f6cd207..9a91b4f426b 100644
--- a/srcpkgs/xbps-casper/template
+++ b/srcpkgs/xbps-casper/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-casper'
 pkgname=xbps-casper
-_localver=0.20	# XBPS package version
+_localver=0.21	# XBPS package version
 _distver=1.236	# This should match the upstream (Ubuntu) version
 version=${_localver}.${_distver}
 short_desc="Run a live preinstalled system from read-only media"