diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service
index b29c2d2..fec9fb7 100644
--- a/YaST2-Second-Stage.service
+++ b/YaST2-Second-Stage.service
@@ -1,12 +1,15 @@
 [Unit]
 Description=YaST2 Second Stage
 After=apparmor.service local-fs.target plymouth-start.service
-Before=getty@tty1.service xdm.service network.service NetworkManager.service SuSEfirewall2_init.service
+Before=getty@tty1.service xdm.service network.service NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service
 ConditionPathExists=/var/lib/YaST2/runme_at_boot
 
 [Service]
 Type=oneshot
 Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
+# firewall will be started by YaST Second Stage
+# ensure current queue doesn't block YaST starting it
+ExecStartPre=-/bin/systemctl stop SuSEfirewall2.service
 ExecStartPre=-/usr/bin/plymouth --hide-splash
 ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
 RemainAfterExit=yes
diff --git a/yast2-installation-2.23.10.tar.bz2 b/yast2-installation-2.23.10.tar.bz2
deleted file mode 100644
index 107e43c..0000000
--- a/yast2-installation-2.23.10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca5c15dc6b71ca5b80ac0d052440ce08d148d4c3b76d8ace63792ec514631984
-size 288322
diff --git a/yast2-installation-2.23.11.tar.bz2 b/yast2-installation-2.23.11.tar.bz2
new file mode 100644
index 0000000..c269f9a
--- /dev/null
+++ b/yast2-installation-2.23.11.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b365a89e566032f19fd1459ffed124860549cb9f58020e2d168529f1f31c29a
+size 285153
diff --git a/yast2-installation.changes b/yast2-installation.changes
index 7dc10c4..ad6fa32 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 23 16:00:21 CET 2013 - jsuchome@suse.cz
+
+- prevent systemctl hang in 2nd stage (from fcrozat@suse.com,
+  bnc#798620)
+- 2.23.11
+
 -------------------------------------------------------------------
 Sun Jan 20 15:27:33 UTC 2013 - lslezak@suse.cz
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 25e9f78..71d2042 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        2.23.10
+Version:        2.23.11
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build