diff --git a/meson.build b/meson.build
index c789e82..847a1ed 100644
--- a/meson.build
+++ b/meson.build
@@ -8,6 +8,7 @@ project('duckticker', 'cpp',
 compiler_opts = ['-DWRENPP_WITH_NAME_GUESSING']
 
 full_data_dir = get_option('prefix') / get_option('datadir')
+full_script_dir = full_data_dir / get_option('script_path') / ''
 
 global_config = configuration_data()
 global_config.set_quoted('PROJECT_NAME', meson.project_name())
@@ -15,10 +16,10 @@ version_arr = meson.project_version().split('.')
 global_config.set('PROJECT_VERSION_MAJOR', version_arr[0])
 global_config.set('PROJECT_VERSION_MINOR', version_arr[1])
 global_config.set('PROJECT_VERSION_PATCH', version_arr[2])
-global_config.set_quoted('SCRIPT_PATH', full_data_dir / get_option('script_path') / '')
+global_config.set_quoted('SCRIPT_PATH', full_script_dir)
 
 subdir('src')
 
-if meson.project_source_root() != full_data_dir
-  install_data(sources: 'script/main.wren', install_dir: full_data_dir)
+if not get_option('script_path').startswith(meson.project_source_root())
+  install_data(sources: 'script/main.wren', install_dir: get_option('script_path'))
 endif
diff --git a/subprojects/wrenpp b/subprojects/wrenpp
index 036dd57..d3ad818 160000
--- a/subprojects/wrenpp
+++ b/subprojects/wrenpp
@@ -1 +1 @@
-Subproject commit 036dd57524083f9d196f06a553aaeaaf1a17492d
+Subproject commit d3ad818b8e7654fc2f3ff5d58880842db54af1ea