diff --git a/kbd.spec b/kbd.spec
index 877bd62..3ce7def 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,5 +1,5 @@
 Name:          kbd
-Version:       2.0.4
+Version:       2.2.0
 Release:       1mamba
 Summary:       Tools for configuring the console (keyboard, virtual terminals, etc.)
 Group:         System/Kernel and Hardware
@@ -9,7 +9,7 @@ Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 #URL:           http://www.kernel.org/pub/linux/utils/kbd/
 URL:           http://www.kernel.org
 #http://www.kernel.org/pub/linux/utils/kbd/%{name}-%{version}.tar.bz2
-Source:        ftp://devel.altlinux.org/legion/kbd/kbd-%{version}.tar.xz
+Source:        https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/v%{version}/kbd-%{version}.tar.bz2
 Patch0:        kbd-1.12-gcc4-fixes-1.patch
 Patch1:        kbd-1.12-it-macbook.patch
 Patch2:        kbd-1.15.3-es.po_fix-1.patch
@@ -25,14 +25,24 @@ The kbd package contains tools for managing a Linux system's console's behavior,
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p1
-#%patch2 -p1
+#%patch1 -p1
 
-%if %{_target_cpu} != "i586"
-sed -i "s|resizecons\.c||" src/Makefile.in
-sed -i "s|resizecons||" src/Makefile.in
-%endif
+./autogen.sh
+
+#%if %{_target_cpu} != "i586"
+#sed -i "s|resizecons\.c||" src/Makefile.in
+#sed -i "s|resizecons||" src/Makefile.in
+#%endif
+
+# 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)
+# this should be removed when upstream adopts the change
+mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+mv data/keymaps/i386/olpc/es{,-olpc}.map
+mv data/keymaps/i386/olpc/pt{,-olpc}.map
+mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
 
 %build
 %configure
@@ -77,6 +87,9 @@ mv %{buildroot}%{_bindir}/kbdrate \
 %doc COPYING
 
 %changelog
+* Sat Oct 26 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.0-1mamba
+- update to 2.2.0
+
 * Wed Jul 05 2017 Automatic Build System <autodist@mambasoft.it> 2.0.4-1mamba
 - automatic version update by autodist