diff --git a/hwloc.spec b/hwloc.spec
index e905448..4fae643 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -103,6 +103,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
 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
+rm %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service
+
 %check
 make check
 
@@ -115,6 +119,7 @@ make check
 %{_bindir}/lstopo-no-graphics
 %{_mandir}/man1/%{name}*
 %{_mandir}/man1/lstopo-no-graphics*
+%{_sbindir}/hwloc-dump-hwdata
 
 %files devel
 %{_libdir}/pkgconfig/*
@@ -140,7 +145,6 @@ make check
 %{_datadir}/applications/lstopo.desktop
 
 %files plugins
-%dir %{_libdir}/%{name}
 %{_libdir}/hwloc*
 
 %changelog