diff --git a/.gitignore b/.gitignore
index 4259224..c025218 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1 @@
-hwloc-1.0.2.tar.bz2
-/hwloc-1.1.tar.bz2
-/hwloc-1.2.tar.bz2
-/hwloc-1.2.1.tar.bz2
-/hwloc-1.2.2.tar.bz2
-/hwloc-1.3.tar.bz2
-/hwloc-1.4.tar.bz2
-/hwloc-1.4.1.tar.bz2
-/hwloc-1.4.2.tar.bz2
-/hwloc-1.5.tar.bz2
-/hwloc-1.5.1.tar.bz2
-/hwloc-1.6.1.tar.bz2
-/hwloc-1.7.tar.bz2
-/hwloc-1.7.patch
-/hwloc-1.7-manpage.patch
+/hwloc-*.tar.bz2
diff --git a/hwloc.spec b/hwloc.spec
index f725edc..ce5eb23 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,23 +1,28 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   1.7
-Release:   2%{?dist}
+Version:   1.8
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
-Source0:   http://www.open-mpi.org/software/hwloc/v1.7/downloads/%{name}-%{version}.tar.bz2
-Patch0:    hwloc-1.7.patch
-Patch1:    hwloc-1.7-manpage.patch
-Requires:  %{name}-libs = %{version}-%{release} 
-
-BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libpciaccess-devel libXNVCtrl-devel transfig doxygen w3m texlive-latex texlive-makeindex libtool-ltdl-devel autoconf automake libtool
+Source0:   http://www.open-mpi.org/software/hwloc/v%{version}/downloads/%{name}-%{version}.tar.bz2
+
+BuildRequires: cairo-devel
+BuildRequires: libpciaccess-devel
+BuildRequires: libtool-ltdl-devel
+BuildRequires: libX11-devel
+BuildRequires: libxml2-devel
+BuildRequires: libXNVCtrl-devel
+BuildRequires: ncurses-devel
+BuildRequires: transfig doxygen w3m
+BuildRequires: texlive-latex texlive-makeindex
 %ifnarch s390 s390x
 BuildRequires: libibverbs-devel
 %endif
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x %{arm} aarch64
 BuildRequires: numactl-devel
-##Requires: numactl-libs
 %endif
+Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 The Portable Hardware Locality (hwloc) software package provides 
@@ -50,38 +55,32 @@ Run time libraries for the hwloc
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-autoreconf --force --install
 %configure
-##sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-##sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags} V=1
+make %{?_smp_mflags} V=1
 
 %install
-%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 #Fix wrong permition on file hwloc-assembler-remote => I have reported this to upstream already
-%{__chmod} 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote
+chmod 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote
 
 # We don't ship .la files.
-%{__rm} -rf %{buildroot}%{_libdir}/libhwloc.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-%{__mv} %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-%{__cp} -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-%{__cp} -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+mv %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+cp -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 
 %check
-%{__make} check
+make check
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
 %{_bindir}/%{name}*
 %{_bindir}/lstopo
 %{_bindir}/lstopo-no-graphics
@@ -89,7 +88,6 @@ autoreconf --force --install
 %{_mandir}/man1/lstopo*
 
 %files devel
-%defattr(-, root, root, -)
 %{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
 %dir %{_includedir}/%{name}
@@ -99,7 +97,6 @@ autoreconf --force --install
 %{_libdir}/*.so
 
 %files libs
-%defattr(-, root, root, -)
 %{_mandir}/man7/%{name}*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{name}.dtd
@@ -110,6 +107,11 @@ autoreconf --force --install
 
 
 %changelog
+* Thu Dec 19 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.8-1
+- Update to 1.8
+- No numa on aarch64
+- Cleanup and modernise spec
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index b3a17a0..7d8d6fc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-b46ccf2a5ebdcf4fe9d85b3baa1e37d1  hwloc-1.7-manpage.patch
-ddfa188834736438bf04251715831130  hwloc-1.7.patch
-8b84f176cd3068e908f59674356e8ae0  hwloc-1.7.tar.bz2
+f3d9a00dbd00d615114153a62ad909a3  hwloc-1.8.tar.bz2