diff --git a/hesiod.spec b/hesiod.spec
index 3f74732..3e36d6d 100644
--- a/hesiod.spec
+++ b/hesiod.spec
@@ -1,11 +1,10 @@
 Name: hesiod
 Version: 3.2.1
-Release: 10%{?dist}
-Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz
-Summary: Shared libraries for querying the Hesiod naming service
-Group: System Environment/Libraries
+Release: 11%{?dist}
 License: MIT
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: Shared libraries for querying the Hesiod naming service
+
+Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz
 BuildRequires: autoconf, automake, libtool, libidn-devel
 Obsoletes: hesinfo < 3.2
 
@@ -17,7 +16,6 @@ files, among others.
 
 %package devel
 Summary: Development libraries and headers for Hesiod
-Group: Development/Libraries
 Requires: hesiod = %{version}-%{release}
 
 %description devel
@@ -28,7 +26,41 @@ distribute information which might otherwise kept in the /etc/passwd,
 ensure the files are synchronized among multiple hosts.  This package contains
 the header files and libraries required for building programs which use Hesiod.
 
+%prep
+%setup -q
+autoreconf -vif
+
+%build
+%configure --disable-static
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+# Remove libtool archives and static libs
+find %{buildroot} -type f -name "*.la" -delete
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%license COPYING
+%doc README NEWS
+%{_bindir}/*
+%{_libdir}/libhesiod.so.*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+
+%files devel
+%{_libdir}/libhesiod.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/hesiod.h
+%{_mandir}/man3/*
+
 %changelog
+* Mon Apr  2 2018 Peter Robinson <pbrobinson@fedoraproject.org> 3.2.1-11
+- Cleanup and modernise spec
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
@@ -253,38 +285,3 @@ the header files and libraries required for building programs which use Hesiod.
   no longer use a separate libnss_hesiod.so
 - changed requires: caching-nameserver to nscd
 - added post-install script snippet to activate nscd on install
-
-%prep
-%setup -q
-libtoolize -f -i
-aclocal
-automake -f -a
-autoconf -f -i
-
-%build
-%configure --disable-static
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc README NEWS COPYING
-%{_bindir}/*
-%{_libdir}/libhesiod.so.*
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/libhesiod.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/hesiod.h
-%{_mandir}/man3/*