diff --git a/fluxbox-xdg-menu-svn13.py b/fluxbox-xdg-menu-svn13.py
index 6cfead1..aacdc8a 100644
--- a/fluxbox-xdg-menu-svn13.py
+++ b/fluxbox-xdg-menu-svn13.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 # vim: noexpandtab:ts=4:sts=4
 
 """Menu Generator for Fluxbox
diff --git a/fluxbox.spec b/fluxbox.spec
index a4a21a5..b871fd3 100644
--- a/fluxbox.spec
+++ b/fluxbox.spec
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        1.3.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Window Manager based on Blackbox
 
@@ -73,8 +73,7 @@ Enable vim syntax highlighting support for fluxbox configuration files (menu,
 keys, apps).
 
 %prep
-%setup -q
-%patch0
+%autosetup -p0
 
 %build
 %configure \
@@ -85,12 +84,10 @@ keys, apps).
   --x-includes=%{_includedir} \
   --x-libraries=%{_libdir} \
 
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+%make_build LIBTOOL=/usr/bin/libtool
 
 %install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot}
+%make_install
 
 # this is for desktop integration
 mkdir -p %{buildroot}%{_datadir}/xsessions/
@@ -113,7 +110,8 @@ install -m 0644 -p %{S:3rd/vim/vim/syntax/fluxkeys.vim} %{buildroot}%{_datadir}/
 install -m 0644 -p %{S:3rd/vim/vim/syntax/fluxmenu.vim} %{buildroot}%{_datadir}/vim/vimfiles/syntax/fluxmenu.vim
 
 %files
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+%doc AUTHORS ChangeLog INSTALL NEWS README TODO
+%license COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -125,12 +123,14 @@ install -m 0644 -p %{S:3rd/vim/vim/syntax/fluxmenu.vim} %{buildroot}%{_datadir}/
 %{_sysconfdir}/fluxbox-pulseaudio
 
 %files vim-syntax
-%defattr(-,root,root,644)
 %{_datadir}/vim/vimfiles/syntax/%{S:fluxapps.vim}
 %{_datadir}/vim/vimfiles/syntax/%{S:fluxkeys.vim}
 %{_datadir}/vim/vimfiles/syntax/%{S:fluxmenu.vim}
 
 %changelog
+* Tue Jul 16 2019 Filipe Rosset <rosset.filipe@gmail.com> - 1.3.7-8
+- Rebuilt to fix FTBFS + spec cleanup and modernization fixes rhbz#1674889
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild