diff --git a/man/meson.build b/man/meson.build
index b7725ce5f0..23819d03f5 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -218,7 +218,7 @@ configure_file(
 ############################################################
 
 update_dbus_docs = custom_target(
-        'update-dbus-docs',
+        'update-dbus-docs-impl',
         output : 'update-dbus-docs',
         command : [update_dbus_docs_py, '--build-dir', project_build_root, '@INPUT@'],
         input : dbus_docs)
@@ -232,7 +232,7 @@ if conf.get('BUILD_MODE_DEVELOPER') == 1
 endif
 
 update_man_rules = custom_target(
-        'update-man-rules',
+        'update-man-rules-impl',
         output : 'update-man-rules',
         command : [update_man_rules_py,
                    '@0@/man/*.xml'.format(project_source_root),
diff --git a/man/rules/meson.build b/man/rules/meson.build
index 1279004161..2bf5936d64 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -845,16 +845,19 @@ manpages = [
    'sd_session_get_remote_user',
    'sd_session_get_seat',
    'sd_session_get_service',
+   'sd_session_get_start_time',
    'sd_session_get_state',
    'sd_session_get_tty',
    'sd_session_get_type',
    'sd_session_get_uid',
+   'sd_session_get_username',
    'sd_session_get_vt',
    'sd_session_is_remote'],
   'HAVE_PAM'],
  ['sd_uid_get_state',
   '3',
   ['sd_uid_get_display',
+   'sd_uid_get_login_time',
    'sd_uid_get_seats',
    'sd_uid_get_sessions',
    'sd_uid_is_on_seat'],
diff --git a/meson.build b/meson.build
index 2576153536..5e7cb92a83 100644
--- a/meson.build
+++ b/meson.build
@@ -4608,6 +4608,8 @@ foreach tuple : [
         ['debug mmap cache'],
         ['debug siphash'],
         ['trace logging',          conf.get('LOG_TRACE') == 1],
+        ['slow tests',             slow_tests],
+        ['fuzz tests',             fuzz_tests],
         ['install tests',          install_tests],
         ['link-udev-shared',       get_option('link-udev-shared')],
         ['link-systemctl-shared',  get_option('link-systemctl-shared')],
diff --git a/tools/meson-build.sh b/tools/meson-build.sh
index ecd558f8d9..2ef60cfa8e 100755
--- a/tools/meson-build.sh
+++ b/tools/meson-build.sh
@@ -10,7 +10,7 @@ CC="$5"
 CXX="$6"
 
 # shellcheck disable=SC2086
-[ -f "$dst/ninja.build" ] || CC="$CC" CXX="$CXX" meson "$src" "$dst" $options
+[ -f "$dst/build.ninja" ] || CC="$CC" CXX="$CXX" meson setup "$src" "$dst" $options
 
 # Locate ninja binary, on CentOS 7 it is called ninja-build, so
 # use that name if available.
diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
index 7e9312b833..2e64475c6d 100755
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -73,7 +73,7 @@ else
     fi
 fi
 
-if ! meson "$build" "-D$fuzzflag" -Db_lundef=false; then
+if ! meson setup "$build" "-D$fuzzflag" -Db_lundef=false; then
     cat "$build/meson-logs/meson-log.txt"
     exit 1
 fi