diff --git a/meson.build b/meson.build
index 92af7b74..c607d1ec 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
                'c',
            version: '45.alpha',
            license: 'GPL3+',
-     meson_version: '>= 0.57.0'
+     meson_version: '>= 0.58.0'
 )
 
 
@@ -178,9 +178,9 @@ pkg = import('pkgconfig')
 
 top_inc = include_directories('.')
 
-data_dir = meson.source_root() / 'data'
-po_dir = meson.source_root() / 'po'
-src_dir = meson.source_root() / 'src'
+data_dir = meson.global_source_root() / 'data'
+po_dir = meson.global_source_root() / 'po'
+src_dir = meson.global_source_root() / 'src'
 
 
 ###########
@@ -198,7 +198,7 @@ configure_file(
 )
 
 summary({
-  'Source': meson.source_root(),
+  'Source': meson.global_source_root(),
   'Prefix': calendar_prefix,
 })
 summary({
diff --git a/tests/meson.build b/tests/meson.build
index 5ff28465..62d3ba04 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,12 +1,12 @@
 test_env = [
          'G_TEST_SRCDIR=' + meson.current_source_dir(),
        'G_TEST_BUILDDIR=' + meson.current_build_dir(),
-  'GSETTINGS_SCHEMA_DIR=' + meson.build_root() / 'data',
+  'GSETTINGS_SCHEMA_DIR=' + meson.current_build_dir() / 'data',
      'GSETTINGS_BACKEND=memory',
          'MALLOC_CHECK_=2'
 ]
 
-test_cflags = '-DTEST_DATA_DIR="@0@"'.format(meson.source_root() / 'data')
+test_cflags = '-DTEST_DATA_DIR="@0@"'.format(meson.global_source_root() / 'data')
 
 ################
 # libgcal-test #
@@ -52,3 +52,4 @@ foreach test : tests
 
   test(test, test_executable, env: test_env)
 endforeach
+