diff --git a/instfiles/xrdp-sesman.service.in b/instfiles/xrdp-sesman.service.in
index fcd74094..e3fd9994 100644
--- a/instfiles/xrdp-sesman.service.in
+++ b/instfiles/xrdp-sesman.service.in
@@ -6,13 +6,11 @@ StopWhenUnneeded=true
 BindsTo=xrdp.service
 
 [Service]
-Type=forking
-PIDFile=@localstatedir@/run/xrdp-sesman.pid
+Type=exec
 EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
 EnvironmentFile=-@sysconfdir@/default/xrdp
-ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS
-ExecStop=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --kill
-ExecReload=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --reload
+ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --nodaemon
+ExecReload=kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/instfiles/xrdp.service.in b/instfiles/xrdp.service.in
index 576c1c25..db52e31a 100644
--- a/instfiles/xrdp.service.in
+++ b/instfiles/xrdp.service.in
@@ -5,12 +5,10 @@ Requires=xrdp-sesman.service
 After=network.target xrdp-sesman.service
 
 [Service]
-Type=forking
-PIDFile=@localstatedir@/run/xrdp.pid
+Type=exec
 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