diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service
index c3ccc10..ff55ed6 100644
--- a/YaST2-Second-Stage.service
+++ b/YaST2-Second-Stage.service
@@ -18,7 +18,7 @@ Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux PX_MODULE_PATH=""
 # If the system starts in multi-user mode plymouth will be quit while
 # installation in order to ensure that installation will be finished on
 # console 1 and the login prompt. (bnc#903682,889757,897956)
-ExecStartPre=/bin/sh -c 'if [ `/usr/bin/systemctl get-default` = "multi-user.target" ];then /usr/bin/plymouth quit; else /usr/bin/plymouth deactivate --hide-splash; fi'
+ExecStartPre=/bin/sh -c 'if [ -x /usr/bin/plymouth ] ; then if [ `/usr/bin/systemctl get-default` = "multi-user.target" ];then /usr/bin/plymouth quit; else /usr/bin/plymouth deactivate --hide-splash; fi; fi'
 ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
 RemainAfterExit=yes
 TimeoutSec=0
diff --git a/yast2-installation-3.1.138.tar.bz2 b/yast2-installation-3.1.138.tar.bz2
deleted file mode 100644
index b9c5d4c..0000000
--- a/yast2-installation-3.1.138.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed6c78672c8200a07c00361dd5b18d22e056651f8b1ee43daf9ed9094343f5db
-size 1211983
diff --git a/yast2-installation-3.1.140.tar.bz2 b/yast2-installation-3.1.140.tar.bz2
new file mode 100644
index 0000000..86b932a
--- /dev/null
+++ b/yast2-installation-3.1.140.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8c5eaf1412c628936ede8cdd0f23f9b2b62a7f35ad5174972b6ad7b2403d79a
+size 386494
diff --git a/yast2-installation.changes b/yast2-installation.changes
index 6b37610..5defdd4 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Apr 20 13:11:40 CEST 2015 - schubi@suse.de
+
+- Fixed differnt bugs in proposal overview with multiple tabs.
+- Checking if plymouth is available while starting second
+  installation stage for AutoYaST.
+- 3.1.140
+
+-------------------------------------------------------------------
+Thu Apr 16 13:02:23 CEST 2015 - locilka@suse.com
+
+- Always enable systemd startup services for Second Stage and
+  Firstboot (bsc#924278)
+- 3.1.139
+
 -------------------------------------------------------------------
 Thu Apr  2 09:27:55 UTC 2015 - jreidinger@suse.com
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 8102d8c..b4a12c7 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.138
+Version:        3.1.140
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -172,6 +172,15 @@ install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
 
 %service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service
 
+# bsc#924278 Always enable these services by default, they are already listed
+# in systemd-presets-branding package, but that works for new installations
+# only, it does not work for upgrades from SLE 11 where scripts had different
+# name and were not handled by systemd.
+# When we upgrade/update from systemd-based system, scripts are always enabled
+# by the %service_add_post macro.
+systemctl enable YaST2-Second-Stage.service
+systemctl enable YaST2-Firstboot.service
+
 %pre
 %service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service