diff --git a/0001-daemon-system-Use-timeout_add_seconds_once-on-abort_.patch b/0001-daemon-system-Use-timeout_add_seconds_once-on-abort_.patch
index 931dcda..fa6bfb0 100644
--- a/0001-daemon-system-Use-timeout_add_seconds_once-on-abort_.patch
+++ b/0001-daemon-system-Use-timeout_add_seconds_once-on-abort_.patch
@@ -1,4 +1,4 @@
-From 05c1ede310a22ff8d9044b1e87d8a562526635d3 Mon Sep 17 00:00:00 2001
+From 0e02ebf4f4f0bb6fd004d86a8baf1106d48c0ed4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Wed, 4 Jun 2025 11:32:25 +0200
 Subject: [PATCH 01/12] daemon-system: Use timeout_add_seconds_once on
@@ -9,19 +9,19 @@ Subject: [PATCH 01/12] daemon-system: Use timeout_add_seconds_once on
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
-index 8229978..41715f0 100644
+index 97c37b20..7c5b77a6 100644
 --- a/src/grd-daemon-system.c
 +++ b/src/grd-daemon-system.c
-@@ -36,7 +36,7 @@
- #include "grd-session-rdp.h"
+@@ -37,7 +37,7 @@
  #include "grd-settings.h"
