diff --git a/pw-uninstalled.sh b/pw-uninstalled.sh
index 344d83bcc..e9b01f809 100755
--- a/pw-uninstalled.sh
+++ b/pw-uninstalled.sh
@@ -36,6 +36,7 @@ fi
 
 # the config file read by the daemon
 export PIPEWIRE_CONFIG_DIR="${BUILDDIR}/src/daemon"
+export MEDIA_SESSION_CONFIG_DIR="${BUILDDIR}/src/media-session/media-session.d"
 # the directory with SPA plugins
 export SPA_PLUGIN_DIR="${BUILDDIR}/spa/plugins"
 export SPA_DATA_DIR="${SCRIPT_DIR}/spa/plugins"
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index fcab47d0f..8ccb956c9 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -117,9 +117,6 @@ custom_target('pipewire-uninstalled',
 #endif
 
 subdir('filter-chain')
-if build_ms
-  subdir('media-session.d')
-endif
 if systemd.found()
   subdir('systemd')
 endif
diff --git a/src/daemon/media-session.d/alsa-monitor.conf b/src/media-session/media-session.d/alsa-monitor.conf
similarity index 100%
rename from src/daemon/media-session.d/alsa-monitor.conf
rename to src/media-session/media-session.d/alsa-monitor.conf
diff --git a/src/daemon/media-session.d/bluez-monitor.conf b/src/media-session/media-session.d/bluez-monitor.conf
similarity index 100%
rename from src/daemon/media-session.d/bluez-monitor.conf
rename to src/media-session/media-session.d/bluez-monitor.conf
diff --git a/src/daemon/media-session.d/media-session.conf b/src/media-session/media-session.d/media-session.conf
similarity index 100%
rename from src/daemon/media-session.d/media-session.conf
rename to src/media-session/media-session.d/media-session.conf
diff --git a/src/daemon/media-session.d/meson.build b/src/media-session/media-session.d/meson.build
similarity index 100%
rename from src/daemon/media-session.d/meson.build
rename to src/media-session/media-session.d/meson.build
diff --git a/src/daemon/media-session.d/v4l2-monitor.conf b/src/media-session/media-session.d/v4l2-monitor.conf
similarity index 100%
rename from src/daemon/media-session.d/v4l2-monitor.conf
rename to src/media-session/media-session.d/v4l2-monitor.conf
diff --git a/src/daemon/media-session.d/with-jack b/src/media-session/media-session.d/with-jack
similarity index 100%
rename from src/daemon/media-session.d/with-jack
rename to src/media-session/media-session.d/with-jack
diff --git a/src/daemon/media-session.d/with-pulseaudio b/src/media-session/media-session.d/with-pulseaudio
similarity index 100%
rename from src/daemon/media-session.d/with-pulseaudio
rename to src/media-session/media-session.d/with-pulseaudio
diff --git a/src/media-session/meson.build b/src/media-session/meson.build
index 49c5943d1..f5a1ac655 100644
--- a/src/media-session/meson.build
+++ b/src/media-session/meson.build
@@ -37,5 +37,6 @@ if get_option('session-managers').contains('media-session')
     media_session_sources,
     install: true,
     dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib, sm_logind_dep, libinotify_dep],
-)
+  )
+  subdir('media-session.d')
 endif