diff -Nru gtk+3.0-3.18.6/debian/changelog gtk+3.0-3.18.6/debian/changelog
--- gtk+3.0-3.18.6/debian/changelog	2015-12-08 14:11:25.000000000 +0000
+++ gtk+3.0-3.18.6/debian/changelog	2015-12-26 16:13:54.000000000 +0000
@@ -1,3 +1,14 @@
+gtk+3.0 (3.18.6-1+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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 26 Dec 2015 16:13:53 +0000
+
 gtk+3.0 (3.18.6-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru gtk+3.0-3.18.6/debian/control gtk+3.0-3.18.6/debian/control
--- gtk+3.0-3.18.6/debian/control	2015-12-08 14:11:55.000000000 +0000
+++ gtk+3.0-3.18.6/debian/control	2015-12-26 16:13:54.000000000 +0000
@@ -21,9 +21,7 @@
                libpango1.0-dev (>= 1.37.3),
                libatk1.0-dev (>= 2.15.1),
                libatk-bridge2.0-dev,
-               libegl1-mesa-dev [linux-any],
                libepoxy-dev,
-               libwayland-dev (>= 1.5.91) [linux-any],
                libxkbcommon-dev (>= 0.2.0),
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
@@ -47,6 +45,9 @@
                gobject-introspection (>= 1.41.3),
                libgirepository1.0-dev (>= 1.39.0),
                xvfb
+Build-Conflicts:
+               libegl1-mesa-dev,
+               libwayland-dev
 Build-Depends-Indep: docbook-xml,
                      docbook-utils,
                      libglib2.0-doc,
@@ -158,8 +159,6 @@
          libxcomposite-dev,
          libxdamage-dev,
          pkg-config,
-         libegl1-mesa-dev [linux-any],
-         libwayland-dev (>= 1.5.91) [linux-any],
          libxkbcommon-dev
 Suggests: libgtk-3-doc
 Description: development files for the GTK+ library
diff -Nru gtk+3.0-3.18.6/debian/control.in gtk+3.0-3.18.6/debian/control.in
--- gtk+3.0-3.18.6/debian/control.in	2015-12-08 14:11:55.000000000 +0000
+++ gtk+3.0-3.18.6/debian/control.in	2015-12-26 16:49:10.000000000 +0000
@@ -21,9 +21,7 @@
                libpango1.0-dev (>= 1.37.3),
                libatk1.0-dev (>= 2.15.1),
                libatk-bridge2.0-dev,
-               libegl1-mesa-dev [linux-any],
                libepoxy-dev,
-               libwayland-dev (>= 1.5.91) [linux-any],
                libxkbcommon-dev (>= 0.2.0),
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
@@ -47,6 +45,9 @@
                gobject-introspection (>= 1.41.3),
                libgirepository1.0-dev (>= 1.39.0),
                xvfb
+Build-Conflicts:
+               libegl1-mesa-dev,
+               libwayland-dev
 Build-Depends-Indep: docbook-xml,
                      docbook-utils,
                      libglib2.0-doc,
@@ -158,8 +159,6 @@
          libxcomposite-dev,
          libxdamage-dev,
          pkg-config,
-         libegl1-mesa-dev [linux-any],
-         libwayland-dev (>= 1.5.91) [linux-any],
          libxkbcommon-dev
 Suggests: @DOC_PKG@
 Description: development files for the GTK+ library
diff -Nru gtk+3.0-3.18.6/debian/rules gtk+3.0-3.18.6/debian/rules
--- gtk+3.0-3.18.6/debian/rules	2015-10-07 22:18:30.000000000 +0000
+++ gtk+3.0-3.18.6/debian/rules	2015-12-26 16:13:54.000000000 +0000
@@ -85,11 +85,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 \
@@ -156,8 +156,11 @@
 	touch debian/control.in
 	rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
 	rm -f testsuite/reftests/*.ui.known_fail
+	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/style-properties-nth-child.ui.known_fail
 	touch testsuite/reftests/label-text-shadow-changes-modify-clip.ui.known_fail