diff --git a/yersinia.spec b/yersinia.spec
index de38bad..7e2ead7 100644
--- a/yersinia.spec
+++ b/yersinia.spec
@@ -1,6 +1,6 @@
 Name:           yersinia
 Version:        0.7.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Network protocols tester and attacker
 
 Group:          Applications/Internet
@@ -34,6 +34,12 @@ implementing new ones):
 
 %prep
 %setup -q -c %{name}-%{version}
+
+# Don't override CFLAGS in configure* (RHBZ#1240089)
+sed -i -e "s,^\(\s*CFLAGS=\".*\"\),:\1," configure*
+# Avoid rerunning the autotools
+touch -r aclocal.m4 configure*
+
 # Convert to utf-8
 for file in THANKS; do
     mv $file timestamp
@@ -46,15 +52,20 @@ done
 make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 %files
-%doc AUTHORS ChangeLog COPYING FAQ README THANKS TODO
+%doc AUTHORS ChangeLog FAQ README THANKS TODO
+%license COPYING
 %{_mandir}/man?/%{name}.*
 %{_bindir}/%{name}
 
 %changelog
+* Wed Aug 19 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.7.3-5
+- Let configure honor CFLAGS (Fix F23FTBFS, RHBZ#1240089).
+- Add %%license.
+- Modernize spec.
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild