diff --git a/debian/changelog b/debian/changelog
index a0ccc37e..1e84ef29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell-extensions (3.22.2-2) UNRELEASED; urgency=medium
+
+  * Add adapt-to-gsd324.patch (Closes: #869948):
+    - Adjust gnome-session file for gnome-settings-daemon 3.24
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 27 Jul 2017 18:09:33 -0400
+
 gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/adapt-to-gsd324.patch b/debian/patches/adapt-to-gsd324.patch
new file mode 100644
index 00000000..be3ebb77
--- /dev/null
+++ b/debian/patches/adapt-to-gsd324.patch
@@ -0,0 +1,22 @@
+From 4fa73145b489423ef099aa1229193352ae6e2a77 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Tue, 2 May 2017 19:25:53 +0200
+Subject: data: Adjust to g-s-d's plugin removals
+
+These plugins have been removed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782233
+---
+ data/gnome-classic.session.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in
+index b7b8d02..392ec37 100644
+--- a/data/gnome-classic.session.desktop.in
++++ b/data/gnome-classic.session.desktop.in
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+ Name=GNOME Classic
+-RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic;
++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
+
diff --git a/debian/patches/dont-require-nautilus-classic.patch b/debian/patches/dont-require-nautilus-classic.patch
index 2140dfe6..5f18c367 100644
--- a/debian/patches/dont-require-nautilus-classic.patch
+++ b/debian/patches/dont-require-nautilus-classic.patch
@@ -7,5 +7,5 @@ Bug: https://bugzilla.gnome.org/695088
 @@ -1,3 +1,3 @@
  [GNOME Session]
  Name=GNOME Classic
--RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic;
-+RequiredComponents=org.gnome.Shell;gnome-settings-daemon;
+-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
diff --git a/debian/patches/series b/debian/patches/series
index 6410b5c4..0dfabebe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+adapt-to-gsd324.patch
 dont-require-nautilus-classic.patch
 gnome-session-classic-wrapper-script.patch