diff -up src/xrdp-git/instfiles/xrdp.service.in.orig src/xrdp-git/instfiles/xrdp.service.in
--- src/xrdp-git/instfiles/xrdp.service.in.orig 2021-05-12 17:14:14.530000000 -0600
+++ src/xrdp-git/instfiles/xrdp.service.in  2021-05-12 17:14:15.300000000 -0600
@@ -7,10 +7,8 @@ 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
+ExecStop=@sbindir@/xrdp --kill

 [Install]
 WantedBy=multi-user.target
diff -up src/xrdp-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-git/instfiles/xrdp-sesman.service.in
--- src/xrdp-git/instfiles/xrdp-sesman.service.in.orig  2021-05-12 17:14:14.530000000 -0600
+++ src/xrdp-git/instfiles/xrdp-sesman.service.in   2021-05-12 17:14:15.310000000 -0600
@@ -8,11 +8,8 @@ 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
-ExecReload=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --reload
+ExecStart=@sbindir@/xrdp-sesman
+ExecStop=@sbindir@/xrdp-sesman --kill

 [Install]
 WantedBy=multi-user.target
diff -up src/xrdp-git/sesman/sesman.ini.in.orig src/xrdp-git/sesman/sesman.ini.in
--- src/xrdp-git/sesman/sesman.ini.in.orig  2021-05-12 17:14:14.880000000 -0600
+++ src/xrdp-git/sesman/sesman.ini.in   2021-05-12 17:15:56.580000000 -0600
@@ -94,8 +94,8 @@ EnableSyslog=true
 ; CentOS 7              :  param=/usr/bin/Xorg or param=Xorg
 ; CentOS 8              :  param=/usr/libexec/Xorg
 ; FreeBSD (from 2022Q4) :  param=/usr/local/libexec/Xorg
 ;
-param=Xorg
+param=/usr/lib/Xorg
 ; Leave the rest parameters as-is unless you understand what will happen.
 param=-config
 param=xrdp/xorg.conf
diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
--- src/xrdp-git/sesman/startwm.sh.orig 2021-05-12 17:14:14.890000000 -0600
+++ src/xrdp-git/sesman/startwm.sh  2021-05-12 17:14:15.310000000 -0600
@@ -63,6 +63,21 @@ wm_start()
     export LANG LANGUAGE
   fi

+  # arch user
+  if [ -r ~/.xinitrc ]; then
+    pre_start
+    . ~/.xinitrc
+    post_start
+    exit 0
+  fi
+  # arch
+  if [ -r /etc/X11/xinit/xinitrc ]; then
+    pre_start
+    . /etc/X11/xinit/xinitrc
+    post_start
+    exit 0
+  fi
+
   # debian
   if [ -r /etc/X11/Xsession ]; then
     pre_start