diff -Nru gtk+3.0-3.21.5/debian/changelog gtk+3.0-3.21.5/debian/changelog
--- gtk+3.0-3.21.5/debian/changelog	2016-08-31 21:41:32.000000000 +0000
+++ gtk+3.0-3.21.5/debian/changelog	2016-09-08 10:15:16.000000000 +0000
@@ -1,3 +1,16 @@
+gtk+3.0 (3.21.5-3+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Sep 2015 01:49:45 +0000]
+  * Disable wayland backend in debian/rules
+  * Move libegl1-mesa-dev and libwayland-dev from Depends and Build-Depends to
+    Build-Conflicts
+  * Add symbols file hack for wayland changes.
+  * Fix clean target.
+  [changes introduced in 3.20.6-2+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 08 Sep 2016 10:15:16 +0000
+
 gtk+3.0 (3.21.5-3) unstable; urgency=medium
 
   * Mark two more reftests as known_fail and make test-suite failures fatal
diff -Nru gtk+3.0-3.21.5/debian/control gtk+3.0-3.21.5/debian/control
--- gtk+3.0-3.21.5/debian/control	2016-08-31 21:41:32.000000000 +0000
+++ gtk+3.0-3.21.5/debian/control	2016-09-08 10:15:16.000000000 +0000
@@ -22,11 +22,8 @@
                libpango1.0-dev (>= 1.37.3),
                libatk1.0-dev (>= 2.15.1),
                libatk-bridge2.0-dev,
-               libegl1-mesa-dev [linux-any],
                libepoxy-dev,
                libharfbuzz-dev (>= 0.9),
-               libwayland-dev (>= 1.9.91) [linux-any],
-               wayland-protocols (>= 1.6) [linux-any],
                libxkbcommon-dev (>= 0.2.0),
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
@@ -53,6 +50,9 @@
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>,
+Build-Conflicts:
+               libegl1-mesa-dev,
+               libwayland-dev
 Build-Depends-Indep: libglib2.0-doc,
                      libatk1.0-doc,
                      libpango1.0-doc,
@@ -165,9 +165,6 @@
          libxcomposite-dev,
          libxdamage-dev,
          pkg-config,
-         libegl1-mesa-dev [linux-any],
-         libwayland-dev (>= 1.9.91) [linux-any],
-         wayland-protocols (>= 1.1) [linux-any],
          libxkbcommon-dev
 Suggests: libgtk-3-doc
 Description: development files for the GTK+ library
diff -Nru gtk+3.0-3.21.5/debian/control.in gtk+3.0-3.21.5/debian/control.in
--- gtk+3.0-3.21.5/debian/control.in	2016-08-31 21:41:32.000000000 +0000
+++ gtk+3.0-3.21.5/debian/control.in	2016-09-08 10:15:16.000000000 +0000
@@ -22,11 +22,8 @@
                libpango1.0-dev (>= 1.37.3),
                libatk1.0-dev (>= 2.15.1),
                libatk-bridge2.0-dev,
-               libegl1-mesa-dev [linux-any],
                libepoxy-dev,
                libharfbuzz-dev (>= 0.9),
-               libwayland-dev (>= 1.9.91) [linux-any],
-               wayland-protocols (>= 1.6) [linux-any],
                libxkbcommon-dev (>= 0.2.0),
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
@@ -53,6 +50,9 @@
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>,
+Build-Conflicts:
+               libegl1-mesa-dev,
+               libwayland-dev
 Build-Depends-Indep: libglib2.0-doc,
                      libatk1.0-doc,
                      libpango1.0-doc,
@@ -165,9 +165,6 @@
          libxcomposite-dev,
          libxdamage-dev,
          pkg-config,
-         libegl1-mesa-dev [linux-any],
-         libwayland-dev (>= 1.9.91) [linux-any],
-         wayland-protocols (>= 1.1) [linux-any],
          libxkbcommon-dev
 Suggests: @DOC_PKG@
 Description: development files for the GTK+ library
diff -Nru gtk+3.0-3.21.5/debian/rules gtk+3.0-3.21.5/debian/rules
--- gtk+3.0-3.21.5/debian/rules	2016-08-31 21:40:02.000000000 +0000
+++ gtk+3.0-3.21.5/debian/rules	2016-09-08 10:15:16.000000000 +0000
@@ -86,11 +86,11 @@
 DEB_CONFIGURE_FLAGS_shared += --disable-colord
 endif
 
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-DEB_CONFIGURE_FLAGS_shared += --enable-wayland-backend
-else
+#ifeq (linux,$(DEB_HOST_ARCH_OS))
+#DEB_CONFIGURE_FLAGS_shared += --enable-wayland-backend
+#else
 DEB_CONFIGURE_FLAGS_shared += --disable-wayland-backend
-endif
+#endif
 
 DEB_CONFIGURE_FLAGS_shared_udeb = \
 			--disable-broadway-backend \
@@ -118,7 +118,7 @@
 # Get failing tests' stdout/err so we have some information when a build fails
 export VERBOSE=1
 
-DEB_MAKE_CHECK_TARGET = -k check
+DEB_MAKE_CHECK_TARGET =
 DEB_INSTALL_DOCS_ALL = AUTHORS
 DEB_INSTALL_DOCS_$(COMMON_PKG) = README NEWS
 DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in
@@ -164,8 +164,11 @@
 	rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
 	rm -f testsuite/reftests/*.ui.known_fail
 	rm -rf debian/build debian/install
+	sed -i s/optional=nowayland/arch=linux-any/ debian/libgtk-3-0.symbols
+	rm -rf debian/build debian/install
 
 pre-build::
+	sed -i s/arch=linux-any/optional=nowayland/ debian/libgtk-3-0.symbols
 	# Mark reftests with known failures as non-fatal
 	touch testsuite/reftests/nonresizable-size.ui.known_fail
 	touch testsuite/reftests/window-show-contents-on-map.ui.known_fail