diff --git a/data/meson.build b/data/meson.build
index 66ad68d16..45b3faa24 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -66,10 +66,14 @@ portal_impl_sources = files(
   'org.freedesktop.impl.portal.Wallpaper.xml',
 )
 
+portal_app_sources = files(
+  'org.freedesktop.app.portal.ScreenCast.xml',
+)
+
 background_monitor_sources = files(
   'org.freedesktop.background.Monitor.xml',
 )
 
-install_data([portal_sources, portal_impl_sources],
+install_data([portal_sources, portal_impl_sources, portal_app_sources],
     install_dir: datadir / 'dbus-1' / 'interfaces',
 )
diff --git a/data/org.freedesktop.app.portal.ScreenCast.xml b/data/org.freedesktop.app.portal.ScreenCast.xml
new file mode 100644
index 000000000..a6f71d63d
--- /dev/null
+++ b/data/org.freedesktop.app.portal.ScreenCast.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (C) 2024 tytan652
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.app.portal.ScreenCast:
+      @short_description: Screen cast application interface
+
+      The screen cast app portal allows to share `DMA-BUF PipeWire stream <https://docs.pipewire.org/page_dma_buf.html>`_ as
+      :ref:`org.freedesktop.portal.ScreenCast` external sources if the portal
+      implementation supports it.
+
+      This interface is to be implemented under the object path
+      ``/org/freedesktop/app/portal`` in a point to point D-Bus connection for
+      :ref:`org.freedesktop.portal.ScreenCast.ConnectProvisioning`.
+
+      This documentation describes version 1 of this interface.
+  -->
+  <interface name="org.freedesktop.app.portal.ScreenCast">
+
+    <!--
+        Ready:
+
+        Emitted when :ref:`org.freedesktop.portal.ScreenCast.ConnectProvisioning`
+        request succeeded and the interface is ready to be used.
+    -->
+    <signal name="Ready">
+    </signal>
+
+    <!--
+        GetSources:
+        @sources: Available sources
+
+        Retrieves the current list of sources and their properties
+
+        A source is exposed as:
+
+        * ``s``: ID of the source, must be persistent between application instances to enable restoring ScreenCast session
+        * ``a{sv}``: source properties
+
+          Known properties:
+
+          - ``title`` (``s``): title of the source
+    -->
+    <method name="GetSources">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <arg type="a{sa{sv}}" name="sources" direction="out"/>
+    </method>
+
+    <!--
+        SourcesChanged:
+        Notifies when any sources is added or removed
+    -->
+    <signal name="SourcesChanged"/>
+
+    <!--
+        CreateSession:
+        @options: Vardict for future-proofing
+        @session_handle: Object path for the :ref:`org.freedesktop.app.portal.ScreenCast.Session` object
+
+        Create a screen cast app session.
+    -->
+    <method name="CreateSession">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="session_handle" direction="out" />
+    </method>
+
+    <property name="version" type="u" access="read"/>
+  </interface>
+
+  <!--
+      org.freedesktop.app.portal.ScreenCast.Session:
+      @short_description: Screen cast session application interface
+  -->
+  <interface name="org.freedesktop.app.portal.ScreenCast.Session">
+
+    <!--
+        Close:
+
+        Close the session
+    -->
+    <method name="Close">
+    </method>
+
+    <!--
+        Closed:
+        @details: A key value Vardict with details about the closed session.
+
+        Emitted when a session is closed.
+
+        Supported keys in the @details vardict include:
+
+        * ``reason`` (``s``)
+
+          String indication the reason of session being closed.
+    -->
+    <signal name="Closed">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <arg type="a{sv}" name="details"/>
+    </signal>
+
+    <!--
+        StreamSource:
+        @id: Id of the source to stream
+        @options: Vardict for future-proofing
+        @stream_handle: Object path to the new stream object
+        @detail: Vardict for future-proofing
+
+        Add to sources that the session should stream once started.
+
+        TODO: Close session when invalid source is asked ?
+    -->
+    <method name="StreamSource">
+      <arg type="s" name="id" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="stream_handle" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
+      <arg type="a{sv}" name="details" direction="out"/>
+    </method>
+
+    <!--
+        Start:
+
+        Start the screen cast session.
+
+        TODO: Document that the session must get closed if a failure happen while starting
+
+        TODO: Document behavior about closing if no source is set to be streamed
+    -->
+    <method name="Start">
+    </method>
+  </interface>
+
+  <!--
+      org.freedesktop.app.portal.ScreenCast.Stream:
+      @short_description: Screen cast stream application interface
+
+      TODO: Recommend using parent session handle as handle prefix to easily avoid duplicate handle across sessions
+  -->
+  <interface name="org.freedesktop.app.portal.ScreenCast.Stream">
+
+    <!--
+        PipeWireStreamAdded:
+        @details: Vardict of detail about the added stream
+
+        Emitted after :ref:`org.freedesktop.app.portal.ScreenCast.Session.Start`
+        when a stream is added as a PipeWire node.
+
+        Content of @details:
+
+        * ``node_id``: ID of the node (required)
+    -->
+    <signal name="PipeWireStreamAdded">
+      <annotation name="org.gtk.GDBus.C.Name" value="pipewire-stream-added"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <arg type="a{sv}" name="details"/>
+    </signal>
+  </interface>
+</node>
diff --git a/data/org.freedesktop.impl.portal.ScreenCast.xml b/data/org.freedesktop.impl.portal.ScreenCast.xml
index 8a1593c9c..8c4bab3fb 100644
--- a/data/org.freedesktop.impl.portal.ScreenCast.xml
+++ b/data/org.freedesktop.impl.portal.ScreenCast.xml
@@ -25,7 +25,7 @@
 
       The Screen cast portal allows to create screen cast sessions.
 
-      This documentation describes version 5 of this interface.
+      This documentation describes version 6 of this interface.
   -->
   <interface name="org.freedesktop.impl.portal.ScreenCast">
     <!--
@@ -44,6 +44,13 @@
         * ``session_id`` (``s``)
 
           The session id. A string representing the created screen cast session.
+
+        * ``provider`` (``b``)
+
+          Create a session to propose sources in the portal rather than requesting them.
+          Default is no.
+
+          This option was added in version 6 of this interface.
     -->
     <method name="CreateSession">
       <arg type="o" name="handle" direction="in"/>
@@ -234,6 +241,37 @@
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
       <arg type="a{sv}" name="results" direction="out"/>
     </method>
+    <!--
+        ConnectProvisioning:
+        @handle: Object path for the :ref:`org.freedesktop.impl.portal.Request` object representing this call
+        @session_handle: Object path for the :ref:`org.freedesktop.impl.portal.Session` object representing the session
+        @app_id: App id of the application
+        @fd: File descriptor of a point to point D-Bus connection
+        @options: Vardict with optional further information
+        @response: Numeric response
+        @results: Vardict with the results of the call
+
+        Add the caller app as a sources provider by using the
+        :ref:`org.freedesktop.app.portal.ScreenCast <org.freedesktop.app.portal.ScreenCast>`
+        implementation on the point to point D-Bus.
+
+        TODO: Document to reject misversioned app portal impl
+        TODO: Document portal impl behavior
+
+        This method was added in version 6 of this interface.
+    -->
+    <method name="ConnectProvisioning">
+      <arg type="o" name="handle" direction="in"/>
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="s" name="app_id" direction="in"/>
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type="h" name="fd" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="u" name="response" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
+      <arg type="a{sv}" name="results" direction="out"/>
+    </method>
     <!--
         AvailableSourceTypes:
 
@@ -242,6 +280,7 @@
         - ``1``: MONITOR: Share existing monitors
         - ``2``: WINDOW: Share application windows
         - ``4``: VIRTUAL: Extend with new virtual monitor
+        - ``8``: EXTERNAL: Share application provided sources
     -->
     <property name="AvailableSourceTypes" type="u" access="read"/>
     <!--
diff --git a/data/org.freedesktop.portal.ScreenCast.xml b/data/org.freedesktop.portal.ScreenCast.xml
index 8233242d3..69aa1d76a 100644
--- a/data/org.freedesktop.portal.ScreenCast.xml
+++ b/data/org.freedesktop.portal.ScreenCast.xml
@@ -25,7 +25,7 @@
 
       The Screen cast portal allows to create screen cast sessions.
 
-      This documentation describes version 5 of this interface.
+      This documentation describes version 6 of this interface.
   -->
   <interface name="org.freedesktop.portal.ScreenCast">
     <!--
@@ -52,6 +52,16 @@
           object path element. See the :ref:`org.freedesktop.portal.Session` documentation for
           more information about the session handle.
 
+        * ``provider`` (``b``)
+
+          Create a session to use in org.freedesktop.portal.ScreenCast.ConnectProvisioning()
+          to propose sources in the portal rather than requesting them. Default is no.
+
+          Backends can refuse to support provider session by not setting EXTERNAL as an
+          available source type.
+
+          This option was added in version 6 of this interface.
+
         The following results get returned via the :ref:`org.freedesktop.portal.Request::Response` signal:
 
         * ``session_handle`` (``s``)
@@ -269,6 +279,39 @@
       <arg type="a{sv}" name="options" direction="in"/>
       <arg type="h" name="fd" direction="out"/>
     </method>
+    <!--
+        ConnectProvisioning:
+        @session_handle: Object path for the :ref:`org.freedesktop.portal.Session` object
+        @parent_window: Identifier for the application window, see :doc:`window-identifiers`
+        @fd: File descriptor of a point to point D-Bus connection
+        @options: Vardict with optional further information
+        @handle: Object path for the :ref:`org.freedesktop.portal.Request` object representing this call
+
+        Add the caller app as a sources provider by using the
+        :ref:`org.freedesktop.app.portal.ScreenCast <org.freedesktop.app.portal.ScreenCast>`
+        implementation on the point to point D-Bus.
+        An application can only attempt to add itself as a provider once per session.
+        The session must be created with @provider set to true.
+
+        Supported keys in the @options vardict include:
+
+        * ``handle_token`` (``s``)
+
+          A string that will be used as the last element of the @handle. Must be a valid
+          object path element. See the :ref:`org.freedesktop.portal.Request` documentation for
+          more information about the @handle.
+
+        This method was added in version 6 of this interface.
+    -->
+    <method name="ConnectProvisioning">
+      <arg type="o" name="session_handle" direction="in"/>
+      <arg type="s" name="parent_window" direction="in"/>
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type="h" name="fd" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QVariantMap"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
     <!--
         AvailableSourceTypes:
 
@@ -277,6 +320,7 @@
         - ``1``: MONITOR: Share existing monitors
         - ``2``: WINDOW: Share application windows
         - ``4``: VIRTUAL: Extend with new virtual monitor
+        - ``8``: EXTERNAL: Share application provided sources
     -->
     <property name="AvailableSourceTypes" type="u" access="read"/>
     <!--
diff --git a/meson.build b/meson.build
index db0262d1c..56b51053c 100644
--- a/meson.build
+++ b/meson.build
@@ -130,7 +130,7 @@ libportal_dep = dependency(
     'tests=false',
   ],
 )
-pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.2.90')
+pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.77')
 libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
 gudev_dep = dependency('gudev-1.0', required: get_option('gudev'))
 umockdev_dep = dependency('umockdev-1.0', required: get_option('pytest'))
@@ -223,6 +223,7 @@ pkgconfig.generate(
 subdir('data')
 subdir('src')
 subdir('document-portal')
+subdir('wireplumber')
 subdir('tests')
 subdir('po')
 subdir('doc')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d514b2167..c40ca91c7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@ src/background.c
 src/camera.c
 src/dynamic-launcher.c
 src/location.c
+src/screen-cast.c
 src/screenshot.c
 src/settings.c
 src/usb.c
diff --git a/src/screen-cast.c b/src/screen-cast.c
index 562d53af6..2b10194ed 100644
--- a/src/screen-cast.c
+++ b/src/screen-cast.c
@@ -20,6 +20,9 @@
 
 #include "config.h"
 
+#include <glib/gi18n.h>
+#include <gio/gdesktopappinfo.h>
+
 #include <stdint.h>
 #include <pipewire/pipewire.h>
 #include <gio/gunixfdlist.h>
@@ -42,6 +45,8 @@
   })
 #define SCREEN_CAST_TABLE "screencast"
 
+#define PROVIDER_ID "provider"
+
 typedef struct _ScreenCast ScreenCast;
 typedef struct _ScreenCastClass ScreenCastClass;
 
@@ -56,9 +61,11 @@ struct _ScreenCastClass
 };
 
 static XdpDbusImplScreenCast *impl;
+static XdpDbusImplAccess *access_impl = NULL;
 static int impl_version;
 static ScreenCast *screen_cast;
 
+static unsigned int available_source_types = 0;
 static unsigned int available_cursor_modes = 0;
 
 GType screen_cast_get_type (void);
@@ -121,6 +128,43 @@ IS_SCREEN_CAST_SESSION (gpointer ptr)
   return G_TYPE_CHECK_INSTANCE_TYPE (ptr, screen_cast_session_get_type ());
 }
 
+typedef enum _ScreenCastProviderSessionState
+{
+  SCREEN_CAST_PROVIDER_SESSION_STATE_INIT,
+  SCREEN_CAST_PROVIDER_SESSION_STATE_CONNECTING,
+  SCREEN_CAST_PROVIDER_SESSION_STATE_CONNECTED,
+  SCREEN_CAST_PROVIDER_SESSION_STATE_CLOSED
+} ScreenCastProviderSessionState;
+
+typedef struct _ScreenCastProviderSession
+{
+  XdpSession parent;
+
+  ScreenCastProviderSessionState state;
+} ScreenCastProviderSession;
+
+typedef struct _ScreenCastProviderSessionClass
+{
+  XdpSessionClass parent_class;
+} ScreenCastProviderSessionClass;
+
+GType screen_cast_provider_session_get_type (void);
+
+G_DEFINE_TYPE (ScreenCastProviderSession, screen_cast_provider_session, xdp_session_get_type ())
+
+G_GNUC_UNUSED static inline ScreenCastProviderSession *
+SCREEN_CAST_PROVIDER_SESSION (gpointer ptr)
+{
+  return G_TYPE_CHECK_INSTANCE_CAST (ptr, screen_cast_provider_session_get_type (),
+                                     ScreenCastProviderSession);
+}
+
+G_GNUC_UNUSED static inline gboolean
+IS_SCREEN_CAST_PROVIDER_SESSION (gpointer ptr)
+{
+  return G_TYPE_CHECK_INSTANCE_TYPE (ptr, screen_cast_provider_session_get_type ());
+}
+
 static ScreenCastSession *
 screen_cast_session_new (GVariant *options,
                          XdpRequest *request,
@@ -152,6 +196,37 @@ screen_cast_session_new (GVariant *options,
   return (ScreenCastSession*)session;
 }
 
+static ScreenCastProviderSession *
+screen_cast_provider_session_new (GVariant   *options,
+                                  XdpRequest *request,
+                                  GError    **error)
+{
+  XdpSession *session;
+  GDBusInterfaceSkeleton *interface_skeleton =
+    G_DBUS_INTERFACE_SKELETON (request);
+  const char *session_token;
+  GDBusConnection *connection =
+    g_dbus_interface_skeleton_get_connection (interface_skeleton);
+  GDBusConnection *impl_connection =
+    g_dbus_proxy_get_connection (G_DBUS_PROXY (impl));
+  const char *impl_dbus_name = g_dbus_proxy_get_name (G_DBUS_PROXY (impl));
+
+  session_token = lookup_session_token (options);
+  session = g_initable_new (screen_cast_provider_session_get_type (), NULL, error,
+                            "sender", request->sender,
+                            "app-id", xdp_app_info_get_id (request->app_info),
+                            "token", session_token,
+                            "connection", connection,
+                            "impl-connection", impl_connection,
+                            "impl-dbus-name", impl_dbus_name,
+                            NULL);
+
+  if (session)
+    g_debug ("screen cast provider session owned by '%s' created", session->sender);
+
+  return (ScreenCastProviderSession*)session;
+}
+
 static void
 create_session_done (GObject *source_object,
                      GAsyncResult *res,
@@ -217,6 +292,10 @@ create_session_done (GObject *source_object,
     xdp_session_close (session, FALSE);
 }
 
+static XdpOptionKey create_session_options[] = {
+  { "provider", G_VARIANT_TYPE_BOOLEAN, NULL },
+};
+
 static gboolean
 handle_create_session (XdpDbusScreenCast *object,
                        GDBusMethodInvocation *invocation,
@@ -229,6 +308,7 @@ handle_create_session (XdpDbusScreenCast *object,
   g_auto(GVariantBuilder) options_builder =
     G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_VARDICT);
   g_autoptr(GVariant) options = NULL;
+  gboolean provider;
 
   REQUEST_AUTOLOCK (request);
 
@@ -247,13 +327,30 @@ handle_create_session (XdpDbusScreenCast *object,
   xdp_request_set_impl_request (request, impl_request);
   xdp_request_export (request, g_dbus_method_invocation_get_connection (invocation));
 
-  session = XDP_SESSION (screen_cast_session_new (arg_options, request, &error));
+  if (!g_variant_lookup (arg_options, "provider", "b", &provider))
+    provider = FALSE;
+
+  if (provider &&
+      ((available_source_types & 8) == 0 || access_impl == NULL || impl_version < 6))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                                             "Creating provider session is not available");
+      return G_DBUS_METHOD_INVOCATION_HANDLED;
+    }
+
+  if (provider)
+    session = XDP_SESSION (screen_cast_provider_session_new (arg_options, request, &error));
+  else
+    session = XDP_SESSION (screen_cast_session_new (arg_options, request, &error));
   if (!session)
     {
       g_dbus_method_invocation_return_gerror (invocation, error);
       return G_DBUS_METHOD_INVOCATION_HANDLED;
     }
 
+  xdp_filter_options (arg_options, &options_builder,
+                      create_session_options, G_N_ELEMENTS (create_session_options),
+                      NULL);
   options = g_variant_ref_sink (g_variant_builder_end (&options_builder));
 
   g_object_set_qdata_full (G_OBJECT (request),
@@ -352,10 +449,10 @@ validate_source_types (const char *key,
 {
   guint32 types = g_variant_get_uint32 (value);
 
-  if ((types & ~(1 | 2 | 4)) != 0)
+  if ((types & ~(1 | 2 | 4 | 8)) != 0)
     {
       g_set_error (error, XDG_DESKTOP_PORTAL_ERROR, XDG_DESKTOP_PORTAL_ERROR_INVALID_ARGUMENT,
-                   "Unsupported device type: %x", types & ~(1 | 2 | 4));
+                   "Unsupported device type: %x", types & ~(1 | 2 | 4 | 8));
       return FALSE;
     } 
 
@@ -674,7 +771,8 @@ open_pipewire_screen_cast_remote (const char *app_id,
   g_array_append_val (permission_items,
                       PERMISSION_ITEM (remote->node_factory_id, PW_PERM_R));
 
-  append_stream_permissions (remote, permission_items, streams);
+  if (streams)
+    append_stream_permissions (remote, permission_items, streams);
 
   /*
    * Hide all existing and future nodes (except the ones we explicitly list above).
@@ -941,7 +1039,8 @@ handle_open_pipewire_remote (XdpDbusScreenCast *object,
 {
   XdpCall *call = xdp_call_from_invocation (invocation);
   XdpSession *session;
-  GList *streams;
+  gboolean is_provider_session;
+  GList *streams = NULL;
   PipeWireRemote *remote;
   g_autoptr(GUnixFDList) out_fd_list = NULL;
   int fd;
@@ -960,6 +1059,7 @@ handle_open_pipewire_remote (XdpDbusScreenCast *object,
 
   SESSION_AUTOLOCK_UNREF (session);
 
+  is_provider_session = IS_SCREEN_CAST_PROVIDER_SESSION (session);
   if (IS_SCREEN_CAST_SESSION (session))
     {
       ScreenCastSession *screen_cast_session = SCREEN_CAST_SESSION (session);
@@ -973,7 +1073,7 @@ handle_open_pipewire_remote (XdpDbusScreenCast *object,
 
       streams = remote_desktop_session_get_streams (remote_desktop_session);
     }
-  else
+  else if (!is_provider_session)
     {
       g_dbus_method_invocation_return_error (invocation,
                                              G_DBUS_ERROR,
@@ -982,7 +1082,7 @@ handle_open_pipewire_remote (XdpDbusScreenCast *object,
       return G_DBUS_METHOD_INVOCATION_HANDLED;
     }
 
-  if (!streams)
+  if (!streams && !is_provider_session)
     {
       g_dbus_method_invocation_return_error (invocation,
                                              G_DBUS_ERROR,
@@ -1023,6 +1123,318 @@ handle_open_pipewire_remote (XdpDbusScreenCast *object,
   return G_DBUS_METHOD_INVOCATION_HANDLED;
 }
 
+static void
+send_response (XdpRequest *request,
+               XdpSession *session,
+               guint response,
+               GVariant *results)
+{
+  if (request->exported)
+    {
+      g_debug ("sending response: %d", response);
+      xdp_dbus_request_emit_response (XDP_DBUS_REQUEST (request), response, results);
+      xdp_request_unexport (request);
+    }
+
+  if (response != 0)
+    {
+      g_debug ("closing session");
+      xdp_session_close (session, FALSE);
+    }
+}
+
+static void
+send_response_in_thread_func (GTask *task,
+                              gpointer source_object,
+                              gpointer task_data,
+                              GCancellable *cancellable)
+{
+  XdpRequest *request = task_data;
+  XdpSession *session;
+  ScreenCastProviderSession *screen_cast_provider_session;
+  guint response;
+  GVariant *results;
+
+  REQUEST_AUTOLOCK (request);
+
+  session = g_object_get_qdata (G_OBJECT (request), quark_request_session);
+  SESSION_AUTOLOCK_UNREF (g_object_ref (session));
+  g_object_set_qdata (G_OBJECT (request), quark_request_session, NULL);
+
+  response = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (request), "response"));
+  results = (GVariant *)g_object_get_data (G_OBJECT (request), "results");
+
+  if (response == 0)
+    {
+      screen_cast_provider_session = SCREEN_CAST_PROVIDER_SESSION (session);
+      g_assert (screen_cast_provider_session->state ==
+                SCREEN_CAST_PROVIDER_SESSION_STATE_CONNECTING);
+      screen_cast_provider_session->state =
+        SCREEN_CAST_PROVIDER_SESSION_STATE_CONNECTED;
+    }
+
+  if (!results)
+    {
+      GVariantBuilder results_builder;
+
+      g_variant_builder_init (&results_builder, G_VARIANT_TYPE_VARDICT);
+      results = g_variant_builder_end (&results_builder);
+    }
+
+  send_response (request, session, response, results);
+}
+
+static void
+connect_provisioning_done (GObject *source,
+                           GAsyncResult *res,
+                           gpointer data)
+{
+  g_autoptr (XdpRequest) request = data;
+  guint response = 2;
+  g_autoptr (GVariant) results = NULL;
+  g_autoptr (GError) error = NULL;
+  g_autoptr (GTask) task = NULL;
+
+  if (!xdp_dbus_impl_screen_cast_call_connect_provisioning_finish (impl,
+                                                                   &response,
+                                                                   &results,
+                                                                   NULL,
+                                                                   res,
+                                                                   &error))
+    {
+      g_dbus_error_strip_remote_error (error);
+      g_warning ("A backend call failed: %s", error->message);
+    }
+
+  g_object_set_data (G_OBJECT (request), "response", GUINT_TO_POINTER (response));
+  if (results)
+    g_object_set_data_full (G_OBJECT (request), "results", g_variant_ref (results), (GDestroyNotify)g_variant_unref);
+
+  task = g_task_new (NULL, NULL, NULL, NULL);
+  g_task_set_task_data (task, g_object_ref (request), g_object_unref);
+  g_task_run_in_thread (task, send_response_in_thread_func);
+}
+
+static void
+handle_connect_provisioning_in_thread_func (GTask *task,
+                                            gpointer source_object,
+                                            gpointer task_data,
+                                            GCancellable *cancellable)
+{
+  XdpRequest *request = XDP_REQUEST (task_data);
+  g_autoptr (GError) error = NULL;
+  g_autoptr (XdpDbusImplRequest) impl_request = NULL;
+  XdpSession *session;
+  g_auto (GVariantBuilder) opt_builder =
+    G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_VARDICT);
+  XdpPermission permission;
+  GUnixFDList *fd_list;
+  const gchar *parent_window;
+  GVariant *fd;
+  const gchar *app_id;
+
+  REQUEST_AUTOLOCK (request);
+
+  session = g_object_get_qdata (G_OBJECT (request), quark_request_session);
+  SESSION_AUTOLOCK_UNREF (g_object_ref (session));
+  g_object_set_qdata (G_OBJECT (request), quark_request_session, NULL);
+
+  app_id = xdp_app_info_get_id (request->app_info);
+  fd_list = ((GUnixFDList *)g_object_get_data (G_OBJECT (request), "fd-list"));
+  parent_window = ((const gchar *)g_object_get_data (G_OBJECT (request), "parent-window"));
+  fd = ((GVariant *)g_object_get_data (G_OBJECT (request), "fd"));
+
+  permission = xdp_get_permission_sync (app_id, SCREEN_CAST_TABLE, PROVIDER_ID);
+
+  if (permission != XDP_PERMISSION_YES)
+    {
+      g_autoptr (GVariant) access_results = NULL;
+      g_auto(GVariantBuilder) access_opt_builder =
+        G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_VARDICT);
+      g_autofree gchar *subtitle = NULL;
+      g_autofree gchar *title = NULL;
+      const gchar *body;
+      guint access_response = 2;
+
+      if (permission == XDP_PERMISSION_NO)
+        {
+          send_response (request, session, 2, g_variant_builder_end (&opt_builder));
+          return;
+        }
+
+      g_variant_builder_add (&access_opt_builder, "{sv}",
+                             "deny_label", g_variant_new_string (_("Deny")));
+      g_variant_builder_add (&access_opt_builder, "{sv}",
+                             "grant_label", g_variant_new_string (_("Allow")));
+      g_variant_builder_add (&access_opt_builder, "{sv}",
+                             "icon", g_variant_new_string ("screen-shared-symbolic"));
+
+      if (g_strcmp0 (app_id, "") != 0)
+        {
+          g_autoptr(GDesktopAppInfo) info = NULL;
+          g_autofree gchar *id = NULL;
+          const gchar *name = NULL;
+
+          id = g_strconcat (app_id, ".desktop", NULL);
+          info = g_desktop_app_info_new (id);
+
+          if (info)
+            name = g_app_info_get_display_name (G_APP_INFO (info));
+          else
+            name = app_id;
+
+          title = g_strdup_printf (_("Allow %s to Provide Screen Cast Sources?"), name);
+          subtitle = g_strdup_printf (_("%s wants to enable other applications to share its content."), name);
+        }
+      else
+        {
+          /* Note: this will set the screencast provider permission for all unsandboxed
+           * apps for which an app ID can't be determined.
+           */
+          g_assert (xdp_app_info_is_host (request->app_info));
+          title = g_strdup (_("Allow Applications to Provide Screen Cast Sources?"));
+          subtitle = g_strdup (_("An application wants to enable other applications to share its content."));
+        }
+      body = _("This permission can be changed at any time from the privacy settings.");
+
+      if (!xdp_dbus_impl_access_call_access_dialog_sync (access_impl,
+                                                         request->id,
+                                                         app_id,
+                                                         parent_window,
+                                                         title,
+                                                         subtitle,
+                                                         body,
+                                                         g_variant_builder_end (&access_opt_builder),
+                                                         &access_response,
+                                                         &access_results,
+                                                         NULL,
+                                                         &error))
+        {
+          g_warning ("Failed to show access dialog: %s", error->message);
+          send_response (request, session, 2, g_variant_builder_end (&opt_builder));
+          return;
+        }
+
+      if (permission == XDP_PERMISSION_UNSET)
+        xdp_set_permission_sync (app_id, SCREEN_CAST_TABLE, PROVIDER_ID, access_response == 0 ? XDP_PERMISSION_YES : XDP_PERMISSION_NO);
+
+      if (access_response != 0)
+        {
+          send_response (request, session, 2, g_variant_builder_end (&opt_builder));
+          return;
+        }
+    }
+
+  impl_request =
+    xdp_dbus_impl_request_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (impl)),
+                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                                          g_dbus_proxy_get_name (G_DBUS_PROXY (impl)),
+                                          request->id,
+                                          NULL, &error);
+
+  if (!impl_request)
+    {
+      g_warning ("Failed to create screen cast implementation proxy: %s", error->message);
+      send_response (request, session, 2, g_variant_builder_end (&opt_builder));
+      return;
+    }
+
+  xdp_request_set_impl_request (request, impl_request);
+  g_object_set_qdata_full (G_OBJECT (request),
+                           quark_request_session,
+                           g_object_ref (session),
+                           g_object_unref);
+
+  g_debug ("Calling ConnectProvisioning with app_id=%s", app_id);
+  xdp_dbus_impl_screen_cast_call_connect_provisioning (impl,
+                                                       request->id,
+                                                       session->id,
+                                                       app_id,
+                                                       fd,
+                                                       g_variant_builder_end (&opt_builder),
+                                                       fd_list,
+                                                       NULL,
+                                                       connect_provisioning_done,
+                                                       g_object_ref (request));
+}
+
+static gboolean
+handle_connect_provisioning (XdpDbusScreenCast *object,
+                             GDBusMethodInvocation *invocation,
+                             GUnixFDList *fd_list,
+                             const char *arg_session_handle,
+                             const gchar *arg_parent_window,
+                             GVariant *arg_fd,
+                             GVariant *arg_options)
+{
+  XdpRequest *request = xdp_request_from_invocation (invocation);
+  XdpSession *session;
+  ScreenCastProviderSession *screen_cast_provider_session;
+  g_autoptr (GTask) task = NULL;
+
+  g_debug ("Handle ConnectProvisioning");
+
+  REQUEST_AUTOLOCK (request);
+
+  session = xdp_session_from_request (arg_session_handle, request);
+  if (!session || !IS_SCREEN_CAST_PROVIDER_SESSION (session))
+    {
+      g_dbus_method_invocation_return_error (invocation,
+                                             G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Invalid session");
+      return G_DBUS_METHOD_INVOCATION_HANDLED;
+    }
+
+  SESSION_AUTOLOCK_UNREF (session);
+
+  screen_cast_provider_session = SCREEN_CAST_PROVIDER_SESSION (session);
+  switch (screen_cast_provider_session->state)
+    {
+    case SCREEN_CAST_PROVIDER_SESSION_STATE_INIT:
+      break;
+    case SCREEN_CAST_PROVIDER_SESSION_STATE_CONNECTING:
+    case SCREEN_CAST_PROVIDER_SESSION_STATE_CONNECTED:
+      g_dbus_method_invocation_return_error (invocation,
+                                             G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Can only add provider once");
+      return G_DBUS_METHOD_INVOCATION_HANDLED;
+    case SCREEN_CAST_PROVIDER_SESSION_STATE_CLOSED:
+      g_dbus_method_invocation_return_error (invocation,
+                                             G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Invalid session");
+      return G_DBUS_METHOD_INVOCATION_HANDLED;
+    }
+
+  xdp_request_export (request, g_dbus_method_invocation_get_connection (invocation));
+
+  g_object_set_data_full (G_OBJECT (request), "fd-list", g_object_ref (fd_list), g_object_unref);
+  g_object_set_data_full (G_OBJECT (request), "parent-window", g_strdup (arg_parent_window), g_free);
+  g_object_set_data_full (G_OBJECT (request), "fd", g_variant_ref (arg_fd), (GDestroyNotify)g_variant_unref);
+  g_object_set_data_full (G_OBJECT (request),
+                          "options",
+                          g_variant_ref (arg_options),
+                          (GDestroyNotify)g_variant_unref);
+
+  g_object_set_qdata_full (G_OBJECT (request),
+                           quark_request_session,
+                           g_object_ref (session),
+                           g_object_unref);
+
+  screen_cast_provider_session->state =
+    SCREEN_CAST_PROVIDER_SESSION_STATE_CONNECTING;
+
+  xdp_dbus_screen_cast_complete_connect_provisioning (object, invocation, NULL, request->id);
+
+  task = g_task_new (object, NULL, NULL, NULL);
+  g_task_set_task_data (task, g_object_ref (request), g_object_unref);
+  g_task_run_in_thread (task, handle_connect_provisioning_in_thread_func);
+
+  return G_DBUS_METHOD_INVOCATION_HANDLED;
+}
+
 static void
 screen_cast_iface_init (XdpDbusScreenCastIface *iface)
 {
@@ -1030,14 +1442,19 @@ screen_cast_iface_init (XdpDbusScreenCastIface *iface)
   iface->handle_select_sources = handle_select_sources;
   iface->handle_start = handle_start;
   iface->handle_open_pipewire_remote = handle_open_pipewire_remote;
+  iface->handle_connect_provisioning = handle_connect_provisioning;
 }
 
 static void
 sync_supported_source_types (ScreenCast *screen_cast)
 {
-  unsigned int available_source_types;
-
   available_source_types = xdp_dbus_impl_screen_cast_get_available_source_types (impl);
+
+  /* External type is never available if no Access portal implementation is
+   * found */
+  if ((available_source_types & 8) != 0 && access_impl == NULL)
+    available_source_types ^= 8;
+
   xdp_dbus_screen_cast_set_available_source_types (XDP_DBUS_SCREEN_CAST (screen_cast),
                                                    available_source_types);
 }
@@ -1070,7 +1487,7 @@ on_supported_cursor_modes_changed (GObject *gobject,
 static void
 screen_cast_init (ScreenCast *screen_cast)
 {
-  xdp_dbus_screen_cast_set_version (XDP_DBUS_SCREEN_CAST (screen_cast), 5);
+  xdp_dbus_screen_cast_set_version (XDP_DBUS_SCREEN_CAST (screen_cast), 6);
 
   g_signal_connect (impl, "notify::supported-source-types",
                     G_CALLBACK (on_supported_source_types_changed),
@@ -1094,13 +1511,14 @@ screen_cast_class_init (ScreenCastClass *klass)
 
 GDBusInterfaceSkeleton *
 screen_cast_create (GDBusConnection *connection,
-                    const char *dbus_name)
+                    const char *dbus_name_access,
+                    const char *dbus_name_screen_cast)
 {
   g_autoptr(GError) error = NULL;
 
   impl = xdp_dbus_impl_screen_cast_proxy_new_sync (connection,
                                                    G_DBUS_PROXY_FLAGS_NONE,
-                                                   dbus_name,
+                                                   dbus_name_screen_cast,
                                                    DESKTOP_PORTAL_OBJECT_PATH,
                                                    NULL,
                                                    &error);
@@ -1114,6 +1532,14 @@ screen_cast_create (GDBusConnection *connection,
 
   g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (impl), G_MAXINT);
 
+  if (dbus_name_access != NULL || impl_version >= 6)
+    access_impl = xdp_dbus_impl_access_proxy_new_sync (connection,
+                                                       G_DBUS_PROXY_FLAGS_NONE,
+                                                       dbus_name_access,
+                                                       DESKTOP_PORTAL_OBJECT_PATH,
+                                                       NULL,
+                                                       &error);
+
   screen_cast = g_object_new (screen_cast_get_type (), NULL);
 
   return G_DBUS_INTERFACE_SKELETON (screen_cast);
@@ -1166,3 +1592,28 @@ screen_cast_session_class_init (ScreenCastSessionClass *klass)
   session_class = (XdpSessionClass *)klass;
   session_class->close = screen_cast_session_close;
 }
+
+static void
+screen_cast_provider_session_close (XdpSession *session)
+{
+  ScreenCastProviderSession *screen_cast_provider_session =
+    SCREEN_CAST_PROVIDER_SESSION (session);
+
+  screen_cast_provider_session->state = SCREEN_CAST_PROVIDER_SESSION_STATE_CLOSED;
+
+  g_debug ("screen cast provider session owned by '%s' closed", session->sender);
+}
+
+static void
+screen_cast_provider_session_init (ScreenCastProviderSession *screen_cast_provider_session)
+{
+};
+
+static void
+screen_cast_provider_session_class_init (ScreenCastProviderSessionClass *klass)
+{
+  XdpSessionClass *session_class;
+
+  session_class = (XdpSessionClass *)klass;
+  session_class->close = screen_cast_provider_session_close;
+}
diff --git a/src/screen-cast.h b/src/screen-cast.h
index 097fa2041..eb32e08a6 100644
--- a/src/screen-cast.h
+++ b/src/screen-cast.h
@@ -42,4 +42,5 @@ void screen_cast_remove_transient_permissions_for_sender (const char *sender);
 GList * collect_screen_cast_stream_data (GVariantIter *streams_iter);
 
 GDBusInterfaceSkeleton * screen_cast_create (GDBusConnection *connection,
-                                             const char      *dbus_name);
+                                             const char      *dbus_name_access,
+                                             const char      *dbus_name_screen_cast);
diff --git a/src/xdg-desktop-portal.c b/src/xdg-desktop-portal.c
index 396ee2438..fa68a3c06 100644
--- a/src/xdg-desktop-portal.c
+++ b/src/xdg-desktop-portal.c
@@ -318,6 +318,23 @@ on_bus_acquired (GDBusConnection *connection,
                                       wallpaper_create (connection,
                                                         access_impl->dbus_name,
                                                         tmp->dbus_name));
+
+      tmp = find_portal_implementation ("org.freedesktop.impl.portal.ScreenCast");
+      if (tmp != NULL)
+        export_portal_implementation (connection,
+                                      screen_cast_create (connection,
+                                                          access_impl->dbus_name,
+                                                          tmp->dbus_name));
+    }
+  else
+    {
+      implementation =
+        find_portal_implementation ("org.freedesktop.impl.portal.ScreenCast");
+      if (implementation != NULL)
+        export_portal_implementation (connection,
+                                      screen_cast_create (connection,
+                                                          NULL,
+                                                          implementation->dbus_name));
     }
 
   implementation = find_portal_implementation ("org.freedesktop.impl.portal.Account");
@@ -345,11 +362,6 @@ on_bus_acquired (GDBusConnection *connection,
     export_portal_implementation (connection,
                                   dynamic_launcher_create (connection, implementation->dbus_name));
 
-  implementation = find_portal_implementation ("org.freedesktop.impl.portal.ScreenCast");
-  if (implementation != NULL)
-    export_portal_implementation (connection,
-                                  screen_cast_create (connection, implementation->dbus_name));
-
   implementation = find_portal_implementation ("org.freedesktop.impl.portal.RemoteDesktop");
   if (implementation != NULL)
     export_portal_implementation (connection,
diff --git a/wireplumber/meson.build b/wireplumber/meson.build
new file mode 100644
index 000000000..133f11442
--- /dev/null
+++ b/wireplumber/meson.build
@@ -0,0 +1,16 @@
+wp_name = 'xdg-desktop-portal'
+wp_datadir = datadir / 'wireplumber'
+
+install_data(
+  configure_file(
+    input: 'wp.conf.in',
+    output: wp_name + '.conf',
+    configuration: configuration_data({ 'name': wp_name })
+  ),
+  install_dir: wp_datadir / 'wireplumber.conf.d',
+)
+
+install_data(
+  'output-nodes.lua',
+  install_dir: wp_datadir / 'scripts' / wp_name
+)
\ No newline at end of file
diff --git a/wireplumber/output-nodes.lua b/wireplumber/output-nodes.lua
new file mode 100644
index 000000000..02622fabe
--- /dev/null
+++ b/wireplumber/output-nodes.lua
@@ -0,0 +1,51 @@
+-- xdg-desktop-portal
+--
+-- Copyright © 2024 tytan652
+--
+-- SPDX-License-Identifier: LGPL-2.1-or-later
+
+log = Log.open_topic ("s-xdg-desktop-portal")
+
+-- Object manager to find a WirePlumber session manager
+clients_wp = ObjectManager {
+  Interest {
+    type = "client",
+    Constraint { "wireplumber.daemon", "=", true, type = "pw" },
+    Constraint { "wireplumber.export-core", "-", type = "pw" },
+  }
+}
+
+-- Object manager to find portal clients
+clients_portal = ObjectManager {
+  Interest {
+    type = "client",
+    Constraint { "pipewire.access", "=", "portal" },
+  }
+}
+
+-- Object manager to find output nodes
+nodes_om = ObjectManager {
+  Interest {
+    type = "node",
+    Constraint { "media.class", "#", "Stream/Output/*" },
+  }
+}
+
+nodes_om:connect("object-added", function (om, node)
+  -- Check if node has a portal client
+  for client_portal in clients_portal:iterate {
+    Constraint { "object.id", "=", node.properties["client.id"] }
+  } do
+    for client_wp in clients_wp:iterate () do
+      local id = node["bound-id"]
+      -- Allow session manager to link provider output node
+      -- without requiring the owning client to see the input node
+      log:info (client_wp, "Granting \"L\" permission to session manager for node" .. id)
+      client_wp:update_permissions { [id] = "rwxml" }
+    end
+  end
+end)
+
+clients_wp:activate ()
+clients_portal:activate ()
+nodes_om:activate ()
\ No newline at end of file
diff --git a/wireplumber/wp.conf.in b/wireplumber/wp.conf.in
new file mode 100644
index 000000000..1364d827c
--- /dev/null
+++ b/wireplumber/wp.conf.in
@@ -0,0 +1,7 @@
+wireplumber.components = [
+  {
+    name = @name@/output-nodes.lua, type = script/lua
+    provides = script.@name@.output-nodes
+    requires = [ script.client.access-portal ]
+  }
+]
\ No newline at end of file