diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e3a12ae
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/hwloc-1.11.8.tar.bz2
diff --git a/.hwloc.metadata b/.hwloc.metadata
new file mode 100644
index 0000000..192c95a
--- /dev/null
+++ b/.hwloc.metadata
@@ -0,0 +1 @@
+5d6164400a49e2c77a7e1e98dd0247a1f7e6d4cf SOURCES/hwloc-1.11.8.tar.bz2
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
-
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
-
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch b/SOURCES/0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch
new file mode 100644
index 0000000..74cf3bb
--- /dev/null
+++ b/SOURCES/0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch
@@ -0,0 +1,25 @@
+From 9d6e8bfe26c24df8272d6af782ebbde9ef62acb0 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Wed, 6 Sep 2017 17:35:56 +0200
+Subject: [PATCH] Avoid letting snprintf interpret process name as format
+
+---
+ utils/lstopo/lstopo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/lstopo/lstopo.c b/utils/lstopo/lstopo.c
+index a23980010d..e9d600d457 100644
+--- a/utils/lstopo/lstopo.c
++++ b/utils/lstopo/lstopo.c
+@@ -229,7 +229,7 @@ static void add_process_objects(hwloc_topology_t topology)
+ if (!parenl) {
+ snprintf(comm, sizeof(comm), "(unknown)");
+ } else {
+- snprintf(comm, sizeof(comm), parenl+1);
++ snprintf(comm, sizeof(comm), "%s", parenl+1);
+ }
+ }
+
+--
+2.13.6
+
diff --git a/SPECS/hwloc.spec b/SPECS/hwloc.spec
new file mode 100644
index 0000000..d99a192
--- /dev/null
+++ b/SPECS/hwloc.spec
@@ -0,0 +1,320 @@
+Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
+Name: hwloc
+Version: 1.11.8
+Release: 4%{?dist}
+License: BSD
+Group: Applications/System
+URL: http://www.open-mpi.org/projects/hwloc/
+Source0: http://www.open-mpi.org/software/hwloc/v1.11/downloads/%{name}-%{version}.tar.bz2
+# fix build with -Werror=format-security
+Patch0: 0001-Avoid-letting-snprintf-interpret-process-name-as-for.patch
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+BuildRequires: cairo-devel
+BuildRequires: libpciaccess-devel
+BuildRequires: libtool-ltdl-devel
+BuildRequires: libX11-devel
+BuildRequires: libxml2-devel
+BuildRequires: ncurses-devel
+BuildRequires: transfig doxygen
+BuildRequires: texlive-latex texlive-makeindex
+BuildRequires: desktop-file-utils
+%ifnarch s390 s390x %{arm}
+BuildRequires: numactl-devel
+%endif
+%ifnarch %{arm}
+BuildRequires: rdma-core-devel
+%endif
+%ifarch %{ix86} x86_64
+%{?systemd_requires}
+BuildRequires: systemd
+%endif
+
+%description
+The Portable Hardware Locality (hwloc) software package provides
+a portable abstraction (across OS, versions, architectures, ...)
+of the hierarchical topology of modern architectures, including
+NUMA memory nodes, shared caches, processor sockets, processor cores
+and processing units (logical processors or "threads"). It also gathers
+various system attributes such as cache and memory information. It primarily
+aims at helping applications with gathering information about modern
+computing hardware so as to exploit it accordingly and efficiently.
+
+hwloc may display the topology in multiple convenient formats.
+It also offers a powerful programming interface (C API) to gather information
+about the hardware, bind processes, and much more.
+
+%package devel
+Summary: Headers and shared development libraries for hwloc
+Group: Development/Libraries
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%ifnarch %{arm}
+Requires: rdma-core-devel%{?_isa}
+%endif
+
+%description devel
+Headers and shared object symbolic links for the hwloc.
+
+%package libs
+Summary: Run time libraries for the hwloc
+Group: Development/Libraries
+
+%description libs
+Run time libraries for the hwloc
+
+%package gui
+Summary: The gui-based hwloc program(s)
+Group: Development/Libraries
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description gui
+GUI-based tool for displaying system topology information.
+
+%package plugins
+Summary: Plugins for hwloc
+Group: Development/Libraries
+Requires: %{name}-plugins%{?_isa} = %{version}-%{release}
+
+%description plugins
+ This package contains plugins for hwloc. This includes
+ - PCI support
+ - GL support
+ - libxml support
+
+%prep
+%autosetup -p1
+
+%build
+# The ./configure script will support --runstatedir= when generated with
+# autoconf 2.70. Until then, tell it about /run using the export:
+export runstatedir=/run
+%configure --enable-plugins --disable-silent-rules --docdir=%{_pkgdocdir}
+# Remove rpaths
+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}
+
+%install
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+
+# We don't ship .la files.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_pkgdocdir}
+cp -pr doc/examples %{buildroot}%{_pkgdocdir}
+# Fix for BZ1253977
+mv %{buildroot}%{_pkgdocdir}/examples/Makefile %{buildroot}%{_pkgdocdir}/examples/Makefile_%{_arch}
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
+
+# Avoid making hwloc-gui depend on hwloc
+rm %{buildroot}%{_mandir}/man1/lstopo.1
+ln %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1 %{buildroot}%{_mandir}/man1/lstopo.1
+
+# Deal with service file
+# https://github.com/open-mpi/hwloc/issues/221
+%ifarch %{ix86} x86_64
+mkdir -p %{buildroot}%{_unitdir}
+mv %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service %{buildroot}%{_unitdir}/
+%else
+rm %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service
+%endif
+
+%check
+LD_LIBRARY_PATH=$PWD/src/.libs make check
+
+%ifarch %{ix86} x86_64
+%post
+%systemd_post hwloc-dump-hwdata.service
+
+%preun
+%systemd_preun hwloc-dump-hwdata.service
+
+%postun
+%systemd_postun_with_restart hwloc-dump-hwdata.service
+%endif
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%{_bindir}/%{name}*
+%{_bindir}/lstopo-no-graphics
+%{_mandir}/man1/%{name}*
+%{_mandir}/man1/lstopo-no-graphics*
+%ifarch %{ix86} x86_64
+%{_sbindir}/hwloc-dump-hwdata
+%{_unitdir}/hwloc-dump-hwdata.service
+%endif
+
+%files devel
+%{_libdir}/pkgconfig/*
+%{_mandir}/man3/*
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*
+%{_includedir}/%{name}.h
+%{_pkgdocdir}/examples
+%{_libdir}/*.so
+
+%files libs
+%{_mandir}/man7/%{name}*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/%{name}.dtd
+%{_datadir}/%{name}/%{name}-valgrind.supp
+%dir %{_pkgdocdir}/
+%{_pkgdocdir}/*[^c]
+%{_libdir}/libhwloc*so.5*
+
+%files gui
+%{_bindir}/lstopo
+%{_mandir}/man1/lstopo.1*
+%{_datadir}/applications/lstopo.desktop
+
+%files plugins
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/hwloc*
+
+%changelog
+* Thu Nov 16 2017 Michal Schmidt <mschmidt@redhat.com> - 1.11.8-4
+- Rebase to 1.11.8.
+- Deal with rpaths using the method from Packaging Guidelines.
+- BuildRequire rdma-core-devel on s390(x).
+- Fix scriptlets related to hwloc-dump-hwdata.service.
+- Configure with /run as runstatedir.
+- Spec file cleanup.
+- Related: rhbz1482585
+
+* Tue Nov 7 2017 Don Zickus <dzickus@redhat.com> - 1.11.5-2
+- Build failure due to extra service file
+- Resolves: rhbz1482585
+
+* Fri Oct 27 2017 Don Zickus <dzickus@redhat.com> - 1.11.5-1
+- Rebase to 1.11.5
+- Resolves: rhbz1482585
+
+* Fri Mar 24 2017 Don Zickus <dzickus@redhat.com> - 1.11.2-2
+- Add support for Knights Mill
+ Resolves: rhbz1381313
+
+* Fri Jul 1 2016 Don Zickus <dzickus@redhat.com> - 1.11.2-1
+- Rebase to 1.11.2
+- Xeon Phi dump support
+ Resolves: rhbz1273325 rhbz1314459
+
+* Tue Jul 14 2015 Don Zickus <dzickus@redhat.com> - 1.7-5
+- Xeon Phi fixes
+ Resolves: rhbz1227786
+
+* Tue Jul 14 2015 Don Zickus <dzickus@redhat.com> - 1.7-4
+- Fix dangling symlink for hwloc-ls manpage
+ Resolves: rhbz1081236
+ Add desktop entry for lstopo
+ Resolves: rhbz1229313
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.7-3
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.7-2
+- Mass rebuild 2013-12-27
+
+* Fri Sep 13 2013 Jay Fenlason <fenlason@redhat.com> - 1.7-1.2
+- Split out lstopo into a -gui subpackage, so the hwloc base package
+ does not pull in all of X.
+ Resolves: rhbz910165
+
+* Thu Aug 1 2013 Jay Fenlason <fenlason@redhat.com> - 1.7-1.1
+- Remove build dependencies on libXNVCtrl-devel and w3m because RHEL
+ does not have them (w3m is available on x86_64, but not s390).
+ Resolves: rhbz978752
+
+* Thu May 9 2013 Jirka Hladky <hladky.jiri@gmail.com> - 1.7-1
+- Minor issue with the man page fixed
+
+* Tue Apr 23 2013 Jirka Hladky <hladky.jiri@gmail.com> - 1.7-0
+- Update to version 1.7
+
+* Thu Jan 31 2013 Jirka Hladky <hladky.jiri@gmail.com> - 1.6.1-1
+- Created libs package with reduced dependencies
+
+* Sat Jan 19 2013 Jirka Hladky <hladky.jiri@gmail.com> - 1.6.1-0
+- Update to version 1.6.1
+
+* Mon Nov 5 2012 Jirka Hladky <hladky.jiri@gmail.com> - 1.5.1-1
+- Update to version 1.5.1
+
+* Wed Aug 15 2012 Jirka Hladky <hladky.jiri@gmail.com> - 1.5-1
+- Update to version 1.5
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> - 1.4.2-1
+- Update to version 1.4.2
+
+* Wed Apr 18 2012 Jirka Hladky <hladky.jiri@gmail.com> - 1.4.1-2
+- Fixed build dependency for s390x
+
+* Mon Apr 16 2012 Jirka Hladky <hladky.jiri@gmail.com> - 1.4.1-1
+- Update to version 1.4.1
+- BZ812622 - libnuma was splitted out of numactl package
+
+* Thu Apr 12 2012 Dan Horák <dan[at]danny.cz> - 1.4-2
+- no InfiniBand on s390(x)
+
+* Tue Feb 14 2012 Jirka Hladky <hladky.jiri@gmail.com> - 1.4-1
+- Update to 1.4 release
+
+* Mon Nov 14 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.3-1
+- Update build for ARM support
+
+* Sat Oct 15 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.3-0
+ - 1.3 release
+ - added dependency on libibverbs-devel pciutils-devel
+ - cannot provide support for cuda (cuda_runtime_api.h).
+ - Nvidia CUDA is free but not open-source therefore not in Fedora.
+
+* Fri Oct 07 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.2-1
+ - moved *.so to the devel package
+ - libhwloc*so* in the main package
+
+* Wed Oct 05 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.2-0
+- 1.2.2 release
+- Fix for BZ https://bugzilla.redhat.com/show_bug.cgi?id=724937 for 32-bit PPC
+
+* Sat Sep 17 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.1-0
+- 1.2.1 release
+- Moved libhwloc*.so* to the main package
+
+* Mon Jun 27 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2-0
+- 1.2 release
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-0.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 3 2011 Dan Horák <dan[at]danny.cz> - 1.1-0.1
+- fix build on s390(x) where numactl is missing
+
+* Sat Jan 1 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.1-0
+- 1.1 rel# Patch to the 1.1 fix 2967 http://www.open-mpi.org/software/hwloc/nightly/v1.1/hwloc-1.1rc6r2967.tar.bz2
+- Fix hwloc_bitmap_to_ulong right after allocating the bitmap.
+- Fix the minimum width of NUMA nodes, caches and the legend in the graphical lstopo output.
+- Cleanup error management in hwloc-gather-topology.sh.
+- Add a manpage and usage for hwloc-gather-topology.sh on Linux.
+- Rename hwloc-gather-topology.sh to hwloc-gather-topology to be consistent with the upcoming version 1.2ease
+
+* Mon Jul 19 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.2-1
+- 1.0.2 release
+- added "check" section to the RPM SPEC file
+
+* Mon Jul 19 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.2-0.1.rc1r2330
+- 1.0.2 release candidate
+
+* Mon Jul 12 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.1-19
+- Fixed issues as described at https://bugzilla.redhat.com/show_bug.cgi?id=606498#c6
+
+* Fri Jul 09 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.1-18
+- Fixed issues as described at https://bugzilla.redhat.com/show_bug.cgi?id=606498
+
+* Fri Jun 18 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.1-17
+- Initial build