diff --git a/cdrkit.spec b/cdrkit.spec
index 5493641..b7aea26 100644
--- a/cdrkit.spec
+++ b/cdrkit.spec
@@ -1,11 +1,10 @@
-Summary: A collection of CD/DVD utilities
-Name: cdrkit
+Name:    cdrkit
 Version: 1.1.11
-Release: 38%{?dist}
+Release: 39%{?dist}
+Summary: A collection of CD/DVD utilities
 License: GPLv2
-Group: Applications/System
-URL: http://cdrkit.org/
-Source: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz
+URL:     http://cdrkit.org/
+Source:  http://cdrkit.org/releases/cdrkit-%{version}.tar.gz
 
 Patch1: cdrkit-1.1.8-werror.patch
 Patch2: cdrkit-1.1.9-efi-boot.patch
@@ -27,7 +26,6 @@ Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
 Patch20: cdrkit-1.1.11-werror_gcc5.patch
 Patch21: cdrkit-1.1.11-devname.patch
 Patch22: cdrkit-1.1.11-sysmacros.patch
-
 BuildRequires: cmake libcap-devel zlib-devel perl-interpreter perl-generators file-devel bzip2-devel
 
 %description
@@ -35,12 +33,7 @@ cdrkit is a collection of CD/DVD utilities.
 
 %package -n wodim
 Summary: A command line CD/DVD recording program
-Group: Applications/Archiving
-Obsoletes: dvdrecord <= 0:0.1.5
-Provides: dvdrecord = 0:0.1.5.1
-Obsoletes: cdrecord < 9:2.01-12
-Provides: cdrecord = 9:2.01-12
-Requires: libusal = %{version}-%{release}
+Requires: libusal%{?_isa} = %{version}-%{release}
 Requires(preun): %{_sbindir}/alternatives coreutils
 Requires(post): %{_sbindir}/alternatives coreutils
 
@@ -51,10 +44,7 @@ multi-sessions and provides human-readable error messages.
 
 %package -n genisoimage
 Summary: Creates an image of an ISO9660 file-system
-Group: Applications/System
-Obsoletes: mkisofs < 9:2.01-12
-Provides: mkisofs = 9:2.01-12
-Requires: libusal = %{version}-%{release}
+Requires: libusal%{?_isa} = %{version}-%{release}
 Requires(preun): %{_sbindir}/alternatives coreutils
 Requires(post): %{_sbindir}/alternatives coreutils
 
@@ -71,22 +61,18 @@ CD-ROMs.
 
 %package -n dirsplit
 Summary: Utility to split directories
-Group: Applications/System
 Requires: perl-interpreter >= 4:5.8.1
-Requires: genisoimage = %{version}-%{release}
+Requires: genisoimage%{?_isa} = %{version}-%{release}
 
 %description -n dirsplit
 This utility is used to split directories into chunks before burning. 
 Chunk size is usually set to fit to a CD/DVD.
 
 %package -n icedax
-Group: Applications/Multimedia
 Summary: A utility for sampling/copying .wav files from digital audio CDs
-Obsoletes: cdda2wav < 9:2.01-12
-Provides: cdda2wav = 9:2.01-12
-Requires: libusal = %{version}-%{release}
-Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
-Requires(post): %{_sbindir}/alternatives chkconfig coreutils
+Requires: libusal%{?_isa} = %{version}-%{release}
+Requires(preun): %{_sbindir}/alternatives coreutils
+Requires(post): %{_sbindir}/alternatives coreutils
 Requires: vorbis-tools
 Requires: cdparanoia
 BuildRequires: cdparanoia-devel
@@ -100,7 +86,6 @@ rates. Icedax can also be used as a CD player.
 
 %package -n libusal
 Summary: Library to communicate with SCSI devices
-Group: Development/Libraries
 
 %description -n libusal
 The libusal package contains C libraries that allows applications
@@ -109,8 +94,7 @@ CD-R media.
 
 %package -n libusal-devel
 Summary: Development files for libusal
-Group: Development/Libraries
-Requires: libusal = %{version}-%{release}
+Requires: libusal%{?_isa} = %{version}-%{release}
 
 %description -n libusal-devel
 The libusal-devel package contains C libraries and header files
@@ -246,7 +230,8 @@ fi
 %postun -n libusal -p /sbin/ldconfig
 
 %files -n wodim
-%doc Changelog COPYING FAQ FORK START
+%license COPYING
+%doc Changelog FAQ FORK START
 %doc doc/READMEs doc/wodim
 %{_bindir}/devdump
 %{_bindir}/wodim
@@ -260,7 +245,8 @@ fi
 %{_mandir}/man1/readom.*
 
 %files -n icedax
-%doc doc/icedax COPYING
+%license COPYING
+%doc doc/icedax
 %{_bindir}/icedax
 %ghost %{_bindir}/cdda2wav
 %{_bindir}/cdda2ogg
@@ -269,7 +255,8 @@ fi
 %{_mandir}/man1/list_audio_tracks.*
 
 %files -n genisoimage
-%doc doc/genisoimage COPYING
+%license COPYING
+%doc doc/genisoimage
 %{_bindir}/genisoimage
 %ghost %{_bindir}/mkisofs
 %ghost %{_bindir}/mkhybrid
@@ -289,21 +276,26 @@ fi
 %{_mandir}/man1/readmult.*
 
 %files -n dirsplit
+%license COPYING
 %{_bindir}/dirsplit
 %{_mandir}/man1/dirsplit.*
 
 %files -n libusal
-%doc doc/plattforms/README.linux Changelog COPYING FAQ FORK START
+%license COPYING
+%doc doc/plattforms/README.linux Changelog FAQ FORK START
 %{_libdir}/libusal.so.*
 %{_libdir}/librols.so.*
 
 %files -n libusal-devel
-%doc COPYING
+%license COPYING
 %{_libdir}/libusal.so
 %{_libdir}/librols.so
 %{_includedir}/usal
 
 %changelog
+* Wed Jul  4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.11-39
+- Spec cleanup and modernise, use %%license
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild