diff --git a/getcountrydata.rb b/getcountrydata.rb
index b29c304..9540022 100644
--- a/getcountrydata.rb
+++ b/getcountrydata.rb
@@ -31,8 +31,8 @@ module Yast
         suffix = ll[2] || ""
         fqlanguage = lang + suffix
         if Keyboard.methods.include? :Codes
-          # With new YaST, the keymap isn't available anymore, rely on localectl's mapping
-          keymap = ""
+          kbd = Keyboard.GetKeyboardForLanguage(lang, "us")
+          keymap = Keyboard.Codes.key(kbd)
         else
           kbd = Keyboard.GetKeyboardForLanguage(lang, "us")
           # does not really set keyboard, only fills some data
diff --git a/live-langset-data.changes b/live-langset-data.changes
index 2ffd9fa..401aa1e 100644
--- a/live-langset-data.changes
+++ b/live-langset-data.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Fri Jan 18 09:19:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
-- Rely on localectl's mapping for new yast2-country
+- Support new keyboard API in yast2-country
 
 -------------------------------------------------------------------
 Mon Jan  7 16:19:54 UTC 2019 - Fabian Vogt <fvogt@suse.com>