diff --git a/getcountrydata.rb b/getcountrydata.rb
index 8491394..9540022 100644
--- a/getcountrydata.rb
+++ b/getcountrydata.rb
@@ -30,9 +30,15 @@ module Yast
       Builtins.foreach(langs) do |lang, ll|
         suffix = ll[2] || ""
         fqlanguage = lang + suffix
-        kbd = Keyboard.GetKeyboardForLanguage(lang, "us")
-        # does not really set keyboard, only fills some data
-        Keyboard.SetKeyboard(kbd)
+        if Keyboard.methods.include? :Codes
+          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
+          Keyboard.SetKeyboard(kbd)
+          keymap = Keyboard.keymap
+        end
         consolefont = consolefonts[fqlanguage] || consolefonts[lang]
         if consolefont.nil? && lang.size > 2
           consolefont = consolefonts[lang[0,2]]
@@ -56,7 +62,7 @@ module Yast
           "CONSOLE_SCREENMAP='#{screenMap}'\n" +
           "CONSOLE_UNICODEMAP='#{unicodeMap}'\n" +
           "CONSOLE_MAGIC='#{magic}'\n" +
-          "KEYTABLE='#{Keyboard.keymap}'\n" +
+          "KEYTABLE='#{keymap}'\n" +
           "TIMEZONE='#{timezone}'\n"
 
         contents << "RC_LC_MESSAGES='zh_TW.UTF-8'\n" if lang == "zh_HK"
diff --git a/langset.sh b/langset.sh
index 2e3f8fb..26393d4 100644
--- a/langset.sh
+++ b/langset.sh
@@ -86,3 +86,6 @@ fi
 [ -z "$keytable" ] || localectl set-keymap $keytable
 
 echo "$lang" > /var/lib/zypp/RequestedLocales
+
+# Make sure all changes are in effect when returning
+systemctl restart systemd-vconsole-setup
diff --git a/live-langset-data.changes b/live-langset-data.changes
index d4e769d..4eaccfa 100644
--- a/live-langset-data.changes
+++ b/live-langset-data.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Oct 30 13:58:53 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Make sure the changes are fully in effect before returning (bsc#1154638)
+
+-------------------------------------------------------------------
+Fri Jan 18 09:19:37 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Support new keyboard API in yast2-country
+
 -------------------------------------------------------------------
 Mon Jan  7 16:19:54 UTC 2019 - Fabian Vogt <fvogt@suse.com>