diff --git a/getcountrydata.rb b/getcountrydata.rb
index b23fea0..ee630fa 100644
--- a/getcountrydata.rb
+++ b/getcountrydata.rb
@@ -26,7 +26,11 @@ module Yast
         # set language for encoding
         WFM.SetLanguage(fqlanguage)
         yast_kbd = "#{kbd},#{Keyboard.kb_model}"
-        consolefont = consolefonts[fqlanguage] || consolefonts[lang] || []
+        consolefont = consolefonts[fqlanguage] || consolefonts[lang]
+        if consolefont.nil? && lang.size > 2
+          consolefont = consolefonts[lang[0,2]]
+        end
+        consolefont ||= []
         font = consolefont[0] || ""
         unicodeMap = consolefont[1] || ""
         screenMap = consolefont[2] || ""
diff --git a/live-langset-data.changes b/live-langset-data.changes
index 738cec6..d6b20e6 100644
--- a/live-langset-data.changes
+++ b/live-langset-data.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 31 09:49:14 UTC 2018 - fvogt@suse.com
+
+- Update getcountrydata.rb to work with 2-letter language codes
+  as used by the openSUSE consolefonts.ycp
+
 -------------------------------------------------------------------
 Wed Jan 24 07:56:03 UTC 2018 - fvogt@suse.com