diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 5b12fc29b..d4c8a07b6 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -6,6 +6,7 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - upstream patch for signed char on ARM
+#  - fedora patch to fix ARM build with GCC 6
 
 pkgbase=calligra
 pkgname=('calligra-braindump'
@@ -35,10 +36,12 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4'
              'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2'
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch'
-        'https://github.com/KDE/calligra/commit/956bb80db4f300e4f8edeaf19d24fd61eb1932b2.patch')
+        'https://github.com/KDE/calligra/commit/956bb80db4f300e4f8edeaf19d24fd61eb1932b2.patch'
+        'calligra-2.9.11-gcc6_arm.patch')
 md5sums=('a1a4935debae64724cd4c0d17d61ae4e'
          '6ea15f8b3938838d89ea0aa08921afd1'
-         '47305e6e25a076d5761e7b22a65b777e')
+         '47305e6e25a076d5761e7b22a65b777e'
+         '6f40e8f90b21fd1b5fe9d57998fc2b3e')
 
 prepare() {
   mkdir -p build
@@ -54,6 +57,7 @@ prepare() {
 
 # Fix build on ARM
   patch -p1 -i ../956bb80db4f300e4f8edeaf19d24fd61eb1932b2.patch
+  patch -p1 -i ../calligra-2.9.11-gcc6_arm.patch
 }
 
 build() {
diff --git a/extra/calligra/calligra-2.9.11-gcc6_arm.patch b/extra/calligra/calligra-2.9.11-gcc6_arm.patch
new file mode 100644
index 000000000..2b1271c07
--- /dev/null
+++ b/extra/calligra/calligra-2.9.11-gcc6_arm.patch
@@ -0,0 +1,12 @@
+diff -up calligra-2.9.11/libs/flake/KoSnapStrategy.cpp.gcc6_arm calligra-2.9.11/libs/flake/KoSnapStrategy.cpp
+--- calligra-2.9.11/libs/flake/KoSnapStrategy.cpp.gcc6_arm	2016-02-02 13:53:15.000000000 -0600
++++ calligra-2.9.11/libs/flake/KoSnapStrategy.cpp	2016-02-08 09:12:39.452896965 -0600
+@@ -181,7 +181,7 @@ bool ExtensionSnapStrategy::snap(const Q
+     Q_ASSERT(isfinite(maxSnapDistance));
+ 
+     const qreal maxDistance = maxSnapDistance * maxSnapDistance;
+-    qreal minDistances[2] = { HUGE_VAL, HUGE_VAL };
++    qreal minDistances[2] = { (qreal)HUGE_VAL, (qreal)HUGE_VAL };
+ 
+     QPointF snappedPoints[2] = { mousePosition, mousePosition };
+     QPointF startPoints[2];