diff --git a/libpfm.changes b/libpfm.changes
index 73533be..d336a2e 100644
--- a/libpfm.changes
+++ b/libpfm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 14 14:53:05 UTC 2017 - mpluskal@suse.com
+
+- Cleanup spec file
+
 -------------------------------------------------------------------
 Tue Dec 27 10:37:25 UTC 2016 - adam.majer@suse.de
 
diff --git a/libpfm.spec b/libpfm.spec
index 8188a40..01fae4d 100644
--- a/libpfm.spec
+++ b/libpfm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libpfm
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -93,10 +93,12 @@ make \
     %{python_config} \
     LDCONFIG=/bin/true \
     install
-mkdir -p %{buildroot}/%{_bindir}
-install -m 0755 examples/check_events %{buildroot}/%{_bindir}/check_events
-install -m 0755 examples/showevtinfo %{buildroot}/%{_bindir}/showevtinfo
-install -m 0755 perf_examples/evt2raw %{buildroot}/%{_bindir}/evt2raw
+install -D -p -m 0755 examples/check_events \
+  %{buildroot}/%{_bindir}/check_events
+install -D -p -m 0755 examples/showevtinfo \
+  %{buildroot}/%{_bindir}/showevtinfo
+install -D -p -m 0755 perf_examples/evt2raw \
+  %{buildroot}/%{_bindir}/evt2raw
 
 # temp hack to fix rpmlint file-contains-buildroot for *.pyc
 # http://lists.opensuse.org/opensuse-factory/2012-01/msg00235.html
@@ -104,29 +106,28 @@ find "%{buildroot}/%{python_sitearch}/" -name '*.pyc' -delete
 python -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}/", ddir="%{python_sitearch}/", force=1)'
 
 %post -n %{vname} -p /sbin/ldconfig
-
 %postun	-n %{vname} -p /sbin/ldconfig
 
 %files -n %{vname}
-%defattr(644,root,root,755)
+%defattr(-,root,root)
 %doc README
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%{_libdir}/libpfm.so.*
 
 %files devel
-%defattr(644,root,root,755)
+%defattr(-,root,root)
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_libdir}/lib*.so
-%attr(755,root,root) %{_bindir}/check_events
-%attr(755,root,root) %{_bindir}/showevtinfo
-%attr(755,root,root) %{_bindir}/evt2raw
+%{_bindir}/check_events
+%{_bindir}/showevtinfo
+%{_bindir}/evt2raw
 
 %files devel-static
 %defattr(-,root,root)
 %{_libdir}/lib*.a
 
 %files -n python-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{python_sitearch}/*
+%defattr(-,root,root)
+%{python_sitearch}/*
 
 %changelog