diff --git a/Makefile.am b/Makefile.am
index 359f7e99..3c2fea50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -548,11 +548,10 @@ spring_tool_SOURCES =				\
 
 if BUILD_CLIENTS
 
-bin_PROGRAMS += weston-terminal weston-info weston-debug
+bin_PROGRAMS += weston-terminal weston-info weston-debug weston-screenshooter
 
 libexec_PROGRAMS +=				\
 	weston-desktop-shell			\
-	weston-screenshooter			\
 	weston-keyboard				\
 	weston-simple-im
 
diff --git a/clients/meson.build b/clients/meson.build
index 42590e1e..70b76371 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -331,7 +331,7 @@ if get_option('shell-desktop')
 		weston_screenshooter_protocol_c,
 		include_directories: include_directories('..'),
 		dependencies: dep_toytoolkit,
-		install_dir: get_option('libexecdir'),
+		install_dir: get_option('bindir'),
 		install: true
 	)
 	env_modmap += 'weston-screenshooter=@0@;'.format(exe_shooter.full_path())
diff --git a/compositor/weston-screenshooter.c b/compositor/weston-screenshooter.c
index c23a6944..13dea3f1 100644
--- a/compositor/weston-screenshooter.c
+++ b/compositor/weston-screenshooter.c
@@ -127,7 +127,7 @@ screenshooter_binding(struct weston_keyboard *keyboard,
 	char *screenshooter_exe;
 
 
-	screenshooter_exe = wet_get_libexec_path("weston-screenshooter");
+	screenshooter_exe = wet_get_bindir_path("weston-screenshooter");
 	if (!screenshooter_exe) {
 		weston_log("Could not construct screenshooter path.\n");
 		return;