diff --git a/adplug.spec b/adplug.spec
index 6895abc..85f9619 100644
--- a/adplug.spec
+++ b/adplug.spec
@@ -4,7 +4,7 @@
 %define adplugdbver 2006-07-07
 Name:		adplug
 Version:	2.1
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	A software library for AdLib (OPL2) emulation
 URL:		http://adplug.sourceforge.net/
 Group:		Applications/Multimedia
@@ -14,7 +14,6 @@ Patch0:		adplug-1.5.1-texinfo.patch
 # Lifted from the debian patchset
 # http://ftp.de.debian.org/debian/pool/main/a/adplug/adplug_2.0.1-6.diff.gz
 Patch1:		adplug-2.1-include.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	LGPLv2+
 BuildRequires:	libbinio-devel >= 1.4
 BuildRequires:	pkgconfig
@@ -34,8 +33,8 @@ playback. It supports various audio formats from MS-DOS AdLib trackers.
 
 %package devel
 Summary:        Development files for AdPlug
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:	libbinio-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,9 +65,6 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name}
 install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -82,7 +78,6 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(-, root, root)
 %{_libdir}/*.so.*
 %dir %{shareddata}/%{name}/
 %config(noreplace) %{shareddata}/%{name}/adplug.db
@@ -92,7 +87,6 @@ fi
 %doc NEWS.adplugdb README.adplugdb
 
 %files devel
-%defattr(-, root, root)
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %dir %{_includedir}/%{name}
@@ -100,6 +94,12 @@ fi
 %{_infodir}/*.gz
 
 %changelog
+* Thu Feb 19 2015 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-17
+- Drop buildroot tag, %%defattr, %%clean.
+- Fix -devel group tag.
+- Add %%_isa to -devel base package dep.
+- Rebuild for libbinio (GCC 5 C++ ABI change), so deps can compile/link with this.
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild