diff --git a/meson.build b/meson.build
index a6be7a3e1..7fbbbd767 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('elinks', ['c','cpp'], version:'0.18.GIT', license:'GPLv2', default_options:['cpp_std=gnu++17'], meson_version:'>=1.0.1')
 srcs=[]
 
-srcdir = meson.source_root()
+srcdir = meson.project_source_root()
 
 git = find_program('git', required: false)
 
diff --git a/po/meson.build b/po/meson.build
index d2d038aa2..a7a099334 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -3,7 +3,7 @@ if conf_data.get('CONFIG_NLS')
     # define GETTEXT_PACKAGE
     add_project_arguments('-DGETTEXT_PACKAGE="elinks"', language:'c')
     i18n.gettext('elinks',
-        args: '--directory=' + meson.source_root()
+        args: '--directory=' + meson.project_source_root()
     )
 endif
 
diff --git a/src/cookies/meson.build b/src/cookies/meson.build
index 4117cd5db..496c5b872 100644
--- a/src/cookies/meson.build
+++ b/src/cookies/meson.build
@@ -2,7 +2,7 @@ srcs += files('cookies.c', 'dialogs.c', 'path.c', 'parser.c')
 
 if get_option('test')
     exe = executable('cookies-t', 'cookies-t.c', 'path.c', include_directories:['..'], build_by_default:false)
-    test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
+    test_lib = environment({'TEST_LIB': meson.project_source_root() / 'test/libtest.sh'})
     t = find_program('test-cookies-t')
     test('cookies', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir())
 
diff --git a/src/dom/test/meson.build b/src/dom/test/meson.build
index b5099909a..d2d68d8e4 100644
--- a/src/dom/test/meson.build
+++ b/src/dom/test/meson.build
@@ -1,35 +1,35 @@
 exe1 = executable('html-mangle', 'html-mangle.c',
-meson.source_root() / 'src/dom/configuration.c',
-meson.source_root() / 'src/dom/node.c',
-meson.source_root() / 'src/dom/select.c',
-meson.source_root() / 'src/dom/stack.c',
-meson.source_root() / 'src/dom/scanner.c',
-meson.source_root() / 'src/dom/css/scanner.c',
+meson.project_source_root() / 'src/dom/configuration.c',
+meson.project_source_root() / 'src/dom/node.c',
+meson.project_source_root() / 'src/dom/select.c',
+meson.project_source_root() / 'src/dom/stack.c',
+meson.project_source_root() / 'src/dom/scanner.c',
+meson.project_source_root() / 'src/dom/css/scanner.c',
 testdeps,
 c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '../..', '../../..'],
 build_by_default:false)
 
 exe2 = executable('sgml-parser', 'sgml-parser.c',
-meson.source_root() / 'src/dom/configuration.c',
-meson.source_root() / 'src/dom/node.c',
-meson.source_root() / 'src/dom/select.c',
-meson.source_root() / 'src/dom/stack.c',
-meson.source_root() / 'src/dom/scanner.c',
-meson.source_root() / 'src/dom/css/scanner.c',
-meson.source_root() / 'src/dom/sgml/dump.c',
-meson.source_root() / 'src/dom/sgml/parser.c',
-meson.source_root() / 'src/dom/sgml/scanner.c',
-meson.source_root() / 'src/dom/sgml/sgml.c',
+meson.project_source_root() / 'src/dom/configuration.c',
+meson.project_source_root() / 'src/dom/node.c',
+meson.project_source_root() / 'src/dom/select.c',
+meson.project_source_root() / 'src/dom/stack.c',
+meson.project_source_root() / 'src/dom/scanner.c',
+meson.project_source_root() / 'src/dom/css/scanner.c',
+meson.project_source_root() / 'src/dom/sgml/dump.c',
+meson.project_source_root() / 'src/dom/sgml/parser.c',
+meson.project_source_root() / 'src/dom/sgml/scanner.c',
+meson.project_source_root() / 'src/dom/sgml/sgml.c',
 
-meson.source_root() / 'src/dom/sgml/docbook/docbook.c',
-meson.source_root() / 'src/dom/sgml/html/html.c',
-meson.source_root() / 'src/dom/sgml/rss/rss.c',
-meson.source_root() / 'src/dom/sgml/xbel/xbel.c',
+meson.project_source_root() / 'src/dom/sgml/docbook/docbook.c',
+meson.project_source_root() / 'src/dom/sgml/html/html.c',
+meson.project_source_root() / 'src/dom/sgml/rss/rss.c',
+meson.project_source_root() / 'src/dom/sgml/xbel/xbel.c',
 testdeps,
 c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '../..', '../../..'],
 build_by_default:false)
 
-test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
+test_lib = environment({'TEST_LIB': meson.project_source_root() / 'test/libtest.sh'})
 
 t1 = find_program('test-dom-configuration-basic')
 t2 = find_program('test-sgml-dump-basic')
diff --git a/src/mime/backend/meson.build b/src/mime/backend/meson.build
index 625d8863e..9c879fd2d 100644
--- a/src/mime/backend/meson.build
+++ b/src/mime/backend/meson.build
@@ -11,40 +11,40 @@ endif
 srcs += files('common.c', 'default.c')
 
 if conf_data.get('CONFIG_MAILCAP') and (get_option('test-mailcap') or get_option('test'))
-	mailcap_cache_files = files('common.c', 'mailcap.c', meson.source_root() / 'src/osdep/osdep.c')
+	mailcap_cache_files = files('common.c', 'mailcap.c', meson.project_source_root() / 'src/osdep/osdep.c')
 
 	if conf_data.get('CONFIG_NLS') and not conf_data.get('CONFIG_GETTEXT')
 		mailcap_cache_files += files(
-		meson.source_root() / 'src/intl/gettext/bindtextdom.c',
-		meson.source_root() / 'src/intl/gettext/dcgettext.c',
-		meson.source_root() / 'src/intl/gettext/dcigettext.c',
-		meson.source_root() / 'src/intl/gettext/dcngettext.c',
-		meson.source_root() / 'src/intl/gettext/dgettext.c',
-		meson.source_root() / 'src/intl/gettext/dngettext.c',
-		meson.source_root() / 'src/intl/gettext/explodename.c',
-		meson.source_root() / 'src/intl/gettext/finddomain.c',
-		meson.source_root() / 'src/intl/gettext/gettext.c',
-		meson.source_root() / 'src/intl/gettext/intl-compat.c',
-		meson.source_root() / 'src/intl/gettext/l10nflist.c',
-		meson.source_root() / 'src/intl/gettext/libintl.c',
-		meson.source_root() / 'src/intl/gettext/loadmsgcat.c',
-		meson.source_root() / 'src/intl/gettext/localcharset.c',
-		meson.source_root() / 'src/intl/gettext/localealias.c',
-		meson.source_root() / 'src/intl/gettext/ngettext.c',
-		meson.source_root() / 'src/intl/gettext/plural.c',
-		meson.source_root() / 'src/intl/gettext/textdomain.c')
+		meson.project_source_root() / 'src/intl/gettext/bindtextdom.c',
+		meson.project_source_root() / 'src/intl/gettext/dcgettext.c',
+		meson.project_source_root() / 'src/intl/gettext/dcigettext.c',
+		meson.project_source_root() / 'src/intl/gettext/dcngettext.c',
+		meson.project_source_root() / 'src/intl/gettext/dgettext.c',
+		meson.project_source_root() / 'src/intl/gettext/dngettext.c',
+		meson.project_source_root() / 'src/intl/gettext/explodename.c',
+		meson.project_source_root() / 'src/intl/gettext/finddomain.c',
+		meson.project_source_root() / 'src/intl/gettext/gettext.c',
+		meson.project_source_root() / 'src/intl/gettext/intl-compat.c',
+		meson.project_source_root() / 'src/intl/gettext/l10nflist.c',
+		meson.project_source_root() / 'src/intl/gettext/libintl.c',
+		meson.project_source_root() / 'src/intl/gettext/loadmsgcat.c',
+		meson.project_source_root() / 'src/intl/gettext/localcharset.c',
+		meson.project_source_root() / 'src/intl/gettext/localealias.c',
+		meson.project_source_root() / 'src/intl/gettext/ngettext.c',
+		meson.project_source_root() / 'src/intl/gettext/plural.c',
+		meson.project_source_root() / 'src/intl/gettext/textdomain.c')
 	endif
 
 	if conf_data.get('CONFIG_NLS') and conf_data.get('CONFIG_GETTEXT')
 		mailcap_cache_files += files(
-		meson.source_root() / 'src/intl/libintl.c',
-		meson.source_root() / 'src/util/env.c')
+		meson.project_source_root() / 'src/intl/libintl.c',
+		meson.project_source_root() / 'src/util/env.c')
 	endif
 
 	exe = executable('mailcap-cache', mailcap_cache_files, testdeps,
 	c_args:['-DHAVE_CONFIG_H', '-DTEST_MAILCAP'], include_directories:['.','..','../..','../../..'],
 	build_by_default:false, dependencies:[x11deps])
-	test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
+	test_lib = environment({'TEST_LIB': meson.project_source_root() / 'test/libtest.sh'})
 	t = find_program('test-mailcap-cache')
 	test('mailcap-cache', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir())
 endif
diff --git a/src/network/ssl/test/meson.build b/src/network/ssl/test/meson.build
index f71ab5b23..8d58e2093 100644
--- a/src/network/ssl/test/meson.build
+++ b/src/network/ssl/test/meson.build
@@ -1,3 +1,3 @@
-t = executable('match-hostname-test', 'match-hostname-test.c',  meson.source_root() / 'src/network/ssl/match-hostname.c', testdeps, dependencies:[iconvdeps],
+t = executable('match-hostname-test', 'match-hostname-test.c',  meson.project_source_root() / 'src/network/ssl/match-hostname.c', testdeps, dependencies:[iconvdeps],
 c_args:['-DHAVE_CONFIG_H'], include_directories:['.', '..', '../..', '../../..', '../../../..'])
 test('match-hostname-test', t)
diff --git a/src/protocol/ftp/meson.build b/src/protocol/ftp/meson.build
index 90af90e92..1b6526cd9 100644
--- a/src/protocol/ftp/meson.build
+++ b/src/protocol/ftp/meson.build
@@ -1,11 +1,11 @@
 srcs += files('ftp.c')
 
 if get_option('test')
-    exe = executable('ftp-parser', 'ftp-parser.c', meson.source_root() / 'src/protocol/date.c', meson.source_root() / 'src/protocol/ftpparse.c', testdeps, dependencies:[iconvdeps],
+    exe = executable('ftp-parser', 'ftp-parser.c', meson.project_source_root() / 'src/protocol/date.c', meson.project_source_root() / 'src/protocol/ftpparse.c', testdeps, dependencies:[iconvdeps],
     c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.','../..','../../..'],
     build_by_default:false)
 
-    test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
+    test_lib = environment({'TEST_LIB': meson.project_source_root() / 'test/libtest.sh'})
     t = find_program('test-ftp-parser')
     test('ftp-parser', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir(), is_parallel:false)
 endif
diff --git a/src/protocol/test/meson.build b/src/protocol/test/meson.build
index 0df9e2685..a6d96f699 100644
--- a/src/protocol/test/meson.build
+++ b/src/protocol/test/meson.build
@@ -6,7 +6,7 @@ exe = executable('uri-test', uri_test_files,
 testdeps, dependencies: [iconvdeps, idna_dep, libdomdeps, mozjsdeps, wattdeps],
 c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'],  include_directories:['.', '..', '../..', '../../..', '../../../..'])
 t = find_program('test-normalize-uri')
-test_lib = environment({'TEST_LIB':meson.source_root() / 'test/libtest.sh'})
+test_lib = environment({'TEST_LIB':meson.project_source_root() / 'test/libtest.sh'})
 test('normalize-uri', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir())
 
 t2 = find_program('test-get-translated-uri')
diff --git a/test/js/assert/meson.build b/test/js/assert/meson.build
index 816295cf4..02a330493 100644
--- a/test/js/assert/meson.build
+++ b/test/js/assert/meson.build
@@ -92,7 +92,7 @@ took = [
 
 if conf_data.get('CONFIG_ECMASCRIPT')
     foreach t: tofail
-        test(t, elinks, protocol: 'exitcode', is_parallel: true, timeout: 30, should_fail: true, verbose: false, workdir: meson.source_root() / 'test/js/assert/',
+        test(t, elinks, protocol: 'exitcode', is_parallel: true, timeout: 30, should_fail: true, verbose: false, workdir: meson.project_source_root() / 'test/js/assert/',
             args: ['--test', '1', '--eval', 'set ecmascript.enable = 1',
             '--eval', 'set ecmascript.allow_xhr_file = 1',
             '--eval', 'set ecmascript.enable_console_log = 1',
@@ -101,7 +101,7 @@ if conf_data.get('CONFIG_ECMASCRIPT')
         t])
     endforeach
     foreach t : took
-        test(t, elinks, protocol: 'exitcode', is_parallel: true, timeout: 30, should_fail: false, verbose: false, workdir: meson.source_root() / 'test/js/assert',
+        test(t, elinks, protocol: 'exitcode', is_parallel: true, timeout: 30, should_fail: false, verbose: false, workdir: meson.project_source_root() / 'test/js/assert',
             args: ['--test', '1', '--eval', 'set ecmascript.enable = 1',
             '--eval', 'set ecmascript.allow_xhr_file = 1',
             '--eval', 'set ecmascript.enable_console_log = 1',