diff -Nru mutter-3.20.3/debian/changelog mutter-3.20.3/debian/changelog
--- mutter-3.20.3/debian/changelog	2016-07-01 08:19:01.000000000 +0000
+++ mutter-3.20.3/debian/changelog	2016-07-09 22:41:00.000000000 +0000
@@ -1,3 +1,15 @@
+mutter (3.20.3-2+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 3.14.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 25 May 2015 01:53:01 +0000]
+  * Move libsystemd-dev from build-depends to build-conflicts and add
+    libsystemd-login-dev to build-conflicts to prevent build of native backend 
+    which fails with non-egl clutter.
+  [changes introduced in 3.16.2-2+rpi1 by Peter Michael Green]
+  * Remove --enable-native-backend and --enable-wayland from 
+    DEB_CONFIGURE_EXTRA_FLAGS in debian/rules
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 08 Jul 2016 00:36:39 +0000
+
 mutter (3.20.3-2) unstable; urgency=medium
 
   [ Simon McVittie ]
diff -Nru mutter-3.20.3/debian/control mutter-3.20.3/debian/control
--- mutter-3.20.3/debian/control	2016-07-01 08:26:38.000000000 +0000
+++ mutter-3.20.3/debian/control	2016-07-09 22:45:25.000000000 +0000
@@ -28,7 +28,6 @@
                libgudev-1.0-dev [linux-any],
                libinput-dev [linux-any],
                libstartup-notification0-dev (>= 0.7),
-               libsystemd-dev (>= 212) [linux-any],
                libupower-glib-dev (>= 0.99.0),
                libxcb-randr0-dev,
                libxcomposite-dev (>= 1:0.2),
@@ -53,6 +52,9 @@
                wayland-protocols (>= 1.1) [linux-any],
                xkb-data,
                zenity
+Build-conflicts:
+               libsystemd-login-dev,
+               libsystemd-dev
 Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter
diff -Nru mutter-3.20.3/debian/control.in mutter-3.20.3/debian/control.in
--- mutter-3.20.3/debian/control.in	2016-07-01 07:15:34.000000000 +0000
+++ mutter-3.20.3/debian/control.in	2016-07-09 22:34:47.000000000 +0000
@@ -24,7 +24,6 @@
                libgudev-1.0-dev [linux-any],
                libinput-dev [linux-any],
                libstartup-notification0-dev (>= 0.7),
-               libsystemd-dev (>= 212) [linux-any],
                libupower-glib-dev (>= 0.99.0),
                libxcb-randr0-dev,
                libxcomposite-dev (>= 1:0.2),
@@ -49,6 +48,9 @@
                wayland-protocols (>= 1.1) [linux-any],
                xkb-data,
                zenity
+Build-conflicts:
+               libsystemd-login-dev,
+               libsystemd-dev
 Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter
diff -Nru mutter-3.20.3/debian/rules mutter-3.20.3/debian/rules
--- mutter-3.20.3/debian/rules	2016-07-01 07:15:56.000000000 +0000
+++ mutter-3.20.3/debian/rules	2016-07-09 22:40:04.000000000 +0000
@@ -10,11 +10,6 @@
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-CONFFLAGS = \
-	--enable-wayland \
-	--enable-native-backend
-endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \