diff --git a/audiofile.spec b/audiofile.spec
index 50b347b..5eb2744 100644
--- a/audiofile.spec
+++ b/audiofile.spec
@@ -1,14 +1,19 @@
-Summary: A library for accessing various audio file formats
+%global make_check 1
+
+Summary: Library for accessing various audio file formats
 Name: audiofile
 Version: 0.3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
-License: LGPLv2+
+# library is LGPL / the two programs GPL / see README
+License: LGPLv2+ and GPLv2+
 Group: System Environment/Libraries
 Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz
 URL: http://audiofile.68k.org/
 BuildRequires: libtool
 BuildRequires: alsa-lib-devel
+# optional for rebuilding manual pages from .txt
+#BuildRequires: asciidoc
 
 %description
 The Audio File library is an implementation of the Audio File Library
@@ -22,8 +27,7 @@ any of the sound file formats it can handle.
 %package devel
 Summary: Development files for Audio File applications
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: pkgconfig >= 1:0.8
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description devel
 The audiofile-devel package contains libraries, include files, and
@@ -37,36 +41,52 @@ other resources you can use to develop Audio File applications.
 make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f docs/Makefile*
+
+
+%check
+%if %{make_check}
+make check
+%endif
+
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-, root, root)
-%doc COPYING TODO README ChangeLog docs
+%license COPYING COPYING.GPL
+%doc ACKNOWLEDGEMENTS AUTHORS NEWS NOTES README TODO
 %{_bindir}/sfconvert
 %{_bindir}/sfinfo
 %{_libdir}/lib*.so.1*
 %{_mandir}/man1/*
 
 %files devel
-%defattr(-, root, root)
+%doc ChangeLog docs/*.3.txt
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 10 2015 Michael Schwendt <mschwendt@fedoraproject.org> - 1:0.3.6-5
+- Don't include docs subdir in base package. It duplicates the manual
+  pages and their .txt sources. Include the *.3.txt manual sources in
+  the -devel package instead.
+- Spec cleanup: drop %%defattr, drop %%clean and buildroot removal.
+- Drop explicit Requires on pkgconfig from -devel package
+  (pkg-config 0.8 is from 2002 or so, btw).
+- Use %%license and add file COPYING to it.
+- The two included programs are GPLv2+ licensed.
+- Include more doc files.
+- Add %%?_isa to base package Requires.
+- Add %%check section for included testsuite.
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.3.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -140,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Mar 17 2005 John (J5) Palmieri <johnp@redhat.com> - 0.2.6-2
 - rebuild for gcc 4.0
 
-* Thu Jul 30 2004 Colin Walters  <walters@redhat.com>
+* Fri Jul 30 2004 Colin Walters  <walters@redhat.com>
 - Update to 0.2.6
 - Rework description to not contain apostrophe that
   makes emacs unhappy