diff --git a/patchutils.spec b/patchutils.spec
index 1e02738..9d9ee47 100644
--- a/patchutils.spec
+++ b/patchutils.spec
@@ -1,21 +1,17 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
 Version: 0.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://cyberelk.net/tim/patchutils/
 Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz
 Patch1: patchutils-bz1226985.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: interdiff <= 0.0.10
-Provides: interdiff = 0.0.10
+Provides: interdiff = 0.0.11
 BuildRequires: xmlto
 BuildRequires: automake, autoconf
 
-# We only need xmlto if we are patching the documentation.
-# BuildRequires: xmlto
-
 %description
 This is a collection of programs that can manipulate patch files in
 a variety of ways, such as interpolating between two pre-patches, 
@@ -33,25 +29,28 @@ autoreconf
 %build
 touch doc/patchutils.xml
 %configure
-make %{?smp_mflags}
+make %{?_smp_mflags}
 
 %check
 make check
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 %clean
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README COPYING BUGS NEWS
+%{!?_licensedir:%global license %doc}
+%doc AUTHORS ChangeLog README BUGS NEWS
+%license COPYING
 %{_bindir}/*
 %{_mandir}/*/*
 
 %changelog
+* Fri Aug 21 2015 Tim Waugh <twaugh@redhat.com> - 0.3.4-4
+- Spec file cleanups (bug #1251587).
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild