diff -Nru calligra-2.9.11+dfsg/debian/changelog calligra-2.9.11+dfsg/debian/changelog
--- calligra-2.9.11+dfsg/debian/changelog	2016-09-17 09:05:45.000000000 +0000
+++ calligra-2.9.11+dfsg/debian/changelog	2016-10-06 22:37:35.000000000 +0000
@@ -1,3 +1,10 @@
+calligra (1:2.9.11+dfsg-2+rpi1) stretch-staging; urgency=medium
+
+  * build with gcc/g++ 5 to avoid ICE.
+  * Add 9.6 to list of known postgresql versions.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 06 Oct 2016 22:37:35 +0000
+
 calligra (1:2.9.11+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru calligra-2.9.11+dfsg/debian/control calligra-2.9.11+dfsg/debian/control
--- calligra-2.9.11+dfsg/debian/control	2016-09-17 06:46:49.000000000 +0000
+++ calligra-2.9.11+dfsg/debian/control	2016-10-06 22:36:36.000000000 +0000
@@ -5,7 +5,9 @@
 Uploaders: Adrien Grellier <perso@adrieng.fr>,
            Raúl Sánchez Siles <rasasi78@gmail.com>,
            Maximiliano Curia <maxy@debian.org>
-Build-Depends: cmake,
+Build-Depends: gcc-5,
+               g++-5,
+               cmake,
                debhelper (>= 9),
                default-jdk,
                default-libmysqlclient-dev,
diff -Nru calligra-2.9.11+dfsg/debian/patches/postgresql-9.6.patch calligra-2.9.11+dfsg/debian/patches/postgresql-9.6.patch
--- calligra-2.9.11+dfsg/debian/patches/postgresql-9.6.patch	1970-01-01 00:00:00.000000000 +0000
+++ calligra-2.9.11+dfsg/debian/patches/postgresql-9.6.patch	2016-10-06 22:37:35.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Add 9.6 to list of known postgresql versions.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- calligra-2.9.11+dfsg.orig/cmake/modules/FindCalligraPostgreSQL.cmake
++++ calligra-2.9.11+dfsg/cmake/modules/FindCalligraPostgreSQL.cmake
+@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the
+ 
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++    "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
diff -Nru calligra-2.9.11+dfsg/debian/patches/series calligra-2.9.11+dfsg/debian/patches/series
--- calligra-2.9.11+dfsg/debian/patches/series	2016-09-17 06:09:56.000000000 +0000
+++ calligra-2.9.11+dfsg/debian/patches/series	2016-10-06 22:37:35.000000000 +0000
@@ -4,3 +4,4 @@
 cmake-xbase64.patch
 libwps-0.4.patch
 no-planconvert-jar.patch
+postgresql-9.6.patch
diff -Nru calligra-2.9.11+dfsg/debian/rules calligra-2.9.11+dfsg/debian/rules
--- calligra-2.9.11+dfsg/debian/rules	2016-09-17 05:50:18.000000000 +0000
+++ calligra-2.9.11+dfsg/debian/rules	2016-10-06 22:36:13.000000000 +0000
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+export CC :=gcc-5
+export CXX :=g++-5
+
 lib_pkgs := calligra-libs
 
 # Uncomment this to turn on verbose mode.