diff -Nru ggcov-0.9/debian/changelog ggcov-0.9/debian/changelog
--- ggcov-0.9/debian/changelog	2016-08-24 10:59:26.000000000 +0000
+++ ggcov-0.9/debian/changelog	2016-08-29 12:38:40.000000000 +0000
@@ -1,11 +1,17 @@
-ggcov (0.9-11ubuntu1) yakkety; urgency=medium
+ggcov (0.9-12ubuntu1) yakkety; urgency=medium
 
   * Merge with Debian; remaining changes:
     - Overwrite the upstream install failure when using the shared bfd library.
     - Build on all architectures.
     - Suppress running test033 on non-intel architectures (failing).
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 24 Aug 2016 12:59:26 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 29 Aug 2016 14:38:40 +0200
+
+ggcov (0.9-12) unstable; urgency=medium
+
+  * Support for gcc 6.2. Closes: #835728
+
+ -- Alastair McKinstry <mckinstry@debian.org>  Thu, 25 Aug 2016 20:04:23 +0100
 
 ggcov (0.9-11) unstable; urgency=medium
 
diff -Nru ggcov-0.9/debian/patches/new_gcc.patch ggcov-0.9/debian/patches/new_gcc.patch
--- ggcov-0.9/debian/patches/new_gcc.patch	2016-06-09 11:29:13.000000000 +0000
+++ ggcov-0.9/debian/patches/new_gcc.patch	2016-08-25 19:04:23.000000000 +0000
@@ -1,7 +1,7 @@
 Author: Greg Banks, Alastair McKinstry
 Description: GCC 4.8, 4.9, 5.*, 6.* Support
 Origin: http://sourceforge.net/p/ggcov/ggcov/ci/ed3286639183adf73fc4f553d136b916fdb22e9a/
-Last-Updated: 2016-06-09
+Last-Updated: 2016-08-29
 Forwarded: no
 
 Index: ggcov-0.9/src/cov_file.C
@@ -17,12 +17,13 @@
      unsigned int nlines = 0;
      cov_arc_t *a;
      gnb_u32_t dest, flags;
-@@ -962,7 +962,19 @@ cov_file_t::read_gcc3_bbg_file(covio_t *
+@@ -962,7 +962,20 @@ cov_file_t::read_gcc3_bbg_file(covio_t *
      case BBG_VERSION_GCC33:
  	if (expect_version != BBG_VERSION_GCC33)
  	    bbg_failed1("unexpected version=0x%08x", format_version_);
 -    	break;
 +        break;
++    case _NEW_VERSION(6,2,'*'):
 +    case _NEW_VERSION(6,1,'*'):
 +    case _NEW_VERSION(6,0,'*'):
 +    case _NEW_VERSION(5,4,'*'):
@@ -38,7 +39,7 @@
      case _NEW_VERSION(4,7,'*'):
  	features_ |= FF_FNCHECKSUM2;
  	/* fall through */
-@@ -1106,7 +1118,7 @@ cov_file_t::read_gcc3_bbg_file(covio_t *
+@@ -1106,7 +1119,7 @@ cov_file_t::read_gcc3_bbg_file(covio_t *
  		 * at gcc 4.1.1, which will emit an arc (N-2 -> N-1, !FALL_THROUGH)
  		 * for a "return" statement which the last line in a function.
  		 */
@@ -47,7 +48,7 @@
  		a->on_tree_ = !!(flags & BBG_ON_TREE);
  		a->attach(fn->nth_block(bidx), fn->nth_block(dest));
  	    }
-@@ -1117,7 +1129,8 @@ cov_file_t::read_gcc3_bbg_file(covio_t *
+@@ -1117,7 +1130,8 @@ cov_file_t::read_gcc3_bbg_file(covio_t *
  	    	bbg_failed0("short file");
  	    if (bidx >= nblocks)
      	    	bbg_failed2("bidx=%u > nblocks=%u", bidx, nblocks);