diff -Nru gnome-settings-daemon-3.28.1/debian/changelog gnome-settings-daemon-3.28.1/debian/changelog
--- gnome-settings-daemon-3.28.1/debian/changelog	2018-04-13 08:19:32.000000000 +0000
+++ gnome-settings-daemon-3.28.1/debian/changelog	2018-04-19 19:15:23.000000000 +0000
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.28.1-1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 3.24.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 16:16:39 +0000]
+  * Hack out wayland support.
+  [changes introduced in 3.28.0-1+rpi1 by Peter Michael Green]
+  * Disable wayland in meson_options.txt
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Apr 2018 19:15:23 +0000
+
 gnome-settings-daemon (3.28.1-1) unstable; urgency=medium
 
   * New upstream release 
diff -Nru gnome-settings-daemon-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch gnome-settings-daemon-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch
--- gnome-settings-daemon-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch	1970-01-01 00:00:00.000000000 +0000
+++ gnome-settings-daemon-3.28.1/debian/patches/disable-wayland-in-meson_options.txt.patch	2018-04-19 19:15:22.000000000 +0000
@@ -0,0 +1,16 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Fri, 23 Mar 2018 23:32:25 +0000
+X-Dgit-Generated: 3.28.0-1+rpi1 3b9653d8537bd1857372d286b4015fe3cca9702b
+Subject: Disable wayland in meson_options.txt
+
+
+---
+
+--- gnome-settings-daemon-3.28.0.orig/meson_options.txt
++++ gnome-settings-daemon-3.28.0/meson_options.txt
+@@ -7,4 +7,4 @@ option('cups', type: 'boolean', value: t
+ option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not optional on Linux platforms)')
+ option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
+ option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
+-option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
++option('wayland', type: 'boolean', value: false, description: 'build with Wayland support')
diff -Nru gnome-settings-daemon-3.28.1/debian/patches/hack-out-wayland.patch gnome-settings-daemon-3.28.1/debian/patches/hack-out-wayland.patch
--- gnome-settings-daemon-3.28.1/debian/patches/hack-out-wayland.patch	1970-01-01 00:00:00.000000000 +0000
+++ gnome-settings-daemon-3.28.1/debian/patches/hack-out-wayland.patch	2018-04-19 19:15:22.000000000 +0000
@@ -0,0 +1,25 @@
+Description:  Hack out wayland support.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- gnome-settings-daemon-3.24.3.orig/plugins/common/gsd-device-manager-udev.c
++++ gnome-settings-daemon-3.24.3/plugins/common/gsd-device-manager-udev.c
+@@ -24,7 +24,7 @@
+ #include <string.h>
+ #include <gudev/gudev.h>
+ 
+-#include <gdk/gdkwayland.h>
++//#include <gdk/gdkwayland.h>
+ #include "gsd-device-manager-udev.h"
+ 
+ struct _GsdUdevDeviceManager
+@@ -237,8 +237,8 @@ gsd_udev_device_manager_lookup_device (G
+ 	GHashTableIter iter;
+ 	GsdDevice *device;
+ 
+-	node_path = gdk_wayland_device_get_node_path (gdk_device);
+-	if (!node_path)
++	//node_path = gdk_wayland_device_get_node_path (gdk_device);
++	//if (!node_path)
+ 		return NULL;
+ 
+ 	g_hash_table_iter_init (&iter, GSD_UDEV_DEVICE_MANAGER (manager)->devices);
diff -Nru gnome-settings-daemon-3.28.1/debian/patches/series gnome-settings-daemon-3.28.1/debian/patches/series
--- gnome-settings-daemon-3.28.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ gnome-settings-daemon-3.28.1/debian/patches/series	2018-04-19 19:15:22.000000000 +0000
@@ -0,0 +1,2 @@
+hack-out-wayland.patch
+disable-wayland-in-meson_options.txt.patch