diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 905d05ab..7517c0fc 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
   -DXRDP_SYSCONF_PATH=\"${sysconfdir}\" \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
   -DXRDP_SBIN_PATH=\"${sbindir}\" \
-  -DXRDP_BIN_PATH=\"${bindir}\" \
+  -DXRDP_LIBEXEC_PATH=\"${libexecdir}/xrdp\" \
   -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
   -DXRDP_PID_PATH=\"${localstatedir}/run\" \
   -DXRDP_SOCKET_PATH=\"${socketdir}\" \
diff --git a/sesman/xwait.c b/sesman/xwait.c
index 3e992079..5cc2775f 100644
--- a/sesman/xwait.c
+++ b/sesman/xwait.c
@@ -21,11 +21,11 @@ wait_for_xserver(int display)
 
     LOG(LOG_LEVEL_DEBUG, "Waiting for X server to start on display %d", display);
 
-    g_snprintf(exe_cmd, sizeof(exe_cmd), "%s/xrdp-waitforx", XRDP_BIN_PATH);
+    g_snprintf(exe_cmd, sizeof(exe_cmd), "%s/waitforx", XRDP_LIBEXEC_PATH);
     dp = popen(exe_cmd, "r");
     if (dp == NULL)
     {
-        LOG(LOG_LEVEL_ERROR, "Unable to launch xrdp-waitforx");
+        LOG(LOG_LEVEL_ERROR, "Unable to launch waitforx");
         return 1;
     }
 
@@ -38,7 +38,7 @@ wait_for_xserver(int display)
     ret = pclose(dp);
     if (ret != 0)
     {
-        LOG(LOG_LEVEL_ERROR, "An error occurred while running xrdp-waitforx");
+        LOG(LOG_LEVEL_ERROR, "An error occurred while running waitforx");
         return 0;
     }
 
diff --git a/waitforx/Makefile.am b/waitforx/Makefile.am
index 22e75c4c..fa3f9660 100644
--- a/waitforx/Makefile.am
+++ b/waitforx/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = \
-  xrdp-waitforx
+pkglibexec_PROGRAMS = \
+  waitforx
 
 AM_LDFLAGS = -lX11 -lXrandr
 
@@ -7,7 +7,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/common
 
 AM_CFLAGS = $(X_CFLAGS)
 
-xrdp_waitforx_SOURCES = waitforx.c
+waitforx_SOURCES = waitforx.c
 
-xrdp_waitforx_LDADD = \
+waitforx_LDADD = \
   $(top_builddir)/common/libcommon.la