diff --git a/kbd.spec b/kbd.spec
index d739c1b..6da35c3 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        2.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -161,8 +161,11 @@ done < layouts-list-uniq.lst
 
 # wipe converted layouts which cannot input ASCII (#1031848)
 zgrep -L "U+0041" $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/* | xargs rm -f
-# remove converted fi layout (#1117891)
-rm -f $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi.map.gz
+
+# Rename the converted default fi (kotoistus) layout (#1117891)
+gunzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi.map.gz
+mv $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi.map $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi-kotoistus.map
+gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi-kotoistus.map
 
 %find_lang %{name}
 
@@ -181,6 +184,10 @@ rm -f $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi.map.gz
 /lib/kbd/keymaps/legacy
 
 %changelog
+* Mon Oct 06 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.2-5
+- Rename and keep Finnish xkb converted layout (patch by Marko Myllynen)
+  Related: #1117891
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild