diff --git a/festival-gcc7.patch b/festival-gcc7.patch
new file mode 100644
index 0000000..0c16e46
--- /dev/null
+++ b/festival-gcc7.patch
@@ -0,0 +1,21 @@
+diff -up festival/speech_tools/siod/siod.cc.me festival/speech_tools/siod/siod.cc
+--- festival/speech_tools/siod/siod.cc.me	2018-01-31 11:15:01.148463177 +0100
++++ festival/speech_tools/siod/siod.cc	2018-01-31 11:25:15.737355203 +0100
+@@ -459,7 +459,7 @@ char **siod_variable_generator(char *tex
+     matches = walloc(char *,siod_llength(lmatches)+1);
+     for (l=lmatches,i=0; l; l=cdr(l),i++)
+ 	matches[i] = wstrdup(PNAME(car(l)));
+-    matches[i] = '\0';
++    matches[i] = NULL;
+ 
+     return matches;
+ }
+@@ -498,7 +498,7 @@ char **siod_command_generator (char *tex
+     matches = walloc(char *,siod_llength(lmatches)+1);
+     for (l=lmatches,i=0; l; l=cdr(l),i++)
+ 	matches[i] = wstrdup(PNAME(car(l)));
+-    matches[i] = '\0';
++    matches[i] = NULL;
+ 
+     return matches;
+ }
diff --git a/festival.spec b/festival.spec
index 00a242d..3e17315 100644
--- a/festival.spec
+++ b/festival.spec
@@ -6,7 +6,7 @@
 Name: festival
 Summary: Speech synthesis and text-to-speech system
 Version: %{festivalversion}
-Release: 35%{?dist}
+Release: 36%{?dist}
 
 URL: http://www.cstr.ed.ac.uk/projects/festival/
 Group: Applications/Multimedia
@@ -148,8 +148,10 @@ Patch97: no-shared-data.patch
 # There is a typo in the festival_server script
 Patch98: festival-1.96-server-script-typo.patch
 
+Patch99: festival-gcc7.patch
+
 BuildRequires: pulseaudio-libs-devel
-BuildRequires: tetex
+BuildRequires: texi2html
 BuildRequires: ncurses-devel
 
 # Requires: festival-voice
@@ -500,7 +502,7 @@ chmod -x speech_tools/base_class/string/EST_strcasecmp.c
 %setup -q -n festival -D -T -b 223
 %setup -q -n festival -D -T -b 224
 %setup -q -n festival -D -T -b 225
-%setup -c -q -n festival -D -T -b 300
+%setup -c -q -n festival -D -T -a 300
 
 %patch1 -p1 -b .nitech
 %patch2 -p1 -b .buildrootrefs
@@ -539,7 +541,7 @@ done
 %patch96 -p0 -b .gcc47
 %patch97 -p1 -b .no-share
 %patch98 -b .typo
-
+%patch99 -p1 -b .gcc7
 
 # zero length
 rm festdoc-%{docversion}/speech_tools/doc/index_html.jade
@@ -914,6 +916,10 @@ fi
 
 
 %changelog
+* Wed Jan 31 2018 Than Ngo <than@redhat.com> - 1.96-36
+- add BR on texi2html instead tetex, minimal tex BR
+- fix FTBS with gcc7
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.96-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild