diff -u gcc-6-6.4.0/debian/changelog gcc-6-6.4.0/debian/changelog
--- gcc-6-6.4.0/debian/changelog
+++ gcc-6-6.4.0/debian/changelog
@@ -1,3 +1,7 @@
+gcc-6 (6.4.0-3+rpi1) buster-staging; urgency=medium
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Aug 2017 14:47:38 +0000
+
 gcc-6 (6.4.0-3) unstable; urgency=medium
 
   * Update to SVN 20170805 (r250889) from the gcc-6-branch.
@@ -86,6 +90,13 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 18 Jun 2017 16:21:31 +0200
 
+gcc-6 (6.3.0-18+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 6.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 11 May 2016 20:56:09 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Jun 2017 13:33:01 +0000
+
 gcc-6 (6.3.0-18) unstable; urgency=medium
 
   * Update to SVN 20170516 (r248076) from the gcc-6-branch.
diff -u gcc-6-6.4.0/debian/rules.defs gcc-6-6.4.0/debian/rules.defs
--- gcc-6-6.4.0/debian/rules.defs
+++ gcc-6-6.4.0/debian/rules.defs
@@ -1507,7 +1507,7 @@
 # run testsuite ---------------
 with_check := yes
 # if you don't want to run the gcc testsuite, uncomment the next line
-#with_check := disabled by hand
+with_check := disabled by plugwash
 ifeq ($(with_base_only),yes)
   with_check := no
 endif