diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 305a0b4dd4..9a3371f995 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
 version=2.8.3
-revision=1
+revision=2
 short_desc="The Cinnamon session handler"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-gconf --disable-systemd"
@@ -16,6 +16,12 @@ homepage="http://cinnamon.linuxmint.com/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
 checksum=306eb9448500b15b0d06826b66f438d767d001b706fd345c53b4a91d308ae4a9
 
+_gccver=$(gcc --version|awk '/^gcc \(GCC\)/ { print $3 }')
+if [ "${_gccver%%.*}" -gt 5 ]; then
+	# Fix gcc6 build for -Wformat-nonliteral
+	CFLAGS="-Wno-error=format-nonliteral"
+fi
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }