diff --git a/gcc7.diff b/gcc7.diff
new file mode 100644
index 0000000..3e91fbd
--- /dev/null
+++ b/gcc7.diff
@@ -0,0 +1,25 @@
+From 134d5a5aac3fd015c4955b6f5fdfede42159e402 Mon Sep 17 00:00:00 2001
+From: Tino Didriksen <tino@didriksen.cc>
+Date: Tue, 8 Aug 2017 11:28:03 +0000
+Subject: [PATCH] Works around issue #358
+
+---
+ back-ends/openfst/src/include/fst/replace.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/back-ends/openfst/src/include/fst/replace.h b/back-ends/openfst/src/include/fst/replace.h
+index 5cf4759c..791a6ff8 100644
+--- a/back-ends/openfst/src/include/fst/replace.h
++++ b/back-ends/openfst/src/include/fst/replace.h
+@@ -1050,7 +1050,7 @@ class ArcIterator< ReplaceFst<A, T> > {
+ 
+     // If state is already cached, use cached arcs array.
+     if (fst_.GetImpl()->HasArcs(state_)) {
+-      (fst_.GetImpl())->template CacheImpl<A>::InitArcIterator(state_,
++      (fst_.GetImpl())->CacheImpl<A>::InitArcIterator(state_,
+                                                                &cache_data_);
+       num_arcs_ = cache_data_.narcs;
+       arcs_ = cache_data_.arcs;      // 'arcs_' is a ptr to the cached arcs.
+-- 
+2.14.1
+
diff --git a/hfst.changes b/hfst.changes
index a50bcfd..d60d9c2 100644
--- a/hfst.changes
+++ b/hfst.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  5 00:44:15 UTC 2017 - jengelh@inai.de
+
+- Add gcc7.diff
+
 -------------------------------------------------------------------
 Thu Apr 27 16:53:12 UTC 2017 - jengelh@inai.de
 
diff --git a/hfst.spec b/hfst.spec
index 6b75e9c..4a20b2f 100644
--- a/hfst.spec
+++ b/hfst.spec
@@ -29,6 +29,7 @@ Patch2:         hfst-wrong-flags.diff
 Patch3:         hfst-split-libs.diff
 Patch4:         hfst-scripts-install.diff
 Patch5:         hfst-nodate.diff
+Patch6:         gcc7.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -110,7 +111,7 @@ want to make use of the HFST library.
 
 %prep
 %setup -q
-%patch -P 2 -P 3 -P 4 -P 5 -p1
+%patch -P 2 -P 3 -P 4 -P 5 -P 6 -p1
 
 %build
 autoreconf -fiv