diff --git a/language/src/modules/Language.rb b/language/src/modules/Language.rb
index aeb15084..d6bbb0b0 100644
--- a/language/src/modules/Language.rb
+++ b/language/src/modules/Language.rb
@@ -553,7 +553,7 @@ def ReadLocaleConfLanguage
       @localed_conf  = Y2Country.read_locale_conf
       return nil if @localed_conf.nil?
       local_lang = @localed_conf["LANG"]
-      local_lang.sub!(/[.@].*$/, "")
+      local_lang.sub!(/[.@].*$/, "") if local_lang
       log.info("language from sysconfig: %{local_lang}")
       local_lang
     end
diff --git a/package/yast2-country.changes b/package/yast2-country.changes
index fcf813c3..dd736a55 100644
--- a/package/yast2-country.changes
+++ b/package/yast2-country.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov 24 08:01:20 UTC 2017 - lslezak@suse.cz
+
+- Move the y2country/language_dbus.rb file to the
+  yast2-country-data subpackage where it is needed by Language.rb
+  (bsc#1069119)
+- 4.0.10
+
 -------------------------------------------------------------------
 Fri Nov 17 14:40:52 CET 2017 - schubi@suse.de
 
diff --git a/package/yast2-country.spec b/package/yast2-country.spec
index f3afe507..3cc04988 100644
--- a/package/yast2-country.spec
+++ b/package/yast2-country.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        4.0.9
+Version:        4.0.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -100,7 +100,8 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/
 %{yast_moduledir}/YaPI/TIME.pm
 %{yast_moduledir}/YaPI/LANGUAGE.pm
 %{yast_clientdir}/*.rb
-%{yast_libdir}/y2country
+%dir %{yast_libdir}/y2country
+%{yast_libdir}/y2country/widgets
 %{yast_ydatadir}/*.ycp
 %{yast_yncludedir}/keyboard/
 %{yast_yncludedir}/timezone/
@@ -130,5 +131,7 @@ functions (Language module)
 %dir %{yast_ydatadir}/languages
 %{yast_ydatadir}/languages/*.ycp
 %{yast_moduledir}/Language.rb
+%dir %{yast_libdir}/y2country
+%{yast_libdir}/y2country/language_dbus.rb
 
 %changelog