diff --git a/data/meson.build b/data/meson.build
index ad876dcf..6e6e4d27 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,7 @@
 i18n.merge_file(
     input: 'applications-menu.metainfo.xml.in',
     output: 'io.elementary.wingpanel.applications-menu.metainfo.xml',
-    po_dir: meson.source_root() / 'po' / 'extra',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
     install_dir: datadir / 'metainfo',
diff --git a/meson.build b/meson.build
index dbebf181..89740699 100644
--- a/meson.build
+++ b/meson.build
@@ -20,15 +20,15 @@ asresources = gnome.compile_resources(
 )
 
 prefix = get_option('prefix')
-datadir = join_paths(prefix, get_option('datadir'))
-libdir = join_paths(prefix, get_option('libdir'))
+datadir = prefix / get_option('datadir')
+libdir = prefix / get_option('libdir')
 
 add_project_arguments(
-    '-DPKGDATADIR="@0@"'.format(join_paths(get_option('prefix'), get_option('libdir'), 'wingpanel')),
+    '-DPKGDATADIR="@0@"'.format(libdir / 'wingpanel'),
     language: 'c'
 )
 
-pluginsdir = join_paths(prefix, get_option('libdir'), 'io.elementary.wingpanel.applications-menu')
+pluginsdir = libdir / 'io.elementary.wingpanel.applications-menu'
 add_project_arguments(
     '-DPLUGINSDIR="@0@"'.format(pluginsdir),
     language: 'c'
@@ -61,7 +61,7 @@ if get_option('with-zeitgeist')
 endif
 
 config_data = configuration_data()
-config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+config_data.set_quoted('LOCALEDIR', prefix / get_option('localedir'))
 config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 config_file = configure_file(
     input: 'src/Config.vala.in',
diff --git a/meson_options.txt b/meson_options.txt
index 9e825c1e..52fa1caa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1 +1 @@
-option('with-zeitgeist', type : 'boolean', value : 'true', description : 'Add Zeitgeist support')
+option('with-zeitgeist', type : 'boolean', value : true, description : 'Add Zeitgeist support')
diff --git a/po/extra/meson.build b/po/extra/meson.build
index e5572927..024dc312 100644
--- a/po/extra/meson.build
+++ b/po/extra/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext('extra',
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib',
     install: false,
 )
diff --git a/po/meson.build b/po/meson.build
index c8845b09..d148a696 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext(meson.project_name(),
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib'
 )
 
diff --git a/src/meson.build b/src/meson.build
index 17d653fd..a11f6709 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -89,7 +89,7 @@ dependencies = [
     posix_dep,
 ]
 
-wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
+wingpanel_indicatorsdir = wingpanel_dep.get_variable('indicatorsdir', pkgconfig_define: ['libdir', libdir])
 
 c_args = [
     '-DHANDY_USE_UNSTABLE_API',
diff --git a/src/test/meson.build b/src/test/meson.build
index c97842d9..adb05983 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -1,22 +1,22 @@
 calculator_plugin_test = executable(
     meson.project_name() + 'calculator-test',
     'CalculatorPluginTest.vala',
-    meson.source_root() + '/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala',
+    meson.project_source_root() + '/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala',
     dependencies: [
         glib_dep,
         gio_dep,
-        gio_unix_dep,     
+        gio_unix_dep,
     ]
 )
 converter_plugin_test = executable(
     meson.project_name() + 'converter-test',
     'ConverterPluginTest.vala',
-    meson.source_root() + '/src/synapse-plugins/converter-plugin/converter-plugin-backend.vala',
-    meson.source_root() + '/src/synapse-plugins/converter-plugin/converter-data.vala',
+    meson.project_source_root() + '/src/synapse-plugins/converter-plugin/converter-plugin-backend.vala',
+    meson.project_source_root() + '/src/synapse-plugins/converter-plugin/converter-data.vala',
     dependencies: [
         glib_dep,
         gio_dep,
-        gio_unix_dep,     
+        gio_unix_dep,
     ]
 )