diff --git a/treecc.spec b/treecc.spec
index fda6df3..1787243 100644
--- a/treecc.spec
+++ b/treecc.spec
@@ -1,6 +1,6 @@
 Name:           treecc
 Version:        0.3.8
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        Tree Compiler Compiler
 
@@ -11,9 +11,13 @@ Patch0:         treecc-0.3.8-texinfo5.patch
 
 BuildRequires:  bison >= 1.28
 BuildRequires:  flex >= 2.5.4
+BuildRequires:  gcc
 BuildRequires:  m4
 BuildRequires:  texinfo
 
+# ExcludeArch s390x to allow build on rawhide
+ExcludeArch:    s390x
+
 %description
 The treecc program is designed to assist in the development of compilers
 and other language-based tools.  It manages the generation of code to handle
@@ -21,30 +25,34 @@ abstract syntax trees and operations upon the trees.
 
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
+
+%check
 make check
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+%make_install
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libtreecc.a
 
 %files
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS README
+%license COPYING
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Wed Jul 17 2019 Filipe Rosset <rosset.filipe@gmail.com> - 0.3.8-24
+- Fix FTBFS on rawhide + spec cleanup and modernization
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.8-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild