diff --git a/torque.spec b/torque.spec
index 6387d04..66df7e2 100644
--- a/torque.spec
+++ b/torque.spec
@@ -71,7 +71,7 @@
 
 Name:        torque
 Version:     4.2.6.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -353,11 +353,11 @@ install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
 chmod 644 torque.setup
 
 %build
-CFLAGS="%{optflags} -Wno-overlength-strings"
+CFLAGS="%{optflags} -Wno-overlength-strings -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE"
 %configure --includedir=%{_includedir}/torque \
   --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
   --with-sendmail=%{_sbindir}/sendmail --disable-static \
-  --with-tcp-retry-limit=2 \
+  --with-tcp-retry-limit=2 --without-debug \
   --enable-drmaa --enable-munge-auth \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
@@ -664,14 +664,8 @@ fi
 %files devel
 %defattr(-, root, root, -)
 %{_libdir}/libtorque.so
-%{_includedir}/torque/pbs_error.h
-%{_includedir}/torque/pbs_error_db.h
-%{_includedir}/torque/pbs_ifl.h
-%{_includedir}/torque/rm.h
-%{_includedir}/torque/rpp.h
-%{_includedir}/torque/tm.h
-%{_includedir}/torque/tm_.h
-%{_includedir}/torque/*.h
+%{_includedir}/torque
+%exclude %{_includedir}/torque/drmaa.h
 %{_bindir}/pbs-config
 %{_mandir}/man3/pbs_alterjob.3.*
 %{_mandir}/man3/pbs_connect.3.*
@@ -797,6 +791,13 @@ fi
 %endif
 
 %changelog
+* Thu Jul 17 2014 Ralf Corsépius <corsepiu@fedoraproject.org> - 4.2.6.1-4
+- Append -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE to CFLAGS to work-around
+  Tcl/Tk-8.6 incompatibilities (FTFFS RHBZ#1107455).
+- Pass --without-debug to %%configure to let configure pass through
+  %%optflags (RHBZ#1074571).
+- Fix twice listed files in *-devel.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild