diff --git a/libsndfile.spec b/libsndfile.spec
index 3f0c6b7..20824a7 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -1,14 +1,14 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.25
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	LGPLv2+ and GPLv2+ and BSD
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/files/libsndfile-%{version}.tar.gz
 Patch0:		%{name}-1.0.25-system-gsm.patch
-Patch1: libsndfile-1.0.25-zerodivfix.patch
-Patch2: libsndfile-1.0.25-cve2014_9496.patch
+Patch1:		libsndfile-1.0.25-zerodivfix.patch
+Patch2:		libsndfile-1.0.25-cve2014_9496.patch
 
 BuildRequires:	alsa-lib-devel
 BuildRequires:	flac-devel
@@ -44,7 +44,6 @@ This package contains files needed to develop with libsndfile.
 Summary:	Command Line Utilities for libsndfile
 Group:		Applications/Multimedia
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	libsndfile < 1.0.20-4
 
 
 %description utils
@@ -58,9 +57,10 @@ This package contains command line utilities for libsndfile.
 %patch0 -p1
 %patch1 -p1 -b .zerodivfix
 %patch2 -p1 -b .cve2014_9496
-rm -r src/GSM610 ; autoreconf -I M4 -fiv # for system-gsm patch
+rm -r src/GSM610
 
 %build
+autoreconf -I M4 -fiv # for system-gsm patch
 %configure \
 	--disable-dependency-tracking \
 	--enable-sqlite \
@@ -80,9 +80,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf __docs
 cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
 rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+find %{buildroot} -type f -name "*.la" -delete
 
 # fix multilib issues
-%if %{__isa_bits} == 64
+%if %{?__isa_bits} == 64
 %define wordsize 64
 %else
 %define wordsize 32
@@ -118,7 +119,9 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 
 
 %files
-%doc COPYING AUTHORS README NEWS
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS README NEWS
 %{_libdir}/%{name}.so.*
 
 %files utils
@@ -144,9 +147,7 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 %{_mandir}/man1/sndfile-play.1*
 
 %files devel
-%doc __docs/*
-%doc ChangeLog
-%exclude %{_libdir}/%{name}.la
+%doc __docs/* ChangeLog
 %{_includedir}/sndfile.h
 %{_includedir}/sndfile.hh
 %{_includedir}/sndfile-%{wordsize}.h
@@ -155,6 +156,10 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 
 
 %changelog
+* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.25-16
+- Fix FTBFS
+- Use %%license
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.25-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild