diff --git a/xrdp-systemd-services.patch b/xrdp-systemd-services.patch
new file mode 100644
index 0000000..f7a5a38
--- /dev/null
+++ b/xrdp-systemd-services.patch
@@ -0,0 +1,36 @@
+Index: b/instfiles/xrdp-sesman.service.in
+===================================================================
+--- a/instfiles/xrdp-sesman.service.in	2019-04-18 13:38:26.000000000 +0800
++++ b/instfiles/xrdp-sesman.service.in	2019-09-10 18:16:37.077484890 +0800
+@@ -6,12 +6,9 @@ StopWhenUnneeded=true
+ BindsTo=xrdp.service
+ 
+ [Service]
+-Type=forking
+-PIDFile=@localstatedir@/run/xrdp-sesman.pid
+ EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
+ EnvironmentFile=-@sysconfdir@/default/xrdp
+-ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS
+-ExecStop=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --kill
++ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --nodaemon
+ 
+ [Install]
+ WantedBy=multi-user.target
+Index: b/instfiles/xrdp.service.in
+===================================================================
+--- a/instfiles/xrdp.service.in	2019-04-18 13:38:26.000000000 +0800
++++ b/instfiles/xrdp.service.in	2019-09-10 18:16:24.737376128 +0800
+@@ -5,12 +5,9 @@ Requires=xrdp-sesman.service
+ After=network.target xrdp-sesman.service
+ 
+ [Service]
+-Type=forking
+-PIDFile=@localstatedir@/run/xrdp.pid
+ EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
+ EnvironmentFile=-@sysconfdir@/default/xrdp
+-ExecStart=@sbindir@/xrdp $XRDP_OPTIONS
+-ExecStop=@sbindir@/xrdp $XRDP_OPTIONS --kill
++ExecStart=@sbindir@/xrdp $XRDP_OPTIONS --nodaemon
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/xrdp.changes b/xrdp.changes
index 7554542..7706426 100644
--- a/xrdp.changes
+++ b/xrdp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 10 10:19:14 UTC 2019 - Felix Zhang <fezhang@suse.com>
+
+- Add xrdp-systemd-services.patch: Let systemd handle the daemons,
+  fix daemon start failures (boo#1138954, boo#1144327).
+
 -------------------------------------------------------------------
 Mon Aug  5 03:42:13 UTC 2019 - Felix Zhang <fezhang@suse.com>
 
diff --git a/xrdp.spec b/xrdp.spec
index fecd7da..85fa934 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -42,6 +42,8 @@ Patch3:         xrdp-default-config.patch
 Patch4:         xrdp-disable-8-bpp-vnc-support.patch
 # PATCH-FIX-OPENSUSE xrdp-support-KillDisconnected-for-Xvnc.patch boo#1101506 - fezhang@suse.com -- Support the KillDisconnected option for TigerVNC Xvnc sessions
 Patch5:         xrdp-support-KillDisconnected-for-Xvnc.patch
+# PATCH-FIX-OPENSUSE xrdp-systemd-services.patch boo#1138954 boo#1144327 - fezhang@suse.com -- Let systemd handle the daemons
+Patch6:         xrdp-systemd-services.patch
 # PATCH-FEATURE-SLE xrdp-avahi.diff bnc#586785 - hfiguiere@novell.com -- Add Avahi support
 Patch11:        xrdp-avahi.diff
 # PATCH-FIX-SLE xrdp-filter-tab-from-mstsc-on-focus-change.patch bnc#601996 bnc#623534 - dliang@novell.com -- filter the fake tab key which is used to notify the session
@@ -102,6 +104,7 @@ This package contains libraries for the JPEG2000 codec for RDP.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %if ! 0%{?is_opensuse}
 %patch11 -p1
 %patch12 -p1