diff -Nru icedove-45.2.0/debian/changelog icedove-45.2.0/debian/changelog
--- icedove-45.2.0/debian/changelog	2016-07-26 17:30:07.000000000 +0000
+++ icedove-45.2.0/debian/changelog	2016-08-17 23:32:25.000000000 +0000
@@ -1,3 +1,9 @@
+icedove (1:45.2.0-2+rpi1) stretch-staging; urgency=medium
+
+  * Force build with gcc/g++ 5
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 17 Aug 2016 23:32:25 +0000
+
 icedove (1:45.2.0-2) unstable; urgency=medium
 
   [ Christoph Goehre ]
diff -Nru icedove-45.2.0/debian/control icedove-45.2.0/debian/control
--- icedove-45.2.0/debian/control	2016-07-26 17:30:07.000000000 +0000
+++ icedove-45.2.0/debian/control	2016-08-17 23:32:25.000000000 +0000
@@ -6,6 +6,8 @@
  Guido Günther <agx@sigxcpu.org>,
  Carsten Schoenert <c.schoenert@t-online.de>,
 Build-Depends:
+ gcc-5,
+ g++-5,
  autoconf2.13,
  autotools-dev,
  bzip2,
diff -Nru icedove-45.2.0/debian/rules icedove-45.2.0/debian/rules
--- icedove-45.2.0/debian/rules	2016-07-26 17:30:07.000000000 +0000
+++ icedove-45.2.0/debian/rules	2016-08-17 23:32:00.000000000 +0000
@@ -4,6 +4,9 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+export CC=gcc-5
+export CXX=g++-5
+
 # checking the release type, if $(RELEASE)=UNRELEASED we won't build
 # the icedove-dbg package
 RELEASE := $(shell head -1 debian/changelog | cut -d" " -f3 | tr -d ';')