+ #include "grd-utils.h"
  
 -#define MAX_HANDOVER_WAIT_TIME_MS (30 * 1000)
 +#define MAX_HANDOVER_WAIT_TIME_S 30
  
  typedef struct
  {
-@@ -182,7 +182,7 @@ on_handle_take_client (GrdDBusRemoteDesktopRdpHandover *interface,
+@@ -183,7 +183,7 @@ on_handle_take_client (GrdDBusRemoteDesktopRdpHandover *interface,
    return G_DBUS_METHOD_INVOCATION_HANDLED;
  }
  
@@ -30,7 +30,7 @@ index 8229978..41715f0 100644
  abort_handover (gpointer user_data)
  {
    GrdRemoteClient *remote_client = user_data;
-@@ -198,8 +198,6 @@ abort_handover (gpointer user_data)
+@@ -199,8 +199,6 @@ abort_handover (gpointer user_data)
      }
  
    g_hash_table_remove (daemon_system->remote_clients, remote_client->id);
@@ -39,7 +39,7 @@ index 8229978..41715f0 100644
  }
  
  static char *
-@@ -412,7 +410,9 @@ on_handle_start_handover (GrdDBusRemoteDesktopRdpHandover *interface,
+@@ -413,7 +411,9 @@ on_handle_start_handover (GrdDBusRemoteDesktopRdpHandover *interface,
    if (remote_client->abort_handover_source_id == 0)
      {
        remote_client->abort_handover_source_id =
@@ -50,7 +50,7 @@ index 8229978..41715f0 100644
      }
  
    return G_DBUS_METHOD_INVOCATION_HANDLED;
-@@ -607,7 +607,9 @@ remote_client_new (GrdDaemonSystem *daemon_system,
+@@ -608,7 +608,9 @@ remote_client_new (GrdDaemonSystem *daemon_system,
                       remote_client);
  
    remote_client->abort_handover_source_id =
@@ -61,7 +61,11 @@ index 8229978..41715f0 100644
  
    return remote_client;
  }
-From 66f462124e295db2d977f721f77cdab28c2b49cc Mon Sep 17 00:00:00 2001
+-- 
+2.54.0
+
+
+From 768e44296b975c05864ba2c90169f82b388d2474 Mon Sep 17 00:00:00 2001
 From: Joan Torres <joantolo@redhat.com>
 Date: Sat, 17 May 2025 02:13:35 +0200
 Subject: [PATCH 02/12] daemon-system: Move session_id_changed
@@ -73,10 +77,10 @@ next commit.
  1 file changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
-index 70142a0..3ad3612 100644
+index 7c5b77a6..8089882b 100644
 --- a/src/grd-daemon-system.c
 +++ b/src/grd-daemon-system.c
-@@ -923,28 +923,6 @@ on_remote_display_factory_proxy_acquired (GObject      *object,
+@@ -920,28 +920,6 @@ on_remote_display_factory_proxy_acquired (GObject      *object,
    grd_daemon_maybe_enable_services (GRD_DAEMON (daemon_system));
  }
  
@@ -105,7 +109,7 @@ index 70142a0..3ad3612 100644
  static void
  on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
                                       GParamSpec              *pspec,
-@@ -983,6 +961,28 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
+@@ -980,6 +958,28 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
      new_remote_client->handover_dst->interface);
  }
  
@@ -135,10 +139,10 @@ index 70142a0..3ad3612 100644
  register_handover_for_display (GrdDaemonSystem         *daemon_system,
                                 GrdDBusGdmRemoteDisplay *remote_display)
 -- 
-2.51.0
+2.54.0
 
 
-From 3d480acc40627fa61c8461a08b798adea5f37443 Mon Sep 17 00:00:00 2001
+From 2029d710b37e9c4d4907c6361d338eebee4e0bf1 Mon Sep 17 00:00:00 2001
 From: Joan Torres <joantolo@redhat.com>
 Date: Sat, 17 May 2025 02:18:09 +0200
 Subject: [PATCH 03/12] daemon-system: Don't register handover if session_id is
@@ -155,10 +159,10 @@ displays, but in the next commit that will change.
  1 file changed, 18 insertions(+), 9 deletions(-)
 
 diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
-index 3ad3612..92b4d76 100644
+index 8089882b..968c7074 100644
 --- a/src/grd-daemon-system.c
 +++ b/src/grd-daemon-system.c
-@@ -970,17 +970,23 @@ on_gdm_remote_display_session_id_changed (GrdDBusGdmRemoteDisplay *remote_displa
+@@ -967,17 +967,23 @@ on_gdm_remote_display_session_id_changed (GrdDBusGdmRemoteDisplay *remote_displa
  
    session_id = grd_dbus_gdm_remote_display_get_session_id (remote_display);
  
@@ -187,7 +191,7 @@ index 3ad3612..92b4d76 100644
  }
  
  static void
-@@ -1004,10 +1010,6 @@ register_handover_for_display (GrdDaemonSystem         *daemon_system,
+@@ -1001,10 +1007,6 @@ register_handover_for_display (GrdDaemonSystem         *daemon_system,
    disconnect_from_remote_display (remote_client);
    remote_client->remote_display = g_object_ref (remote_display);
  
@@ -198,7 +202,7 @@ index 3ad3612..92b4d76 100644
    session_id = grd_dbus_gdm_remote_display_get_session_id (remote_display);
    if (!session_id || strcmp (session_id, "") == 0)
      {
-@@ -1022,6 +1024,10 @@ register_handover_for_display (GrdDaemonSystem         *daemon_system,
+@@ -1019,6 +1021,10 @@ register_handover_for_display (GrdDaemonSystem         *daemon_system,
             remote_client->id,
             session_id);
  
@@ -209,7 +213,7 @@ index 3ad3612..92b4d76 100644
    register_handover_iface (remote_client, session_id);
  }
  
-@@ -1045,6 +1051,9 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
+@@ -1042,6 +1048,9 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
      }
  
    session_id = grd_dbus_gdm_remote_display_get_session_id (remote_display);
@@ -220,10 +224,10 @@ index 3ad3612..92b4d76 100644
                                   REMOTE_DESKTOP_HANDOVERS_OBJECT_PATH,
                                   session_id);
 -- 
-2.51.0
+2.54.0
 
 
-From 06b4f4a9b717145c9bd926e755b9700fe927b191 Mon Sep 17 00:00:00 2001
+From 4b6d86116e2d796346fd26870224aa069d75fa42 Mon Sep 17 00:00:00 2001
 From: Joan Torres <joantolo@redhat.com>
 Date: Sat, 17 May 2025 02:46:50 +0200
 Subject: [PATCH 04/12] daemon-system: Consider remote sessions from autologin
@@ -259,7 +263,7 @@ will be used on both of them:
  3 files changed, 75 insertions(+), 11 deletions(-)
 
 diff --git a/data/org.gnome.RemoteDesktop.conf.in b/data/org.gnome.RemoteDesktop.conf.in
-index 891d219..ca87c90 100644
+index 891d2195..ca87c90f 100644
 --- a/data/org.gnome.RemoteDesktop.conf.in
 +++ b/data/org.gnome.RemoteDesktop.conf.in
 @@ -12,6 +12,8 @@
@@ -272,7 +276,7 @@ index 891d219..ca87c90 100644
  
    <!-- Anyone can send messages to the interfaces of the service -->
 diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
-index 92b4d76..05b57f2 100644
+index 968c7074..cf59dcc3 100644
 --- a/src/grd-daemon-system.c
 +++ b/src/grd-daemon-system.c
 @@ -83,6 +83,11 @@ struct _GrdDaemonSystem
@@ -287,7 +291,7 @@ index 92b4d76..05b57f2 100644
  static void
  on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
                                       GParamSpec              *pspec,
-@@ -604,6 +609,10 @@ remote_client_new (GrdDaemonSystem *daemon_system,
+@@ -601,6 +606,10 @@ remote_client_new (GrdDaemonSystem *daemon_system,
    remote_client = g_new0 (GrdRemoteClient, 1);
    remote_client->id = get_next_available_id (daemon_system);
    remote_client->daemon_system = daemon_system;
@@ -298,7 +302,7 @@ index 92b4d76..05b57f2 100644
    remote_client->is_client_mstsc = grd_session_rdp_is_client_mstsc (GRD_SESSION_RDP (session));
    remote_client->session = session;
    g_object_weak_ref (G_OBJECT (session),
-@@ -943,6 +952,9 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
+@@ -940,6 +949,9 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
        return;
      }
  
@@ -308,7 +312,7 @@ index 92b4d76..05b57f2 100644
    g_debug ("[DaemonSystem] GDM updated a remote display with a new remote id: "
             "%s", remote_id);
  
-@@ -989,23 +1001,65 @@ on_gdm_remote_display_session_id_changed (GrdDBusGdmRemoteDisplay *remote_displa
+@@ -986,23 +998,65 @@ on_gdm_remote_display_session_id_changed (GrdDBusGdmRemoteDisplay *remote_displa
    register_handover_iface (remote_client, session_id);
  }
  
@@ -384,7 +388,7 @@ index 92b4d76..05b57f2 100644
  
    disconnect_from_remote_display (remote_client);
    remote_client->remote_display = g_object_ref (remote_display);
-@@ -1052,7 +1106,12 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
+@@ -1049,7 +1103,12 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
  
    session_id = grd_dbus_gdm_remote_display_get_session_id (remote_display);
    if (!session_id || g_str_equal (session_id, ""))
@@ -399,7 +403,7 @@ index 92b4d76..05b57f2 100644
    object_path = g_strdup_printf ("%s/session%s",
                                   REMOTE_DESKTOP_HANDOVERS_OBJECT_PATH,
 diff --git a/src/org.gnome.DisplayManager.xml b/src/org.gnome.DisplayManager.xml
-index 73e073c..145fe21 100644
+index 73e073c2..145fe219 100644
 --- a/src/org.gnome.DisplayManager.xml
 +++ b/src/org.gnome.DisplayManager.xml
 @@ -3,6 +3,9 @@
@@ -413,10 +417,10 @@ index 73e073c..145fe21 100644
    <interface name="org.gnome.DisplayManager.RemoteDisplayFactory">
      <method name="CreateRemoteDisplay">
 -- 
-2.51.0
+2.54.0
 
 
-From 259d160eb1a23ecd0bfffc207b8282087c78b597 Mon Sep 17 00:00:00 2001
+From 87325e8de21384847839a5651224b3c5143f6513 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Wed, 4 Jun 2025 12:12:41 +0200
 Subject: [PATCH 05/12] daemon-system: Consider previous remote displays
@@ -429,7 +433,7 @@ sessions.
  1 file changed, 31 insertions(+), 6 deletions(-)
 
 diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
-index 05b57f2..8a372cb 100644
+index cf59dcc3..d32ec8ff 100644
 --- a/src/grd-daemon-system.c
 +++ b/src/grd-daemon-system.c
 @@ -83,6 +83,9 @@ struct _GrdDaemonSystem
@@ -442,7 +446,7 @@ index 05b57f2..8a372cb 100644
  static void
  grd_remote_client_free (GrdRemoteClient *remote_client);
  
-@@ -989,7 +992,7 @@ on_gdm_remote_display_session_id_changed (GrdDBusGdmRemoteDisplay *remote_displa
+@@ -986,7 +989,7 @@ on_gdm_remote_display_session_id_changed (GrdDBusGdmRemoteDisplay *remote_displa
    if (!session_id || g_str_equal (session_id, ""))
      return;
  
@@ -451,7 +455,7 @@ index 05b57f2..8a372cb 100644
             "and session: %s",
             remote_client->id,
             session_id);
-@@ -1073,7 +1076,7 @@ register_handover_for_display (GrdDaemonSystem         *daemon_system,
+@@ -1070,7 +1073,7 @@ register_handover_for_display (GrdDaemonSystem         *daemon_system,
        return;
      }
  
@@ -460,7 +464,7 @@ index 05b57f2..8a372cb 100644
             "and session: %s",
             remote_client->id,
             session_id);
-@@ -1099,8 +1102,8 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
+@@ -1096,8 +1099,8 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
                                       remote_id, NULL,
                                       (gpointer *) &remote_client))
      {
@@ -471,7 +475,7 @@ index 05b57f2..8a372cb 100644
        return;
      }
  
-@@ -1117,8 +1120,8 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
+@@ -1114,8 +1117,8 @@ unregister_handover_for_display (GrdDaemonSystem         *daemon_system,
                                   REMOTE_DESKTOP_HANDOVERS_OBJECT_PATH,
                                   session_id);
  
@@ -482,7 +486,7 @@ index 05b57f2..8a372cb 100644
  
    if (remote_client->handover_src)
      {
-@@ -1148,6 +1151,26 @@ on_gdm_object_remote_display_interface_changed (GrdDaemonSystem  *daemon_system,
+@@ -1145,6 +1148,26 @@ on_gdm_object_remote_display_interface_changed (GrdDaemonSystem  *daemon_system,
      register_handover_for_display (daemon_system, remote_display);
  }
  
@@ -509,7 +513,7 @@ index 05b57f2..8a372cb 100644
  static void
  on_gdm_object_added (GrdDaemonSystem  *daemon_system,
                       GrdDBusGdmObject *object)
-@@ -1219,6 +1242,8 @@ on_gdm_object_manager_client_acquired (GObject      *source_object,
+@@ -1216,6 +1239,8 @@ on_gdm_object_manager_client_acquired (GObject      *source_object,
        return;
      }
  
@@ -519,10 +523,10 @@ index 05b57f2..8a372cb 100644
                             "object-added",
                             G_CALLBACK (on_gdm_object_added),
 -- 
-2.51.0
+2.54.0
 
 
-From 308890ed9dbdf401e9dd6f927273e32b43116164 Mon Sep 17 00:00:00 2001
+From 5e4c6385095d19c58b4937c0cb6647a2f008ba10 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Wed, 4 Jun 2025 12:16:23 +0200
 Subject: [PATCH 06/12] daemon-handover: Only logout when system daemon
@@ -545,7 +549,7 @@ login sessions will be terminated.
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/src/grd-daemon-handover.c b/src/grd-daemon-handover.c
-index f4eeafc..06f1814 100644
+index f4eeafc0..06f1814b 100644
 --- a/src/grd-daemon-handover.c
 +++ b/src/grd-daemon-handover.c
 @@ -649,6 +649,8 @@ on_gnome_remote_desktop_name_appeared (GDBusConnection *connection,
@@ -583,10 +587,10 @@ index f4eeafc..06f1814 100644
  
  GrdDaemonHandover *
 -- 
-2.51.0
+2.54.0
 
 
-From f9ba1f19522fd84a98a6fbc3fce1f075cd25faee Mon Sep 17 00:00:00 2001
+From 3e724a58fce0a2e7523068b13abfe8cb3d86c527 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Fri, 20 Jun 2025 17:33:29 +0200
 Subject: [PATCH 07/12] daemon-system: Steal handover instead of
@@ -603,10 +607,10 @@ This way we ensure a consistent communication with the handover daemon.
  1 file changed, 42 insertions(+), 5 deletions(-)
 
 diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
-index 8a372cb..3b5e4ca 100644
+index d32ec8ff..7343c9e1 100644
 --- a/src/grd-daemon-system.c
 +++ b/src/grd-daemon-system.c
-@@ -935,6 +935,45 @@ on_remote_display_factory_proxy_acquired (GObject      *object,
+@@ -932,6 +932,45 @@ on_remote_display_factory_proxy_acquired (GObject      *object,
    grd_daemon_maybe_enable_services (GRD_DAEMON (daemon_system));
  }
  
@@ -652,7 +656,7 @@ index 8a372cb..3b5e4ca 100644
  static void
  on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
                                       GParamSpec              *pspec,
-@@ -943,7 +982,6 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
+@@ -940,7 +979,6 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
    GrdDaemonSystem *daemon_system = remote_client->daemon_system;
    GrdRemoteClient *new_remote_client;
    const char *remote_id;
@@ -660,7 +664,7 @@ index 8a372cb..3b5e4ca 100644
  
    remote_id = grd_dbus_gdm_remote_display_get_remote_id (remote_display);
    if (!g_hash_table_lookup_extended (daemon_system->remote_clients,
-@@ -967,13 +1005,12 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
+@@ -964,13 +1002,12 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
                      G_CALLBACK (on_remote_display_remote_id_changed),
                      new_remote_client);
  
@@ -678,10 +682,10 @@ index 8a372cb..3b5e4ca 100644
  
  static void
 -- 
-2.51.0
+2.54.0
 
 
-From 0c9b6d1f5e7cc6cc76e54653d6fcf61d027403f3 Mon Sep 17 00:00:00 2001
+From c77351d4f396aaea16e45b56887e7fdc417d4e71 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Fri, 20 Jun 2025 17:46:06 +0200
 Subject: [PATCH 08/12] daemon-handover: Move get_credentials in start_handover
@@ -692,7 +696,7 @@ This avoids duplicating the code.
  1 file changed, 14 insertions(+), 27 deletions(-)
 
 diff --git a/src/grd-daemon-handover.c b/src/grd-daemon-handover.c
-index 06f1814..a9ec8d8 100644
+index 06f1814b..a9ec8d8e 100644
 --- a/src/grd-daemon-handover.c
 +++ b/src/grd-daemon-handover.c
 @@ -265,14 +265,21 @@ on_start_handover_finished (GObject      *object,
@@ -767,10 +771,10 @@ index 06f1814..a9ec8d8 100644
  
  static void
 -- 
-2.51.0
+2.54.0
 
 
-From 9e51b8936dfe413f782c51179e45a868ffeff4d1 Mon Sep 17 00:00:00 2001
+From 614f8a813cb0a0237cd98d82eef7334e56e6c048 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Fri, 20 Jun 2025 17:50:27 +0200
 Subject: [PATCH 09/12] daemon-system: Change restart signal to
@@ -791,7 +795,7 @@ start_handover will only be called when needed.
  3 files changed, 36 insertions(+), 13 deletions(-)
 
 diff --git a/src/grd-daemon-handover.c b/src/grd-daemon-handover.c
-index a9ec8d8..3c9e34f 100644
+index a9ec8d8e..3c9e34f4 100644
 --- a/src/grd-daemon-handover.c
 +++ b/src/grd-daemon-handover.c
 @@ -448,16 +448,22 @@ on_rdp_server_started (GrdDaemonHandover *daemon_handover)
@@ -853,7 +857,7 @@ index a9ec8d8..3c9e34f 100644
    grd_daemon_maybe_enable_services (GRD_DAEMON (daemon_handover));
  }
 diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
-index 3b5e4ca..950d539 100644
+index 7343c9e1..bdacbe00 100644
 --- a/src/grd-daemon-system.c
 +++ b/src/grd-daemon-system.c
 @@ -63,6 +63,7 @@ typedef struct
@@ -864,7 +868,7 @@ index 3b5e4ca..950d539 100644
  
    GrdDBusGdmRemoteDisplay *remote_display;
  } GrdRemoteClient;
-@@ -189,6 +190,9 @@ on_handle_take_client (GrdDBusRemoteDesktopRdpHandover *interface,
+@@ -188,6 +189,9 @@ on_handle_take_client (GrdDBusRemoteDesktopRdpHandover *interface,
    g_clear_object (&remote_client->socket_connection);
    g_clear_handle_id (&remote_client->abort_handover_source_id, g_source_remove);
  
@@ -874,7 +878,7 @@ index 3b5e4ca..950d539 100644
    return G_DBUS_METHOD_INVOCATION_HANDLED;
  }
  
-@@ -511,6 +515,9 @@ handover_iface_new (const char      *session_id,
+@@ -510,6 +514,9 @@ handover_iface_new (const char      *session_id,
    g_signal_connect (handover->interface, "handle-get-system-credentials",
                      G_CALLBACK (on_handle_get_system_credentials), remote_client);
  
@@ -884,7 +888,7 @@ index 3b5e4ca..950d539 100644
    return handover;
  }
  
-@@ -612,6 +619,7 @@ remote_client_new (GrdDaemonSystem *daemon_system,
+@@ -609,6 +616,7 @@ remote_client_new (GrdDaemonSystem *daemon_system,
    remote_client = g_new0 (GrdRemoteClient, 1);
    remote_client->id = get_next_available_id (daemon_system);
    remote_client->daemon_system = daemon_system;
@@ -892,7 +896,7 @@ index 3b5e4ca..950d539 100644
  
    if (!session)
      return remote_client;
-@@ -1007,8 +1015,8 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
+@@ -1004,8 +1012,8 @@ on_remote_display_remote_id_changed (GrdDBusGdmRemoteDisplay *remote_display,
  
    steal_handover_from_client (new_remote_client, remote_client);
  
@@ -904,10 +908,10 @@ index 3b5e4ca..950d539 100644
    g_hash_table_remove (daemon_system->remote_clients, remote_client->id);
  }
 diff --git a/src/org.gnome.RemoteDesktop.xml b/src/org.gnome.RemoteDesktop.xml
-index 3fda8ec..38b35a3 100644
+index 9e4cb1af..a44896d7 100644
 --- a/src/org.gnome.RemoteDesktop.xml
 +++ b/src/org.gnome.RemoteDesktop.xml
-@@ -194,12 +194,11 @@
+@@ -190,12 +190,11 @@
      </method>
  
      <!--
@@ -925,10 +929,10 @@ index 3fda8ec..38b35a3 100644
    </interface>
  
 -- 
-2.51.0
+2.54.0
 
 
-From a030f48f43412f44f4c7c1b5d12c6763cd95cad4 Mon Sep 17 00:00:00 2001
+From 76af31dac4d7d6418589f3de59c6d2c359367637 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Wed, 25 Jun 2025 13:20:51 +0200
 Subject: [PATCH 10/12] rdp-server: Inform new connection in its dbus iface
@@ -940,10 +944,10 @@ This will be used in next commits.
  2 files changed, 12 insertions(+)
 
 diff --git a/src/grd-rdp-server.c b/src/grd-rdp-server.c
-index b6d5234..0c7ebec 100644
+index cb3ce4d3..40a184a8 100644
 --- a/src/grd-rdp-server.c
 +++ b/src/grd-rdp-server.c
-@@ -166,7 +166,12 @@ static void
+@@ -154,7 +154,12 @@ static void
  on_session_post_connect (GrdSessionRdp *session_rdp,
                           GrdRdpServer  *rdp_server)
  {
@@ -957,10 +961,10 @@ index b6d5234..0c7ebec 100644
  
  static void
 diff --git a/src/org.gnome.RemoteDesktop.xml b/src/org.gnome.RemoteDesktop.xml
-index 38b35a3..d42bf93 100644
+index a44896d7..a2e5a830 100644
 --- a/src/org.gnome.RemoteDesktop.xml
 +++ b/src/org.gnome.RemoteDesktop.xml
-@@ -46,6 +46,13 @@
+@@ -44,6 +44,13 @@
        <arg name="port" type="i" />
      </signal>
  
@@ -975,10 +979,10 @@ index 38b35a3..d42bf93 100644
  
    <!--
 -- 
-2.51.0
+2.54.0
 
 
-From cef80a4e437773971769507022fe16208b428caf Mon Sep 17 00:00:00 2001
+From 04962e398652f53359142698c1c4132fc005f441 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Wed, 25 Jun 2025 13:22:06 +0200
 Subject: [PATCH 11/12] rdp-server: Allow terminating all sessions
@@ -990,11 +994,11 @@ This will be used in next commits.
  2 files changed, 13 insertions(+)
 
 diff --git a/src/grd-rdp-server.c b/src/grd-rdp-server.c
-index bd7257e..3d6e7d2 100644
+index 40a184a8..95810a26 100644
 --- a/src/grd-rdp-server.c
 +++ b/src/grd-rdp-server.c
-@@ -272,6 +272,17 @@ grd_rdp_server_notify_incoming (GSocketService    *service,
-   on_incoming (service, connection);
+@@ -291,6 +291,17 @@ grd_rdp_server_notify_incoming (GSocketService    *service,
+     }
  }
  
 +void
@@ -1012,7 +1016,7 @@ index bd7257e..3d6e7d2 100644
  attempt_to_bind_port (gpointer user_data)
  {
 diff --git a/src/grd-rdp-server.h b/src/grd-rdp-server.h
-index d2e2e29..88d2ad8 100644
+index d2e2e292..88d2ad82 100644
 --- a/src/grd-rdp-server.h
 +++ b/src/grd-rdp-server.h
 @@ -41,3 +41,5 @@ GrdRdpServer *grd_rdp_server_new (GrdContext *context);
@@ -1021,7 +1025,11 @@ index d2e2e29..88d2ad8 100644
                                       GSocketConnection *connection);
 +
 +void grd_rdp_server_stop_sessions (GrdRdpServer *rdp_server);
-From d139b3cf3b7959184ca89d51581475bd93e91379 Mon Sep 17 00:00:00 2001
+-- 
+2.54.0
+
+
+From 08638b936c2bf1712e0934fee516ca28b5e9523e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Torres=20L=C3=B3pez?= <joantolo@redhat.com>
 Date: Wed, 25 Jun 2025 13:33:29 +0200
 Subject: [PATCH 12/12] daemon: Ensure only one single connection for headless
@@ -1042,7 +1050,7 @@ starts a new connection.
  2 files changed, 123 insertions(+)
 
 diff --git a/src/grd-daemon.c b/src/grd-daemon.c
-index eaeb480..d1cb1ac 100644
+index 7e1a0a34..7727e148 100644
 --- a/src/grd-daemon.c
 +++ b/src/grd-daemon.c
 @@ -86,6 +86,8 @@ typedef struct _GrdDaemonPrivate
@@ -1054,7 +1062,7 @@ index eaeb480..d1cb1ac 100644
  #endif
  #ifdef HAVE_VNC
    GrdVncServer *vnc_server;
-@@ -275,6 +277,8 @@ stop_rdp_server (GrdDaemon *daemon)
+@@ -261,6 +263,8 @@ stop_rdp_server (GrdDaemon *daemon)
  
    g_signal_emit (daemon, signals[RDP_SERVER_STOPPED], 0);
    grd_rdp_server_stop (priv->rdp_server);
@@ -1063,7 +1071,7 @@ index eaeb480..d1cb1ac 100644
    g_clear_object (&priv->rdp_server);
    g_clear_handle_id (&priv->restart_rdp_server_source_id, g_source_remove);
    g_message ("RDP server stopped");
-@@ -287,10 +291,105 @@ on_rdp_server_binding_failed (GrdRdpServer *rdp_server,
+@@ -273,10 +277,105 @@ on_rdp_server_binding_failed (GrdRdpServer *rdp_server,
    stop_rdp_server (daemon);
  }
  
@@ -1169,7 +1177,7 @@ index eaeb480..d1cb1ac 100644
    g_autoptr (GError) error = NULL;
  
    g_assert (!priv->rdp_server);
-@@ -307,6 +406,10 @@ start_rdp_server (GrdDaemon *daemon)
+@@ -293,6 +392,10 @@ start_rdp_server (GrdDaemon *daemon)
      {
        g_signal_emit (daemon, signals[RDP_SERVER_STARTED], 0);
        g_message ("RDP server started");
@@ -1181,10 +1189,10 @@ index eaeb480..d1cb1ac 100644
  }
  
 diff --git a/src/grd-rdp-server.c b/src/grd-rdp-server.c
-index cb191eb..2180126 100644
+index 95810a26..d7ecae3b 100644
 --- a/src/grd-rdp-server.c
 +++ b/src/grd-rdp-server.c
-@@ -162,16 +162,36 @@ on_session_stopped (GrdSession   *session,
+@@ -150,16 +150,36 @@ on_session_stopped (GrdSession   *session,
      }
  }
  
@@ -1222,5 +1230,5 @@ index cb191eb..2180126 100644
  
  static void
 -- 
-2.51.0
+2.54.0
 
diff --git a/connection-throttling.patch b/connection-throttling.patch
index 15ec8a2..1b1c61e 100644
--- a/connection-throttling.patch
+++ b/connection-throttling.patch
@@ -1,9 +1,12 @@
-From 202114575558c4bd0573215ef0ce82deae9d9e73 Mon Sep 17 00:00:00 2001
+From 46aeb99ff7612eda8dfb02e1a4b6b5db91af960d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Mon, 26 May 2025 16:08:54 +0200
-Subject: [PATCH 01/13] control: Allow controlling all daemon types
+Subject: [PATCH 01/15] control: Allow controlling all daemon types
 
 Useful for gracefully terminating daemon without sending signals.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit d3d44b114b1f8ce55e523e5f55c2f36e84a4141e)
 ---
  src/grd-control.c | 23 ++++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
@@ -57,14 +60,16 @@ index 858ab10a..284cb113 100644
      {
        g_warning ("Failed to register with application\n");
 -- 
-2.51.0
+2.54.0
 
 
-From 1a627a3840de1a71f3a02860aeb3ef965b412f35 Mon Sep 17 00:00:00 2001
+From 03859f3c0d92ed885554064d955ec016c9722cda Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Mon, 26 May 2025 16:09:45 +0200
-Subject: [PATCH 02/13] daemon: Use GError auto pointer
+Subject: [PATCH 02/15] daemon: Use GError auto pointer
 
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit c87e8e3d4ca4212b43cb9689f6b6cb0dd4e73225)
 ---
  src/grd-daemon.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
@@ -99,15 +104,18 @@ index c082c6b5..98954200 100644
      }
  
 -- 
-2.51.0
+2.54.0
 
 
-From ae398fb3a36a057af814312bfbd8d979120b8a27 Mon Sep 17 00:00:00 2001
+From d66b685b645dc602c27a834adfb8c81e95c66849 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Mon, 26 May 2025 17:04:45 +0200
-Subject: [PATCH 03/13] rdp-server: Remove empty constructor vfunc
+Subject: [PATCH 03/15] rdp-server: Remove empty constructor vfunc
 
 No need to implement it if it doesn't do anything.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 45a0466a710eb4b93c34a7dbb73add73abf51cce)
 ---
  src/grd-rdp-server.c | 7 -------
  1 file changed, 7 deletions(-)
@@ -138,13 +146,13 @@ index c3124b8b..0ac486df 100644
    g_object_class_install_property (object_class,
                                     PROP_CONTEXT,
 -- 
-2.51.0
+2.54.0
 
 
-From 0f5071b5fd8d690f2fa49c5bec4d86c907c39281 Mon Sep 17 00:00:00 2001
+From 2d9ca93f9b1ad7fbdc2da59452378c219b4c5185 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 28 May 2025 14:08:12 +0200
-Subject: [PATCH 04/13] rdp-sam: Dup fd kept in struct
+Subject: [PATCH 04/15] rdp-sam: Dup fd kept in struct
 
 The SAM file instance intends to keeps the file descriptor alive so that
 it doesn't go away; however it failed to do this due to fdopen() taking
@@ -153,15 +161,23 @@ an arbitrary potentially reused file descriptor when the SAM file
 instance eventually got cleaned up. Address this by reordering things a
 bit, while putting a duplicated file descriptor in the SAM file instance
 struct.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 2125730374d70e0894f758440c56b5f31af80174)
 ---
- src/grd-rdp-sam.c | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
+ src/grd-rdp-sam.c | 28 +++++++++++++++++++---------
+ 1 file changed, 19 insertions(+), 9 deletions(-)
 
 diff --git a/src/grd-rdp-sam.c b/src/grd-rdp-sam.c
-index 5898825a..bcadcb59 100644
+index 5898825a..daa3ebb0 100644
 --- a/src/grd-rdp-sam.c
 +++ b/src/grd-rdp-sam.c
-@@ -76,7 +76,7 @@ grd_rdp_sam_create_sam_file (const char *username,
+@@ -72,11 +72,12 @@ grd_rdp_sam_create_sam_file (const char *username,
+ {
+   const char *grd_path = "/gnome-remote-desktop";
+   const char *template = "/rdp-sam-XXXXXX";
++  int duped_fd;
+   GrdRdpSAMFile *rdp_sam_file;
    g_autofree char *file_dir = NULL;
    g_autofree char *filename = NULL;
    g_autofree char *sam_string = NULL;
@@ -170,7 +186,7 @@ index 5898825a..bcadcb59 100644
    FILE *sam_file;
  
    file_dir = g_strdup_printf ("%s%s", g_get_user_runtime_dir (), grd_path);
-@@ -98,20 +98,21 @@ grd_rdp_sam_create_sam_file (const char *username,
+@@ -98,20 +99,29 @@ grd_rdp_sam_create_sam_file (const char *username,
        return NULL;
      }
  
@@ -189,8 +205,16 @@ index 5898825a..bcadcb59 100644
        return NULL;
      }
  
++  duped_fd = dup (fd);
++  if (duped_fd < 0)
++    {
++      fclose (sam_file);
++      g_warning ("[RDP] Failed to dup fd: %s", g_strerror (errno));
++      return NULL;
++    }
++
 +  rdp_sam_file = g_new0 (GrdRdpSAMFile, 1);
-+  rdp_sam_file->fd = dup (fd);
++  rdp_sam_file->fd = duped_fd;
 +  rdp_sam_file->filename = g_steal_pointer (&filename);
 +
 +  g_steal_fd (&fd);
@@ -201,15 +225,18 @@ index 5898825a..bcadcb59 100644
    fclose (sam_file);
  
 -- 
-2.51.0
+2.54.0
 
 
-From dfadd22d899a981804ff1b68358082ffb2bbe0c5 Mon Sep 17 00:00:00 2001
+From 599fae15e272d9cf532ff47b9c54577347a7470d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 28 May 2025 22:33:54 +0200
-Subject: [PATCH 05/13] rdp-server: Set socket backlog count to 5
+Subject: [PATCH 05/15] rdp-server: Set socket backlog count to 5
 
 This limits the number of pending connections.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit b16b81b7c37a42910f194dfe7808ab31aa00339b)
 ---
  src/grd-rdp-server.c | 4 ++++
  1 file changed, 4 insertions(+)
@@ -237,15 +264,18 @@ index 0ac486df..2691a65d 100644
                  "rdp-port", &rdp_port,
                  "rdp-negotiate-port", &negotiate_port,
 -- 
-2.51.0
+2.54.0
 
 
-From 1a5f6718c68695ec4221c530c0427061f2e50ac9 Mon Sep 17 00:00:00 2001
+From 1cc573155d3c9afd4dcca2d612529b52b5c81538 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 28 May 2025 22:55:20 +0200
-Subject: [PATCH 06/13] utils: Add some time conversion helpers
+Subject: [PATCH 06/15] utils: Add some time conversion helpers
 
 Useful when converting between second, microseconds, etc.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit d26d49a7821968bd8277ae9ce558367cdfe136a5)
 ---
  src/grd-utils.h | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
@@ -277,17 +307,20 @@ index 30a3b9ec..099da563 100644
 +  return ms2us (s * 1000);
 +}
 -- 
-2.51.0
+2.54.0
 
 
-From 1abd4d5bb0840965a0a01d2230a8e0fa63768f52 Mon Sep 17 00:00:00 2001
+From 672afa7f43c05b1d0af222368e542118ffa3519c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Mon, 30 Jun 2025 16:16:31 +0200
-Subject: [PATCH 07/13] utils: Add helper to close connection and notify
+Subject: [PATCH 07/15] utils: Add helper to close connection and notify
 
 Closing doesn't notify that it was closed, so lets add a helper that
 does so, that we then can uses to rely on the closed property being up
 to date.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 97c7d6f3cdd816704afef5dc6e838fdb449a66f5)
 ---
  src/grd-utils.c | 7 +++++++
  src/grd-utils.h | 2 ++
@@ -322,13 +355,13 @@ index 099da563..4703db8f 100644
  us (int64_t us)
  {
 -- 
-2.51.0
+2.54.0
 
 
-From 8dccf29b75560838843b0b373bcb6346548211c4 Mon Sep 17 00:00:00 2001
+From 579ec1b025fdf8a9ef102d4b5b6870d499830169 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 28 May 2025 22:40:38 +0200
-Subject: [PATCH 08/13] Introduce throttler class
+Subject: [PATCH 08/15] Introduce throttler class
 
 This handles the throttling of incoming connections, and is intended to
 act as a first line of defence against denial of service attacks. It
@@ -348,20 +381,22 @@ file descriptor exceeding the process limit.
 The limits are currently hard coded.
 
 Related: CVE-2025-5024
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 6fdaa79c0215378867d3fd148a2d14b38be2843b)
 ---
- src/grd-throttler.c | 467 ++++++++++++++++++++++++++++++++++++++++++++
+ src/grd-throttler.c | 470 ++++++++++++++++++++++++++++++++++++++++++++
  src/grd-throttler.h |  41 ++++
  src/meson.build     |   2 +
- 3 files changed, 510 insertions(+)
+ 3 files changed, 513 insertions(+)
  create mode 100644 src/grd-throttler.c
  create mode 100644 src/grd-throttler.h
 
 diff --git a/src/grd-throttler.c b/src/grd-throttler.c
 new file mode 100644
-index 00000000..e584433a
+index 00000000..a21563ae
 --- /dev/null
 +++ b/src/grd-throttler.c
-@@ -0,0 +1,467 @@
+@@ -0,0 +1,470 @@
 +/*
 + * Copyright (C) 2025 Red Hat
 + *
@@ -434,6 +469,10 @@ index 00000000..e584433a
 +  if (!timestamps)
 +    return;
 +
++  /* Prune all timestamps older than 1 second, so we can determine how many
++   * connections that happened the last second by looking at how many timestamps
++   * we have.
++   */
 +  for (i = 0; i < timestamps->len; i++)
 +    {
 +      int64_t ts_us = g_array_index (timestamps, int64_t, i);
@@ -487,8 +526,8 @@ index 00000000..e584433a
 +                                     GSocketConnection *connection,
 +                                     GrdPeer           *peer)
 +{
-+  g_return_if_fail (peer->active_connections > 0);
-+  g_return_if_fail (throttler->active_connections > 0);
++  g_assert (peer->active_connections > 0);
++  g_assert (throttler->active_connections > 0);
 +
 +  peer->active_connections--;
 +  throttler->active_connections--;
@@ -617,7 +656,7 @@ index 00000000..e584433a
 +      GSocketConnection *connection;
 +
 +      prune_closed_connections (queue);
-+      connection = g_queue_peek_tail (queue);
++      connection = g_queue_peek_head (queue);
 +
 +      if (!connection)
 +        {
@@ -627,7 +666,7 @@ index 00000000..e584433a
 +
 +      if (is_new_connection_allowed (throttler, peer))
 +        {
-+          g_queue_pop_tail (queue);
++          g_queue_pop_head (queue);
 +          grd_throttler_allow_connection (throttler, connection, peer);
 +          g_object_unref (connection);
 +        }
@@ -659,7 +698,6 @@ index 00000000..e584433a
 +  gpointer key, value;
 +  int64_t next_timeout_us = INT64_MAX;
 +
-+
 +  g_hash_table_iter_init (&iter, throttler->peers);
 +  while (g_hash_table_iter_next (&iter, &key, &value))
 +    {
@@ -711,7 +749,7 @@ index 00000000..e584433a
 +
 +  g_debug ("Delaying connection from %s", peer->name);
 +
-+  g_queue_push_head (delayed_connections, g_object_ref (connection));
++  g_queue_push_tail (delayed_connections, g_object_ref (connection));
 +  maybe_queue_timeout (throttler);
 +}
 +
@@ -890,24 +928,70 @@ index 6b8b517e..3cc63c8b 100644
    'grd-utils.c',
    'grd-utils.h',
 -- 
-2.51.0
+2.54.0
 
 
-From f5e80ab4c6db6e15adebefc11d716f57af8e2eb3 Mon Sep 17 00:00:00 2001
+From ef626acfe780ab53d40ba46a4f9777de453f834f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Wed, 28 May 2025 22:46:27 +0200
-Subject: [PATCH 09/13] rdp-server: Throttle connections using GrdThrottler
+Subject: [PATCH 09/15] rdp-server: Throttle connections using GrdThrottler
 
 This avoids system resource exhaustion by a single attacker.
 
 Related: CVE-2025-5024
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 959cd39ae528a6751d94b0dcff173a470a5bc7ef)
 ---
- src/grd-rdp-server.c  | 27 +++++++++++++++++++++++----
- src/grd-session-rdp.c |  6 ++++++
- 2 files changed, 29 insertions(+), 4 deletions(-)
+ meson.build             |   2 +-
+ src/grd-daemon-system.c |   4 ++
+ src/grd-rdp-server.c    | 100 ++++++++++++++++++++++++++++++++--------
+ src/grd-session-rdp.c   |   5 ++
+ 4 files changed, 92 insertions(+), 19 deletions(-)
 
+diff --git a/meson.build b/meson.build
+index 11c8b466..c71c892d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -116,7 +116,7 @@ cdata.set_quoted('GRD_USERNAME', grd_username)
+ cdata.set_quoted('GRD_SHADER_DIR', grd_shaderdir)
+ 
+ # Workaround for https://github.com/FreeRDP/FreeRDP/issues/11412
+-cdata.set('WITHOUT_FREERDP_3x_DEPRECATED', true)
++#cdata.set('WITHOUT_FREERDP_3x_DEPRECATED', true)
+ 
+ configure_file(input: 'config.h.meson',
+                output: 'config.h',
+diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
+index 82299781..a8dc8dfd 100644
+--- a/src/grd-daemon-system.c
++++ b/src/grd-daemon-system.c
+@@ -35,6 +35,7 @@
+ #include "grd-rdp-server.h"
+ #include "grd-session-rdp.h"
+ #include "grd-settings.h"
++#include "grd-utils.h"
+ 
+ #define MAX_HANDOVER_WAIT_TIME_MS (30 * 1000)
+ 
+@@ -176,6 +177,7 @@ on_handle_take_client (GrdDBusRemoteDesktopRdpHandover *interface,
+                                                              fd_list,
+                                                              fd_variant);
+ 
++  grd_close_connection_and_notify (remote_client->socket_connection);
+   g_clear_object (&remote_client->socket_connection);
+   g_clear_handle_id (&remote_client->abort_handover_source_id, g_source_remove);
+ 
+@@ -554,6 +556,8 @@ grd_remote_client_free (GrdRemoteClient *remote_client)
+   disconnect_from_remote_display (remote_client);
+ 
+   g_clear_pointer (&remote_client->id, g_free);
++  if (remote_client->socket_connection)
++    grd_close_connection_and_notify (remote_client->socket_connection);
+   g_clear_object (&remote_client->socket_connection);
+   unregister_handover_iface (remote_client, remote_client->handover_src);
+   unregister_handover_iface (remote_client, remote_client->handover_dst);
 diff --git a/src/grd-rdp-server.c b/src/grd-rdp-server.c
-index 2691a65d..b8622a13 100644
+index 2691a65d..2132e429 100644
 --- a/src/grd-rdp-server.c
 +++ b/src/grd-rdp-server.c
 @@ -32,6 +32,7 @@
@@ -927,7 +1011,31 @@ index 2691a65d..b8622a13 100644
    GList *sessions;
  
    GList *stopped_sessions;
-@@ -225,14 +228,26 @@ on_incoming (GSocketService    *service,
+@@ -206,18 +209,17 @@ on_routing_token_peeked (GObject      *source_object,
+     }
+ }
+ 
+-static gboolean
+-on_incoming_as_system_headless (GSocketService    *service,
+-                                GSocketConnection *connection)
++static void
++allow_connection_peek_cb (GrdThrottler      *throttler,
++                          GSocketConnection *connection,
++                          gpointer           user_data)
+ {
+-  GrdRdpServer *rdp_server = GRD_RDP_SERVER (service);
++  GrdRdpServer *rdp_server = GRD_RDP_SERVER (user_data);
+ 
+   grd_routing_token_peek_async (rdp_server,
+                                 connection,
+                                 rdp_server->cancellable,
+                                 on_routing_token_peeked);
+-
+-  return TRUE;
+ }
+ 
+ static gboolean
+@@ -225,14 +227,24 @@ on_incoming (GSocketService    *service,
               GSocketConnection *connection)
  {
    GrdRdpServer *rdp_server = GRD_RDP_SERVER (service);
@@ -938,11 +1046,9 @@ index 2691a65d..b8622a13 100644
 +}
 +
 +static void
-+allow_connection_cb (GrdThrottler      *throttler,
-+                     GSocketConnection *connection,
-+                     gpointer           user_data)
++accept_connection (GrdRdpServer      *rdp_server,
++                   GSocketConnection *connection)
 +{
-+  GrdRdpServer *rdp_server = GRD_RDP_SERVER (user_data);
    GrdSessionRdp *session_rdp;
  
 -  g_debug ("New incoming RDP connection");
@@ -956,16 +1062,66 @@ index 2691a65d..b8622a13 100644
  
    rdp_server->sessions = g_list_append (rdp_server->sessions, session_rdp);
  
-@@ -243,8 +258,6 @@ on_incoming (GSocketService    *service,
+@@ -243,15 +255,35 @@ on_incoming (GSocketService    *service,
    g_signal_connect (session_rdp, "post-connected",
                      G_CALLBACK (on_session_post_connect),
                      rdp_server);
--
++}
+ 
 -  return TRUE;
++static void
++allow_connection_accept_cb (GrdThrottler      *throttler,
++                            GSocketConnection *connection,
++                            gpointer           user_data)
++{
++  GrdRdpServer *rdp_server = GRD_RDP_SERVER (user_data);
++
++  accept_connection (rdp_server, connection);
  }
  
  void
-@@ -420,6 +433,8 @@ grd_rdp_server_stop (GrdRdpServer *rdp_server)
+ grd_rdp_server_notify_incoming (GSocketService    *service,
+                                 GSocketConnection *connection)
+ {
+-  on_incoming (service, connection);
++  GrdRdpServer *rdp_server = GRD_RDP_SERVER (service);
++  GrdRuntimeMode runtime_mode = grd_context_get_runtime_mode (rdp_server->context);
++
++  switch (runtime_mode)
++    {
++    case GRD_RUNTIME_MODE_HANDOVER:
++      accept_connection (rdp_server, connection);
++      break;
++    case GRD_RUNTIME_MODE_SYSTEM:
++    case GRD_RUNTIME_MODE_SCREEN_SHARE:
++    case GRD_RUNTIME_MODE_HEADLESS:
++      g_assert_not_reached ();
++    }
+ }
+ 
+ static gboolean
+@@ -378,16 +410,13 @@ grd_rdp_server_start (GrdRdpServer  *rdp_server,
+ 
+   switch (runtime_mode)
+     {
+-    case GRD_RUNTIME_MODE_SCREEN_SHARE:
+-    case GRD_RUNTIME_MODE_HEADLESS:
+-      g_signal_connect (rdp_server, "incoming", G_CALLBACK (on_incoming), NULL);
+-      break;
+     case GRD_RUNTIME_MODE_SYSTEM:
+-      g_signal_connect (rdp_server, "incoming",
+-                        G_CALLBACK (on_incoming_as_system_headless), NULL);
+-
+       g_assert (!rdp_server->cancellable);
+       rdp_server->cancellable = g_cancellable_new ();
++      G_GNUC_FALLTHROUGH;
++    case GRD_RUNTIME_MODE_SCREEN_SHARE:
++    case GRD_RUNTIME_MODE_HEADLESS:
++      g_signal_connect (rdp_server, "incoming", G_CALLBACK (on_incoming), NULL);
+       break;
+     case GRD_RUNTIME_MODE_HANDOVER:
+       break;
+@@ -420,6 +449,8 @@ grd_rdp_server_stop (GrdRdpServer *rdp_server)
    g_clear_handle_id (&rdp_server->cleanup_sessions_idle_id, g_source_remove);
    grd_rdp_server_cleanup_stopped_sessions (rdp_server);
  
@@ -974,7 +1130,7 @@ index 2691a65d..b8622a13 100644
    if (rdp_server->cancellable)
      {
        g_cancellable_cancel (rdp_server->cancellable);
-@@ -479,6 +494,7 @@ grd_rdp_server_dispose (GObject *object)
+@@ -479,6 +510,7 @@ grd_rdp_server_dispose (GObject *object)
    g_assert (!rdp_server->binding_timeout_source_id);
    g_assert (!rdp_server->cleanup_sessions_idle_id);
    g_assert (!rdp_server->stopped_sessions);
@@ -982,18 +1138,64 @@ index 2691a65d..b8622a13 100644
  
    g_assert (!rdp_server->hwaccel_nvidia);
    g_assert (!rdp_server->hwaccel_vulkan);
-@@ -489,6 +505,9 @@ grd_rdp_server_dispose (GObject *object)
+@@ -487,8 +519,32 @@ grd_rdp_server_dispose (GObject *object)
+ }
+ 
  static void
- grd_rdp_server_init (GrdRdpServer *rdp_server)
+-grd_rdp_server_init (GrdRdpServer *rdp_server)
++grd_rdp_server_constructed (GObject *object)
  {
-+  rdp_server->throttler = grd_throttler_new (allow_connection_cb,
-+                                             rdp_server);
++  GrdRdpServer *rdp_server = GRD_RDP_SERVER (object);
++  GrdRuntimeMode runtime_mode =
++    grd_context_get_runtime_mode (rdp_server->context);
++  GrdThrottlerAllowCallback allow_callback = NULL;
++
++  switch (runtime_mode)
++    {
++    case GRD_RUNTIME_MODE_SCREEN_SHARE:
++    case GRD_RUNTIME_MODE_HEADLESS:
++      allow_callback = allow_connection_accept_cb;
++      break;
++    case GRD_RUNTIME_MODE_SYSTEM:
++      allow_callback = allow_connection_peek_cb;
++      break;
++    case GRD_RUNTIME_MODE_HANDOVER:
++      break;
++    }
++
++  if (allow_callback)
++    {
++      rdp_server->throttler = grd_throttler_new (allow_callback,
++                                                 rdp_server);
++    }
 +
    rdp_server->pending_binding_attempts = RDP_SERVER_N_BINDING_ATTEMPTS;
  
    winpr_InitializeSSL (WINPR_SSL_INIT_DEFAULT);
+@@ -498,6 +554,13 @@ grd_rdp_server_init (GrdRdpServer *rdp_server)
+    * Run the primitives benchmark here to save time, when initializing a session
+    */
+   primitives_get ();
++
++  G_OBJECT_CLASS (grd_rdp_server_parent_class)->constructed (object);
++}
++
++static void
++grd_rdp_server_init (GrdRdpServer *rdp_server)
++{
+ }
+ 
+ static void
+@@ -508,6 +571,7 @@ grd_rdp_server_class_init (GrdRdpServerClass *klass)
+   object_class->set_property = grd_rdp_server_set_property;
+   object_class->get_property = grd_rdp_server_get_property;
+   object_class->dispose = grd_rdp_server_dispose;
++  object_class->constructed = grd_rdp_server_constructed;
+ 
+   g_object_class_install_property (object_class,
+                                    PROP_CONTEXT,
 diff --git a/src/grd-session-rdp.c b/src/grd-session-rdp.c
-index cc026064..fcebadd1 100644
+index 91894486..117fb1d1 100644
 --- a/src/grd-session-rdp.c
 +++ b/src/grd-session-rdp.c
 @@ -48,6 +48,7 @@
@@ -1004,7 +1206,7 @@ index cc026064..fcebadd1 100644
  
  #define MAX_MONITOR_COUNT_HEADLESS 16
  #define MAX_MONITOR_COUNT_SCREEN_SHARE 1
-@@ -1635,6 +1636,7 @@ grd_session_rdp_stop (GrdSession *session)
+@@ -1645,6 +1646,7 @@ grd_session_rdp_stop (GrdSession *session)
    g_clear_object (&session_rdp->renderer);
  
    peer->Close (peer);
@@ -1012,29 +1214,31 @@ index cc026064..fcebadd1 100644
    g_clear_object (&session_rdp->connection);
  
    g_clear_object (&rdp_peer_context->network_autodetection);
-@@ -1835,6 +1837,10 @@ grd_session_rdp_dispose (GObject *object)
-   clear_rdp_peer (session_rdp);
-   g_clear_object (&session_rdp->connection);
+@@ -1835,6 +1837,9 @@ grd_session_rdp_dispose (GObject *object)
  
+   g_clear_object (&session_rdp->layout_manager);
+   clear_rdp_peer (session_rdp);
++
 +  if (session_rdp->connection)
 +    grd_close_connection_and_notify (session_rdp->connection);
-+  g_clear_object (&session_rdp->connection);
-+
-   g_clear_object (&session_rdp->renderer);
+   g_clear_object (&session_rdp->connection);
  
-   g_clear_object (&session_rdp->rdp_event_queue);
+   g_clear_object (&session_rdp->renderer);
 -- 
-2.51.0
+2.54.0
 
 
-From 13dfafb9b24964919a513f3d787101390697e62a Mon Sep 17 00:00:00 2001
+From 62b35ed6fbdfcc31c98c23f648a9edaa62a1b33c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Fri, 30 May 2025 16:54:00 +0200
-Subject: [PATCH 10/13] throttler: Introduce limits struct
+Subject: [PATCH 10/15] throttler: Introduce limits struct
 
 This will be used by the server implementation to customize throttling
 limits. This will be used by the VNC server to limit to one global
 session at a time, replacing it's own existing condition.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 503dc304c90b99a4040f71dbf75a2d353ca77237)
 ---
  src/grd-rdp-server.c |  3 ++-
  src/grd-throttler.c  | 64 ++++++++++++++++++++++++++++++++++++--------
@@ -1042,21 +1246,21 @@ session at a time, replacing it's own existing condition.
  3 files changed, 67 insertions(+), 14 deletions(-)
 
 diff --git a/src/grd-rdp-server.c b/src/grd-rdp-server.c
-index b8622a13..43eb2925 100644
+index 2132e429..d8230639 100644
 --- a/src/grd-rdp-server.c
 +++ b/src/grd-rdp-server.c
-@@ -505,7 +505,8 @@ grd_rdp_server_dispose (GObject *object)
- static void
- grd_rdp_server_init (GrdRdpServer *rdp_server)
- {
--  rdp_server->throttler = grd_throttler_new (allow_connection_cb,
-+  rdp_server->throttler = grd_throttler_new (grd_throttler_limits_new (),
-+                                             allow_connection_cb,
-                                              rdp_server);
+@@ -541,7 +541,8 @@ grd_rdp_server_constructed (GObject *object)
+ 
+   if (allow_callback)
+     {
+-      rdp_server->throttler = grd_throttler_new (allow_callback,
++      rdp_server->throttler = grd_throttler_new (grd_throttler_limits_new (),
++                                                 allow_callback,
+                                                  rdp_server);
+     }
  
-   rdp_server->pending_binding_attempts = RDP_SERVER_N_BINDING_ATTEMPTS;
 diff --git a/src/grd-throttler.c b/src/grd-throttler.c
-index e584433a..0429a089 100644
+index a21563ae..5c404ed7 100644
 --- a/src/grd-throttler.c
 +++ b/src/grd-throttler.c
 @@ -23,10 +23,18 @@
@@ -1091,7 +1295,7 @@ index e584433a..0429a089 100644
    int active_connections;
  
    GrdThrottlerAllowCallback allow_callback;
-@@ -215,10 +225,12 @@ static gboolean
+@@ -219,10 +229,12 @@ static gboolean
  is_connection_limit_reached (GrdThrottler *throttler,
                               GrdPeer      *peer)
  {
@@ -1106,7 +1310,7 @@ index e584433a..0429a089 100644
      return TRUE;
  
    return FALSE;
-@@ -228,11 +240,13 @@ static gboolean
+@@ -232,11 +244,13 @@ static gboolean
  is_new_connection_allowed (GrdThrottler *throttler,
                             GrdPeer      *peer)
  {
@@ -1121,7 +1325,7 @@ index e584433a..0429a089 100644
      return FALSE;
  
    return TRUE;
-@@ -291,6 +305,7 @@ ensure_delayed_connections_source (GrdThrottler *throttler)
+@@ -295,6 +309,7 @@ ensure_delayed_connections_source (GrdThrottler *throttler)
  static void
  maybe_queue_timeout (GrdThrottler *throttler)
  {
@@ -1129,7 +1333,7 @@ index e584433a..0429a089 100644
    GHashTableIter iter;
    gpointer key, value;
    int64_t next_timeout_us = INT64_MAX;
-@@ -309,7 +324,7 @@ maybe_queue_timeout (GrdThrottler *throttler)
+@@ -312,7 +327,7 @@ maybe_queue_timeout (GrdThrottler *throttler)
  
        next_timeout_us = MIN (next_timeout_us,
                               peer->last_accept_us +
@@ -1138,7 +1342,7 @@ index e584433a..0429a089 100644
      }
  
  
-@@ -330,6 +345,7 @@ maybe_delay_connection (GrdThrottler      *throttler,
+@@ -333,6 +348,7 @@ maybe_delay_connection (GrdThrottler      *throttler,
                          GrdPeer           *peer,
                          int64_t            now_us)
  {
@@ -1146,7 +1350,7 @@ index e584433a..0429a089 100644
    GQueue *delayed_connections;
  
    delayed_connections = peer->delayed_connections;
-@@ -339,7 +355,7 @@ maybe_delay_connection (GrdThrottler      *throttler,
+@@ -342,7 +358,7 @@ maybe_delay_connection (GrdThrottler      *throttler,
        peer->delayed_connections = delayed_connections;
      }
  
@@ -1155,7 +1359,7 @@ index e584433a..0429a089 100644
      {
        grd_throttler_deny_connection (throttler, peer->name, connection);
        return;
-@@ -413,15 +429,40 @@ grd_throttler_handle_connection (GrdThrottler      *throttler,
+@@ -416,15 +432,40 @@ grd_throttler_handle_connection (GrdThrottler      *throttler,
    maybe_delay_connection (throttler, connection, peer, now_us);
  }
  
@@ -1198,7 +1402,7 @@ index e584433a..0429a089 100644
  
    return throttler;
  }
-@@ -443,6 +484,7 @@ grd_throttler_finalize (GObject *object)
+@@ -446,6 +487,7 @@ grd_throttler_finalize (GObject *object)
  
    g_clear_pointer (&throttler->delayed_connections_source, g_source_destroy);
    g_clear_pointer (&throttler->peers, g_hash_table_unref);
@@ -1239,16 +1443,19 @@ index d57d653a..9e72b8f1 100644
  
  #endif /* GRD_THROTTLER_H */
 -- 
-2.51.0
+2.54.0
 
 
-From 296492022673e322df037c2fe9baa6b485887676 Mon Sep 17 00:00:00 2001
+From 66b8ab530f0acb6bceb98732b2aabc7118f930e6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Fri, 30 May 2025 16:55:46 +0200
-Subject: [PATCH 11/13] vnc-server: Hook up VNC server to the throttler
+Subject: [PATCH 11/15] vnc-server: Hook up VNC server to the throttler
 
 This allows us to replace existing single session limitation with
 limiting the throttler to one accepted connection at any given time.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 555f2be6669d7a182a950866dd2a4d2d49299033)
 ---
  src/grd-session-vnc.c |  2 ++
  src/grd-vnc-server.c  | 48 +++++++++++++++++++++++++++++++------------
@@ -1387,14 +1594,16 @@ index 2f8229b2..fc5020f0 100644
  
  static void
 -- 
-2.51.0
+2.54.0
 
 
-From a57cf99969a71a44eabca06fbf5e548310fcb9e4 Mon Sep 17 00:00:00 2001
+From 479122a3d33fde892c3f71ec4ecec3e9792ac654 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Mon, 30 Jun 2025 16:01:12 +0200
-Subject: [PATCH 12/13] daemon: Add missing newline to error message
+Subject: [PATCH 12/15] daemon: Add missing newline to error message
 
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit b14851df71b52b6cf685d8e39a6eb4425694f9b6)
 ---
  src/grd-daemon.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1413,13 +1622,13 @@ index 98954200..ea17df1d 100644
      }
  
 -- 
-2.51.0
+2.54.0
 
 
-From 97e2e5d6f42f102cdeec962ce83887a4920b1b48 Mon Sep 17 00:00:00 2001
+From 830f73dfcd74d31aaec5049716fcc2449c18f486 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
 Date: Mon, 30 Jun 2025 16:01:37 +0200
-Subject: [PATCH 13/13] throttler: Allow overriding hard coded parallel
+Subject: [PATCH 13/15] throttler: Allow overriding hard coded parallel
  connections limit
 
 Overriding is done via an argument passed to the daemon. This allows
@@ -1427,15 +1636,18 @@ using the same daemon with a larger amount of users, which one would
 achieve by overriding the relevant systemd service file by both adding
 the --max-parallel-connections argument, as well as bumping the limit of
 number of open file descriptors to something adequate.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/321>
+(cherry picked from commit 23b0761f09f5d722cde6922c2a095f165820e63b)
 ---
  src/grd-daemon.c     | 24 ++++++++++++++++++++++++
- src/grd-rdp-server.c | 19 +++++++++++++++----
+ src/grd-rdp-server.c |  7 ++++---
  src/grd-settings.c   | 19 +++++++++++++++++++
  src/grd-settings.h   |  5 +++++
  src/grd-throttler.c  |  9 ++++++---
  src/grd-throttler.h  |  4 +++-
  src/grd-vnc-server.c | 18 +++++++++---------
- 7 files changed, 81 insertions(+), 17 deletions(-)
+ 7 files changed, 70 insertions(+), 16 deletions(-)
 
 diff --git a/src/grd-daemon.c b/src/grd-daemon.c
 index ea17df1d..7e1a0a34 100644
@@ -1507,50 +1719,23 @@ index ea17df1d..7e1a0a34 100644
    return g_application_run (G_APPLICATION (daemon), argc, argv);
  }
 diff --git a/src/grd-rdp-server.c b/src/grd-rdp-server.c
-index 43eb2925..be1c315e 100644
+index d8230639..cb3ce4d3 100644
 --- a/src/grd-rdp-server.c
 +++ b/src/grd-rdp-server.c
-@@ -503,11 +503,14 @@ grd_rdp_server_dispose (GObject *object)
- }
+@@ -541,9 +541,10 @@ grd_rdp_server_constructed (GObject *object)
  
- static void
--grd_rdp_server_init (GrdRdpServer *rdp_server)
-+grd_rdp_server_constructed (GObject *object)
- {
--  rdp_server->throttler = grd_throttler_new (grd_throttler_limits_new (),
--                                             allow_connection_cb,
--                                             rdp_server);
-+  GrdRdpServer *rdp_server = GRD_RDP_SERVER (object);
-+
-+  rdp_server->throttler =
-+    grd_throttler_new (grd_throttler_limits_new (rdp_server->context),
-+                       allow_connection_cb,
-+                       rdp_server);
+   if (allow_callback)
+     {
+-      rdp_server->throttler = grd_throttler_new (grd_throttler_limits_new (),
+-                                                 allow_callback,
+-                                                 rdp_server);
++      rdp_server->throttler =
++        grd_throttler_new (grd_throttler_limits_new (rdp_server->context),
++                           allow_callback,
++                           rdp_server);
+     }
  
    rdp_server->pending_binding_attempts = RDP_SERVER_N_BINDING_ATTEMPTS;
- 
-@@ -518,6 +521,13 @@ grd_rdp_server_init (GrdRdpServer *rdp_server)
-    * Run the primitives benchmark here to save time, when initializing a session
-    */
-   primitives_get ();
-+
-+  G_OBJECT_CLASS (grd_rdp_server_parent_class)->constructed (object);
-+}
-+
-+static void
-+grd_rdp_server_init (GrdRdpServer *rdp_server)
-+{
- }
- 
- static void
-@@ -528,6 +538,7 @@ grd_rdp_server_class_init (GrdRdpServerClass *klass)
-   object_class->set_property = grd_rdp_server_set_property;
-   object_class->get_property = grd_rdp_server_get_property;
-   object_class->dispose = grd_rdp_server_dispose;
-+  object_class->constructed = grd_rdp_server_constructed;
- 
-   g_object_class_install_property (object_class,
-                                    PROP_CONTEXT,
 diff --git a/src/grd-settings.c b/src/grd-settings.c
 index a65385ef..46b8ad4b 100644
 --- a/src/grd-settings.c
@@ -1605,7 +1790,7 @@ index 6660b962..94dfd3b2 100644
                                       int          port);
  
 diff --git a/src/grd-throttler.c b/src/grd-throttler.c
-index 0429a089..9ec31b35 100644
+index 5c404ed7..8f19783f 100644
 --- a/src/grd-throttler.c
 +++ b/src/grd-throttler.c
 @@ -21,9 +21,10 @@
@@ -1620,7 +1805,7 @@ index 0429a089..9ec31b35 100644
  #define DEFAULT_MAX_CONNECTIONS_PER_PEER 5
  #define DEFAULT_MAX_PENDING_CONNECTIONS 5
  #define DEFAULT_MAX_ATTEMPTS_PER_SECOND 10
-@@ -437,12 +438,14 @@ grd_throttler_limits_set_max_global_connections (GrdThrottlerLimits *limits,
+@@ -440,12 +441,14 @@ grd_throttler_limits_set_max_global_connections (GrdThrottlerLimits *limits,
  }
  
  GrdThrottlerLimits *
@@ -1702,5 +1887,246 @@ index fc5020f0..705ed416 100644
  
  static void
 -- 
-2.51.0
+2.54.0
+
+
+From 8813062d34b8a76df87d43c81f2770c96500bd61 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Thu, 25 Jun 2026 22:27:27 +0200
+Subject: [PATCH 14/15] throttler: Add 'namespace' to throttler debug output
+
+This makes it easier to grep.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/402>
+(cherry picked from commit abbae36f89f600bd86289bb9c3bc884a846b21e0)
+---
+ src/grd-throttler.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/grd-throttler.c b/src/grd-throttler.c
+index 8f19783f..9a343397 100644
+--- a/src/grd-throttler.c
++++ b/src/grd-throttler.c
+@@ -153,7 +153,7 @@ grd_throttler_deny_connection (GrdThrottler      *throttler,
+                                const char        *peer_name,
+                                GSocketConnection *connection)
+ {
+-  g_debug ("Denying connection from %s", peer_name);
++  g_debug ("[Throttler] Denying connection from %s", peer_name);
+   g_io_stream_close (G_IO_STREAM (connection), NULL, NULL);
+ }
+ 
+@@ -177,7 +177,7 @@ grd_throttler_allow_connection (GrdThrottler      *throttler,
+                                 GSocketConnection *connection,
+                                 GrdPeer           *peer)
+ {
+-  g_debug ("Accepting connection from %s", peer->name);
++  g_debug ("[Throttler] Accepting connection from %s", peer->name);
+ 
+   throttler->allow_callback (throttler, connection, throttler->user_data);
+ 
+@@ -365,7 +365,7 @@ maybe_delay_connection (GrdThrottler      *throttler,
+       return;
+     }
+ 
+-  g_debug ("Delaying connection from %s", peer->name);
++  g_debug ("[Throttler] Delaying connection from %s", peer->name);
+ 
+   g_queue_push_tail (delayed_connections, g_object_ref (connection));
+   maybe_queue_timeout (throttler);
+@@ -415,7 +415,7 @@ grd_throttler_handle_connection (GrdThrottler      *throttler,
+     g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (remote_address));
+   peer_name = g_inet_address_to_string (inet_address);
+ 
+-  g_debug ("New incoming connection from %s", peer_name);
++  g_debug ("[Throttler] New incoming connection from %s", peer_name);
+ 
+   peer = ensure_peer (throttler, peer_name);
+ 
+-- 
+2.54.0
+
+
+From 5504a4eacb4a1cb70de5b36206447c6261af86dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Thu, 25 Jun 2026 14:05:51 +0200
+Subject: [PATCH 15/15] throttler: Replace connecting to notify::closed to
+ qdata callback
+
+Using the notify::closed signal was insufficient since it was not
+implicitly signalled when the socket was closed due to the last
+reference to the object was released, meaning one needed to manually
+emit it when appropriate. Replace this by storing enough state in the
+already used qdata data bank to allow us to do the equivalent cleanup
+when the socket is freed, which should be the same time that it is
+closed in our case.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/work_items/332
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/402>
+(cherry picked from commit ecd871dd679e3b68e79cd857aa32a04df1aec8ff)
+---
+ src/grd-daemon-system.c |  3 ---
+ src/grd-session-rdp.c   |  3 ---
+ src/grd-session-vnc.c   |  1 -
+ src/grd-throttler.c     | 41 ++++++++++++++++++++++++++++++-----------
+ src/grd-utils.c         |  7 -------
+ src/grd-utils.h         |  2 --
+ 6 files changed, 30 insertions(+), 27 deletions(-)
+
+diff --git a/src/grd-daemon-system.c b/src/grd-daemon-system.c
+index a8dc8dfd..97c37b20 100644
+--- a/src/grd-daemon-system.c
++++ b/src/grd-daemon-system.c
+@@ -177,7 +177,6 @@ on_handle_take_client (GrdDBusRemoteDesktopRdpHandover *interface,
+                                                              fd_list,
+                                                              fd_variant);
+ 
+-  grd_close_connection_and_notify (remote_client->socket_connection);
+   g_clear_object (&remote_client->socket_connection);
+   g_clear_handle_id (&remote_client->abort_handover_source_id, g_source_remove);
+ 
+@@ -556,8 +555,6 @@ grd_remote_client_free (GrdRemoteClient *remote_client)
+   disconnect_from_remote_display (remote_client);
+ 
+   g_clear_pointer (&remote_client->id, g_free);
+-  if (remote_client->socket_connection)
+-    grd_close_connection_and_notify (remote_client->socket_connection);
+   g_clear_object (&remote_client->socket_connection);
+   unregister_handover_iface (remote_client, remote_client->handover_src);
+   unregister_handover_iface (remote_client, remote_client->handover_dst);
+diff --git a/src/grd-session-rdp.c b/src/grd-session-rdp.c
+index 117fb1d1..225b9a67 100644
+--- a/src/grd-session-rdp.c
++++ b/src/grd-session-rdp.c
+@@ -1646,7 +1646,6 @@ grd_session_rdp_stop (GrdSession *session)
+   g_clear_object (&session_rdp->renderer);
+ 
+   peer->Close (peer);
+-  grd_close_connection_and_notify (session_rdp->connection);
+   g_clear_object (&session_rdp->connection);
+ 
+   g_clear_object (&rdp_peer_context->network_autodetection);
+@@ -1838,8 +1837,6 @@ grd_session_rdp_dispose (GObject *object)
+   g_clear_object (&session_rdp->layout_manager);
+   clear_rdp_peer (session_rdp);
+ 
+-  if (session_rdp->connection)
+-    grd_close_connection_and_notify (session_rdp->connection);
+   g_clear_object (&session_rdp->connection);
+ 
+   g_clear_object (&session_rdp->renderer);
+diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
+index ba0926f2..9293345e 100644
+--- a/src/grd-session-vnc.c
++++ b/src/grd-session-vnc.c
+@@ -943,7 +943,6 @@ grd_session_vnc_stop (GrdSession *session)
+ 
+   grd_session_vnc_pause (session_vnc);
+ 
+-  grd_close_connection_and_notify (session_vnc->connection);
+   g_clear_object (&session_vnc->connection);
+   g_clear_object (&session_vnc->clipboard_vnc);
+   g_clear_pointer (&session_vnc->rfb_screen->frameBuffer, g_free);
+diff --git a/src/grd-throttler.c b/src/grd-throttler.c
+index 9a343397..bb5052d9 100644
+--- a/src/grd-throttler.c
++++ b/src/grd-throttler.c
+@@ -157,19 +157,32 @@ grd_throttler_deny_connection (GrdThrottler      *throttler,
+   g_io_stream_close (G_IO_STREAM (connection), NULL, NULL);
+ }
+ 
++typedef struct _ConnectionData
++{
++  GrdThrottler *throttler;
++  char *peer_name;
++  GSocketConnection *connection;
++} ConnectionData;
++
+ static void
+-on_connection_closed_changed (GSocketConnection *connection,
+-                              GParamSpec        *pspec,
+-                              GrdThrottler      *throttler)
++connection_data_free (ConnectionData *connection_data)
+ {
+-  const char *peer_name;
++  GrdThrottler *throttler;
+   GrdPeer *peer;
+ 
+-  g_assert (g_io_stream_is_closed (G_IO_STREAM (connection)));
++  throttler = connection_data->throttler;
++  if (throttler)
++    {
++      g_clear_weak_pointer (&connection_data->throttler);
++
++      peer = g_hash_table_lookup (throttler->peers, connection_data->peer_name);
++      grd_throttler_unregister_connection (throttler,
++                                           connection_data->connection,
++                                           peer);
++    }
+ 
+-  peer_name = g_object_get_qdata (G_OBJECT (connection), quark_remote_address);
+-  peer = g_hash_table_lookup (throttler->peers, peer_name);
+-  grd_throttler_unregister_connection (throttler, connection, peer);
++  g_free (connection_data->peer_name);
++  g_free (connection_data);
+ }
+ 
+ static void
+@@ -177,17 +190,23 @@ grd_throttler_allow_connection (GrdThrottler      *throttler,
+                                 GSocketConnection *connection,
+                                 GrdPeer           *peer)
+ {
++  ConnectionData *connection_data;
++
+   g_debug ("[Throttler] Accepting connection from %s", peer->name);
+ 
++  connection_data = g_new0 (ConnectionData, 1);
++  g_set_weak_pointer (&connection_data->throttler, throttler);
++  connection_data->connection = connection;
++  connection_data->peer_name = g_strdup (peer->name);
++
+   throttler->allow_callback (throttler, connection, throttler->user_data);
+ 
+   peer->last_accept_us = g_get_monotonic_time ();
+ 
+   g_object_set_qdata_full (G_OBJECT (connection), quark_remote_address,
+-                           g_strdup (peer->name), g_free);
++                           connection_data,
++                           (GDestroyNotify) connection_data_free);
+   grd_throttler_register_connection (throttler, peer);
+-  g_signal_connect (connection, "notify::closed",
+-                    G_CALLBACK (on_connection_closed_changed), throttler);
+ }
+ 
+ static gboolean
+diff --git a/src/grd-utils.c b/src/grd-utils.c
+index bf208828..32739a93 100644
+--- a/src/grd-utils.c
++++ b/src/grd-utils.c
+@@ -478,10 +478,3 @@ grd_systemd_unit_get_active_state (GDBusProxy                 *unit_proxy,
+ 
+   return TRUE;
+ }
+-
+-void
+-grd_close_connection_and_notify (GSocketConnection *connection)
+-{
+-  g_io_stream_close (G_IO_STREAM (connection), NULL, NULL);
+-  g_object_notify (G_OBJECT (connection), "closed");
+-}
+diff --git a/src/grd-utils.h b/src/grd-utils.h
+index 4703db8f..099da563 100644
+--- a/src/grd-utils.h
++++ b/src/grd-utils.h
+@@ -100,8 +100,6 @@ gboolean grd_systemd_unit_get_active_state (GDBusProxy                 *unit_pro
+                                             GrdSystemdUnitActiveState  *active_state,
+                                             GError                    **error);
+ 
+-void grd_close_connection_and_notify (GSocketConnection *connection);
+-
+ static inline int64_t
+ us (int64_t us)
+ {
+-- 
+2.54.0
 
diff --git a/gnome-remote-desktop.spec b/gnome-remote-desktop.spec
index d55c1b9..6682799 100644
--- a/gnome-remote-desktop.spec
+++ b/gnome-remote-desktop.spec
@@ -22,6 +22,8 @@ Source0:        https://download.gnome.org/sources/%{name}/49/%{name}-%{tarball_
 
 # Adds encryption support (requires patched LibVNCServer)
 Patch0:         gnutls-anontls.patch
+
+# Connection throttling (RHEL-222511)
 Patch1:         connection-throttling.patch
 
 # Depends on FreeRDP 3.15; drop this patch once FreeRDP is updated.
@@ -33,6 +35,7 @@ Patch4:         0001-daemon-handover-Move-callback-definitions-earlier-in.patch
 Patch5:         0001-daemon-system-Respect-existing-remote_id-from-third-.patch
 
 BuildRequires:  asciidoc
+
 BuildRequires:  gcc
 BuildRequires:  meson >= 1.4.0
 BuildRequires:  systemd-rpm-macros