diff --git a/systemd-mini.changes b/systemd-mini.changes
index cb75b260..08f75766 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Sep 27 15:47:15 UTC 2013 - fcrozat@suse.com
+
+- Update use-usr-sbin-sulogin-for-emergency-service.patch to apply
+  to all services using sulogin and remove generated files from
+  upstream tarball (bnc#841398).
+
+-------------------------------------------------------------------
+Mon Sep 23 13:09:06 UTC 2013 - arvidjaar@gmail.com
+
+- Fix-timeout-when-stopping-Type-notify-service.patch
+  Make sure MAINPID is watched when it becomes known (bnc#841544)
+
 -------------------------------------------------------------------
 Mon Sep 23 13:11:08 CEST 2013 - fcrozat@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 0d4786bd..3cb60d4a 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -189,6 +189,8 @@ Patch53:        0006-swap-fix-reverse-dependencies.patch
 Patch54:        0008-swap-create-.wants-symlink-to-auto-swap-devices.patch
 # PATCH-FIX-UPSTREAM 0009-polkit-Avoid-race-condition-in-scraping-proc.patch  VUL-0: polkit: process subject race condition [bnc#835827]
 Patch55:        0009-polkit-Avoid-race-condition-in-scraping-proc.patch
+# PATCH-FIX-UPSTREAM Fix-timeout-when-stopping-Type-notify-service.patch -- watch MAINPID after it becomed known [bnc#841544]
+Patch56:        Fix-timeout-when-stopping-Type-notify-service.patch
 
 # udev patches
 # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
@@ -444,6 +446,7 @@ cp %{SOURCE7} m4/
 %patch53 -p1
 %patch54 -p1
 %patch55 -p1
+%patch56 -p1
 
 # udev patches
 %patch1001 -p1
@@ -458,6 +461,9 @@ cp %{SOURCE7} m4/
 %endif
 %patch1009 -p1
 
+# ensure generate files are removed
+rm -f units/emergency.service
+
 %build
 autoreconf -fiv
 # prevent pre-generated and distributed files from re-building
diff --git a/systemd.changes b/systemd.changes
index 83f80aac..08f75766 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 27 15:47:15 UTC 2013 - fcrozat@suse.com
+
+- Update use-usr-sbin-sulogin-for-emergency-service.patch to apply
+  to all services using sulogin and remove generated files from
+  upstream tarball (bnc#841398).
+
 -------------------------------------------------------------------
 Mon Sep 23 13:09:06 UTC 2013 - arvidjaar@gmail.com
 
diff --git a/systemd.spec b/systemd.spec
index cddb2f25..80890da5 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -456,6 +456,9 @@ cp %{SOURCE7} m4/
 %endif
 %patch1009 -p1
 
+# ensure generate files are removed
+rm -f units/emergency.service
+
 %build
 autoreconf -fiv
 # prevent pre-generated and distributed files from re-building
diff --git a/use-usr-sbin-sulogin-for-emergency-service.patch b/use-usr-sbin-sulogin-for-emergency-service.patch
index 9dfa4970..e29f4b28 100644
--- a/use-usr-sbin-sulogin-for-emergency-service.patch
+++ b/use-usr-sbin-sulogin-for-emergency-service.patch
@@ -3,8 +3,10 @@ Subject: use /usr/sbin/sulogin in emergency service
 
 In current Factory sulogin is in /usr/sbin which makes it impossible
 to enter emergency service.
---- systemd-206.orig/units/emergency.service.in
-+++ systemd-206/units/emergency.service.in
+Index: systemd-207/units/emergency.service.in
+===================================================================
+--- systemd-207.orig/units/emergency.service.in
++++ systemd-207/units/emergency.service.in
 @@ -17,7 +17,7 @@ Environment=HOME=/root
  WorkingDirectory=/root
  ExecStartPre=-/bin/plymouth quit
@@ -14,3 +16,29 @@ to enter emergency service.
  ExecStopPost=@SYSTEMCTL@ --fail --no-block default
  Type=idle
  StandardInput=tty-force
+Index: systemd-207/units/console-shell.service.m4.in
+===================================================================
+--- systemd-207.orig/units/console-shell.service.m4.in
++++ systemd-207/units/console-shell.service.m4.in
+@@ -17,7 +17,7 @@ Before=getty.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
+-ExecStart=-/sbin/sulogin
++ExecStart=-/usr/sbin/sulogin
+ ExecStopPost=-@SYSTEMCTL@ poweroff
+ Type=idle
+ StandardInput=tty-force
+Index: systemd-207/units/rescue.service.m4.in
+===================================================================
+--- systemd-207.orig/units/rescue.service.m4.in
++++ systemd-207/units/rescue.service.m4.in
+@@ -18,7 +18,7 @@ Environment=HOME=/root
+ WorkingDirectory=/root
+ ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
+-ExecStart=-/sbin/sulogin
++ExecStart=-/usr/sbin/sulogin
+ ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
+ Type=idle
+ StandardInput=tty-force