diff --git a/.gitignore b/.gitignore
index b785dab..201f959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,2 @@
-libnfc-1.3.4.tar.gz
-/libnfc-1.3.9.tar.gz
-/libnfc-1.4.0.tar.gz
-/libnfc-1.4.1.tar.gz
-/libnfc-1.4.2.tar.gz
-/libnfc-1.7.0-rc6.tar.gz
-/libnfc-1.7.0-rc7.tar.gz
+/libnfc-1.*.tar.gz
+/libnfc-1.*.tar.bz2
diff --git a/libnfc.spec b/libnfc.spec
index bf27a96..a402643 100644
--- a/libnfc.spec
+++ b/libnfc.spec
@@ -1,13 +1,12 @@
 Name:             libnfc
 Version:          1.7.0
-Release:          0.5.rc7%{?dist}
+Release:          1%{?dist}
 Summary:          NFC SDK and Programmers API
 
 Group:            System Environment/Libraries
 License:          LGPLv3+
 URL:              http://www.libnfc.org/
-Source0:          http://libnfc.googlecode.com/files/%{name}-%{version}-rc7.tar.gz
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:          http://libnfc.googlecode.com/files/%{name}-%{version}.tar.bz2
 
 BuildRequires:    pcsc-lite-devel
 BuildRequires:    libusb-devel
@@ -24,7 +23,7 @@ royalty-free use for everyone.
 %package devel
 Summary: Development libraries for libnfc
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
@@ -34,13 +33,13 @@ developing programs using libnfc.
 %package examples
 Summary: Examples using libnfc
 Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 The libnfc-examples package contains examples demonstrating the functionality
 of libnfc.
 
 %prep
-%setup -qn %{name}-%{version}-rc7
+%setup -q
 
 %build
 %configure --disable-static --with-drivers=all
@@ -53,10 +52,9 @@ make %{?_smp_mflags}
 doxygen
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 # remove *.la files
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 # install udev rule
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
@@ -69,9 +67,6 @@ sed -i 's/allow_intrusive_autoscan/allow_intrusive_scan/g' libnfc.conf.sample
 mkdir -p %{buildroot}%{_sysconfdir}/nfc/devices.d
 install -p -m 0644 libnfc.conf.sample %{buildroot}%{_sysconfdir}/nfc/libnfc.conf
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/ldconfig
 [ "$1" = 1 ] && udevadm control --reload
@@ -83,27 +78,28 @@ exit 0
 exit 0
 
 %files
-%defattr(-,root,root,-)
+%doc COPYING README AUTHORS ChangeLog
 %dir %{_sysconfdir}/nfc
 %dir %{_sysconfdir}/nfc/devices.d
 %config(noreplace) %{_sysconfdir}/udev/rules.d/42-pn53x.rules
 %config(noreplace) %{_sysconfdir}/nfc/libnfc.conf
 %{_libdir}/*.so.*
-%doc COPYING README AUTHORS ChangeLog
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/*.so
 %{_includedir}/nfc/
 %{_libdir}/pkgconfig/*.pc
 %doc doc/html
 
 %files examples
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 10 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.7.0-1
+- Update to 1.7.0 final
+- Cleanup and modernise spec
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-0.5.rc7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -159,7 +155,7 @@ exit 0
 * Mon Apr 12 2010 François Kooman <fkooman at tuxed net> 1.3.4-1
 - update to 1.3.4
 
-* Mon Mar 9 2010 François Kooman <fkooman at tuxed net> 1.3.3-1
+* Mon Mar 8 2010 François Kooman <fkooman at tuxed net> 1.3.3-1
 - update to 1.3.3
 
 * Mon Feb 8 2010 François Kooman <fkooman at tuxed net> 1.3.2-1
@@ -179,7 +175,7 @@ exit 0
 - use better macro for mandir
 - use name macro instead of "libnfc" in Requires and includedir
 
-* Mon Sep 12 2009 François Kooman <fkooman at tuxed net> 1.2.2-0.1
+* Mon Sep 14 2009 François Kooman <fkooman at tuxed net> 1.2.2-0.1
 - update to SVN snapshot
 - use CMake instead of autotools
 
diff --git a/sources b/sources
index bb0a400..89328c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c110fc774358ad2c6cbff7cbd762fb45  libnfc-1.7.0-rc7.tar.gz
+8d8aced79cc0859c605c04d59e4484b3  libnfc-1.7.0.tar.bz2