diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service
index d32121c..51e5387 100644
--- a/YaST2-Firstboot.service
+++ b/YaST2-Firstboot.service
@@ -6,7 +6,7 @@ ConditionPathExists=/var/lib/YaST2/reconfig_system
 
 [Service]
 Type=oneshot
-Environment=SYSTEMD_NO_WRAP=1 TERM=linux
+Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
 ExecStartPre=-/usr/bin/plymouth --hide-splash
 ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
 ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system
diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service
index eee8a4c..b29c2d2 100644
--- a/YaST2-Second-Stage.service
+++ b/YaST2-Second-Stage.service
@@ -6,7 +6,7 @@ ConditionPathExists=/var/lib/YaST2/runme_at_boot
 
 [Service]
 Type=oneshot
-Environment=SYSTEMD_NO_WRAP=1 TERM=linux
+Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
 ExecStartPre=-/usr/bin/plymouth --hide-splash
 ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
 RemainAfterExit=yes
diff --git a/yast2-installation-2.23.6.tar.bz2 b/yast2-installation-2.23.6.tar.bz2
deleted file mode 100644
index e99bcd2..0000000
--- a/yast2-installation-2.23.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:061e3c4d5918e2a4dfda5d13ebeba3ab30795fe70ef6acde9c74770bb0e98325
-size 315505
diff --git a/yast2-installation-2.23.7.tar.bz2 b/yast2-installation-2.23.7.tar.bz2
new file mode 100644
index 0000000..9e33f78
--- /dev/null
+++ b/yast2-installation-2.23.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:732fc161b07d8ab96e18a8b5560455ceb50f33cbe854c68f6a8cff41a5338b33
+size 292181
diff --git a/yast2-installation.changes b/yast2-installation.changes
index b3ee457..6d2e675 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan  7 13:06:32 CET 2013 - jsuchome@suse.cz
+
+- set new keyboard layout right after selecting (bnc#796589)
+- added SYSTEMCTL_OPTIONS to Firstboot/Second Stage services
+  (bnc#791076)
+- 2.23.7
+
 -------------------------------------------------------------------
 Fri Dec 21 08:23:47 CET 2012 - jsuchome@suse.cz
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 8b640ed..3ac8365 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-installation
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        2.23.6
+Version:        2.23.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build