diff --git a/media-session.d/meson.build b/media-session.d/meson.build
index 3a6e9502a..5760ec029 100644
--- a/media-session.d/meson.build
+++ b/media-session.d/meson.build
@@ -7,10 +7,12 @@ conf_files = [
   [ 'v4l2-monitor.conf', 'v4l2-monitor.conf' ],
   [ 'media-session.conf', 'media-session.conf' ],
   [ 'alsa-monitor.conf', 'alsa-monitor.conf' ],
-  [ 'with-jack', 'with-jack' ],
-  [ 'with-pulseaudio', 'with-pulseaudio' ],
 ]
 
+foreach opt : get_option('with-module-sets')
+  conf_files += [ [ 'with-module-set.in', 'with-@0@'.format(opt) ] ]
+endforeach
+
 foreach c : conf_files
   configure_file(input : c.get(0),
                  output : c.get(1),
diff --git a/media-session.d/with-jack b/media-session.d/with-jack
deleted file mode 100644
index e69de29bb..000000000
diff --git a/media-session.d/with-module-set.in b/media-session.d/with-module-set.in
new file mode 100644
index 000000000..e7a827559
--- /dev/null
+++ b/media-session.d/with-module-set.in
@@ -0,0 +1,5 @@
+# This file is part of Media Session @VERSION@
+#
+# Add this file to @MEDIA_SESSION_CONFIG_DIR@/media-session.d/
+# to load the corresponding module list in the in the media-session.conf
+# session.modules[<filename>] array.
diff --git a/media-session.d/with-pulseaudio b/media-session.d/with-pulseaudio
deleted file mode 100644
index e69de29bb..000000000
diff --git a/meson_options.txt b/meson_options.txt
index 9b13a8295..d25b03aea 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -29,3 +29,8 @@ option('systemd-user-service',
 option('systemd-user-unit-dir',
        type : 'string',
        description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')
+option('with-module-sets',
+	description : 'Extra modules sets to enable on install (see media-session.conf)',
+	type : 'array',
+	choices : ['alsa', 'jack', 'pulseaudio'],
+	value : ['jack', 'pulseaudio'])