diff --git a/.gitignore b/.gitignore
index 36f3115..64c3186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ terminus.tar.bz2
 /fr-dvorak.tar.bz2
 /kbd-latarcyrheb-32.tar.bz2
 /kbdinfo.1
-/kbd-2.6.0.tar.xz
+/kbd-2.6.1.tar.xz
diff --git a/kbd-2.4.0-covscan-fixes.patch b/kbd-2.4.0-covscan-fixes.patch
index c7ddf27..67cdd50 100644
--- a/kbd-2.4.0-covscan-fixes.patch
+++ b/kbd-2.4.0-covscan-fixes.patch
@@ -1,7 +1,7 @@
-diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffontop.c
---- kbd-2.4.0/src/libkfont/psffontop.c.orig	2020-04-27 17:53:01.000000000 +0200
-+++ kbd-2.4.0/src/libkfont/psffontop.c	2021-04-27 09:59:14.170153676 +0200
-@@ -235,6 +235,7 @@ kfont_read_psffont(struct kfont_context
+diff -up kbd-2.6.1/src/libkfont/psffontop.c.orig kbd-2.6.1/src/libkfont/psffontop.c
+--- kbd-2.6.1/src/libkfont/psffontop.c.orig	2023-06-23 10:29:44.000000000 +0200
++++ kbd-2.6.1/src/libkfont/psffontop.c	2023-06-30 14:06:06.363944776 +0200
+@@ -236,6 +236,7 @@ kfont_read_psffont(struct kfont_context
  
  		if (psfhdr->mode > PSF1_MAXMODE) {
  			KFONT_ERR(ctx, _("Unsupported psf file mode (%d)"), psfhdr->mode);
@@ -9,7 +9,7 @@ diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffonto
  			return -EX_DATAERR;
  		}
  		fontlen   = ((psfhdr->mode & PSF1_MODE512) ? 512 : 256);
-@@ -251,6 +252,7 @@ kfont_read_psffont(struct kfont_context
+@@ -253,6 +254,7 @@ kfont_read_psffont(struct kfont_context
  
  		if (psfhdr.version > PSF2_MAXVERSION) {
  			KFONT_ERR(ctx, _("Unsupported psf version (%d)"), psfhdr.version);
@@ -17,9 +17,9 @@ diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffonto
  			return -EX_DATAERR;
  		}
  		fontlen   = assemble_uint32((unsigned char *)&psfhdr.length);
-@@ -260,16 +262,20 @@ kfont_read_psffont(struct kfont_context
- 		ftoffset  = assemble_uint32((unsigned char *)&psfhdr.headersize);
+@@ -263,16 +265,20 @@ kfont_read_psffont(struct kfont_context
  		fontwidth = assemble_uint32((unsigned char *)&psfhdr.width);
+ 		fontheight= assemble_uint32((unsigned char *)&psfhdr.height);
  		utf8      = 1;
 -	} else
 +	} else {
@@ -39,7 +39,7 @@ diff -up kbd-2.4.0/src/libkfont/psffontop.c.orig kbd-2.4.0/src/libkfont/psffonto
  		return -EX_DATAERR;
  	}
  
-@@ -277,6 +283,7 @@ kfont_read_psffont(struct kfont_context
+@@ -286,6 +292,7 @@ kfont_read_psffont(struct kfont_context
  
  	if (i > inputlth || (!hastable && i != inputlth)) {
  		KFONT_ERR(ctx, _("Input file: bad input length (%d)"), inputlth);
diff --git a/kbd.spec b/kbd.spec
index 7a35c8f..abee9d8 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -4,7 +4,7 @@
 %global kbd_datadir %{_exec_prefix}/lib/kbd
 
 Name:           kbd
-Version:        2.6.0
+Version:        2.6.1
 Release:        1%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 License:        GPL-2.0-or-later
@@ -183,6 +183,10 @@ make check
 %{kbd_datadir}/keymaps/legacy
 
 %changelog
+* Mon Jul 03 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.1-1
+- Update to kbd-2.6.1
+  Resolves: #2218174
+
 * Tue Jun 13 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-1
 - Update to kbd-2.6.0
   Resolves: #2214279
diff --git a/sources b/sources
index ec074c8..03f5008 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (kbd-latsun-fonts.tar.bz2) = b98da5df85017ef1bd297eb2255046d54dd805c84356db7533f24e49fb78c8e3999901a45a49cdf6a74c0002bba2e0aa8327469d78dd38b6e747103972c30584
 SHA512 (kbd-latarcyrheb-32.tar.bz2) = 1870a708e16cf16f8343f02f7e97940e8404655078f92709a0b8a334be772faa99b4dbaca37e8d8c5b16d0d4d811fe6b102e4f76ae821148eb33075613dc95b8
 SHA512 (kbdinfo.1) = 8696d55f6c15f0ee2c2936eca6180b18100a87b11f0efe809a9531bb1228c67cd096cbc8fa25d9ee496daab28892ee5f320cc4bc9c9d816ff666bb4f80271c99
-SHA512 (kbd-2.6.0.tar.xz) = 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27
+SHA512 (kbd-2.6.1.tar.xz) = 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91