diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index a07fabbe70..37db7fb5d3 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1432,7 +1432,8 @@ endif
 
 if EVAS_CSERVE2
 
-libexec_PROGRAMS = \
+evascserve2internal_bindir=$(libdir)/evas/cserve2/bin
+evascserve2internal_bin_PROGRAMS = \
 bin/evas/evas_cserve2 \
 bin/evas/evas_cserve2_slave \
 bin/evas/dummy_slave
@@ -1465,7 +1466,7 @@ bin_evas_evas_cserve2_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/lib/eet \
--DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
 @EVAS_CFLAGS@ \
 @EFL_CFLAGS@
 
diff --git a/src/bin/evas/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c
index 5cc6379bf7..63a11c0cfd 100644
--- a/src/bin/evas/evas_cserve2_slaves.c
+++ b/src/bin/evas/evas_cserve2_slaves.c
@@ -337,7 +337,7 @@ _slave_proc_path_get(const char *name)
    if (!access(buf, X_OK))
      return eina_stringshare_add(buf);
 
-   snprintf(buf, sizeof(buf), PACKAGE_LIBEXEC_DIR"/%s", name);
+   snprintf(buf, sizeof(buf), PACKAGE_LIB_DIR"/evas/cserve2/bin/%s", name);
    if (!access(buf, X_OK))
      return eina_stringshare_add(buf);