diff --git a/ht-2.0.22-autotools.patch b/ht-2.0.22-autotools.patch
new file mode 100644
index 0000000..4be3af0
--- /dev/null
+++ b/ht-2.0.22-autotools.patch
@@ -0,0 +1,28 @@
+diff -Naur ht-2.0.22.orig/configure ht-2.0.22/configure
+--- ht-2.0.22.orig/configure	2013-04-06 01:32:12.000000000 +0200
++++ ht-2.0.22/configure	2015-07-15 14:45:11.256177414 +0200
+@@ -2610,9 +2610,9 @@
+ if test "x$enable_profiling" = "xyes"; then
+     default_user_CFLAGS="$default_user_CFLAGS -pg -g"
+ fi
+-fi
+ CFLAGS="$default_user_CFLAGS"
+ CXXFLAGS="$default_user_CFLAGS"
++fi
+ 
+ am__api_version='1.10'
+ 
+diff -Naur ht-2.0.22.orig/configure.in ht-2.0.22/configure.in
+--- ht-2.0.22.orig/configure.in	2013-04-06 01:32:08.000000000 +0200
++++ ht-2.0.22/configure.in	2015-07-15 14:44:54.864292302 +0200
+@@ -30,9 +30,9 @@
+ if test "x$enable_profiling" = "xyes"; then
+     default_user_CFLAGS="$default_user_CFLAGS -pg -g"
+ fi
+-fi
+ CFLAGS="$default_user_CFLAGS"
+ CXXFLAGS="$default_user_CFLAGS"
++fi
+ 
+ AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_HEADERS([config.h])
diff --git a/ht.spec b/ht.spec
index 07bc811..3c40092 100644
--- a/ht.spec
+++ b/ht.spec
@@ -1,6 +1,6 @@
 Name:           ht
 Version:        2.0.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File editor/viewer/analyzer for executables
 
 Group:          Applications/Editors
@@ -12,6 +12,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # naive upstreamable fix for building with -Werror=format-security
 Patch1:  ht-2.0.22-format-security.patch
 
+# Hack: Do not override CFLAGS/CXXFLAGS in configure[.in]
+#       w/ --enable-maintainermode
+Patch2:  ht-2.0.22-autotools.patch
+
 BuildRequires:  libX11-devel ncurses-devel lzo-devel
 BuildRequires:  recode
 
@@ -25,31 +29,36 @@ file formats.
 %setup -q
 
 %patch1 -p1 -b .format-security
+%patch2 -p1
+
+# Avoid rerunning the autotools
+touch -r aclocal.m4 configure.*
+
 recode latin1..utf8 TODO
 find . -name \*.cc -o -name \*.h | xargs chmod 0644
 
 %build
-my_CFLAGS="%{optflags}"; export my_CFLAGS
-my_CXXFLAGS="%{optflags}"; export my_CXXFLAGS
 %configure --enable-maintainermode
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # rename ht binary to hte, to avoid conflict with tex4ht
 mv $RPM_BUILD_ROOT%{_bindir}/ht $RPM_BUILD_ROOT%{_bindir}/hte
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING AUTHORS NEWS README TODO KNOWNBUGS
+%doc ChangeLog AUTHORS NEWS README TODO KNOWNBUGS
+%license COPYING
 %{_bindir}/hte
 
 %changelog
+* Wed Jul 15 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.0.22-4
+- Add ht-2.0.22-autotools.patch (Fix F23FTBFS, RHBZ#1239565).
+- Modernize spec.
+- Add %%license.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild