diff --git a/libvirt.changes b/libvirt.changes
index 4c0b997..beb1133 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 18 04:55:22 UTC 2016 - jfehlig@suse.com
+
+- spec: Remove %defattr usage
+  Inspired by upstream commit 90f9193c
+
 -------------------------------------------------------------------
 Fri May 13 18:12:40 UTC 2016 - jfehlig@suse.com
 
diff --git a/libvirt.spec b/libvirt.spec
index 8c98f65..0cde347 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1554,13 +1554,11 @@ fi
 %endif
 
 %files
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}/libvirt.README
 
 %if %{with_libvirtd}
 
 %files daemon
-%defattr(-, root, root)
 %{_sbindir}/libvirtd
 %{_sbindir}/virtlogd
 %{_sbindir}/virtlockd
@@ -1695,7 +1693,6 @@ fi
     %if %{with_network}
 
 %files daemon-config-network
-%defattr(-, root, root)
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
     %endif
@@ -1703,7 +1700,6 @@ fi
     %if %{with_nwfilter}
 
 %files daemon-config-nwfilter
-%defattr(-, root, root)
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
 %{_sysconfdir}/libvirt/nwfilter/*.xml
     %endif
@@ -1712,7 +1708,6 @@ fi
         %if %{with_interface}
 
 %files daemon-driver-interface
-%defattr(-, root, root)
 %dir %{_libdir}/%{name}/connection-driver
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
         %endif
@@ -1720,7 +1715,6 @@ fi
         %if %{with_network}
 
 %files daemon-driver-network
-%defattr(-, root, root)
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
@@ -1734,7 +1728,6 @@ fi
         %if %{with_nodedev}
 
 %files daemon-driver-nodedev
-%defattr(-, root, root)
 %dir %{_libdir}/%{name}/connection-driver
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
         %endif
@@ -1742,21 +1735,18 @@ fi
         %if %{with_nwfilter}
 
 %files daemon-driver-nwfilter
-%defattr(-, root, root)
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
 %dir %{_libdir}/%{name}/connection-driver
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
         %endif
 
 %files daemon-driver-secret
-%defattr(-, root, root)
 %dir %{_libdir}/%{name}/connection-driver
 %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
 
         %if %{with_storage}
 
 %files daemon-driver-storage
-%defattr(-, root, root)
             %if %{with_storage_disk}
 %attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper
             %endif
@@ -1767,8 +1757,6 @@ fi
         %if %{with_qemu}
 
 %files daemon-driver-qemu
-%defattr(-, root, root)
-%defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
@@ -1784,7 +1772,6 @@ fi
         %if %{with_lxc}
 
 %files daemon-driver-lxc
-%defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
@@ -1800,7 +1787,6 @@ fi
         %if %{with_uml}
 
 %files daemon-driver-uml
-%defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
@@ -1811,7 +1797,6 @@ fi
         %if %{with_xen}
 
 %files daemon-driver-xen
-%defattr(-, root, root)
 %dir %{_libdir}/%{name}/connection-driver
 %{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so
         %endif
@@ -1819,7 +1804,6 @@ fi
         %if %{with_libxl}
 
 %files daemon-driver-libxl
-%defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
@@ -1834,7 +1818,6 @@ fi
         %if %{with_vbox}
 
 %files daemon-driver-vbox
-%defattr(-, root, root)
 %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
         %endif
     %endif # with_driver_modules
@@ -1842,41 +1825,35 @@ fi
     %if %{with_qemu}
 
 %files daemon-qemu
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}/libvirt-daemon-qemu.README
     %endif
 
     %if %{with_lxc}
 
 %files daemon-lxc
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}/libvirt-daemon-lxc.README
     %endif
 
     %if %{with_uml}
 
 %files daemon-uml
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}/libvirt-daemon-uml.README
     %endif
 
     %if %{with_xen} || %{with_libxl}
 
 %files daemon-xen
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}/libvirt-daemon-xen.README
     %endif
 
     %if %{with_vbox}
 
 %files daemon-vbox
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}/libvirt-daemon-vbox.README
     %endif
 %endif # with_libvirtd
 
 %files client -f %{name}.lang
-%defattr(-, root, root)
 %doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO
 %doc %{_mandir}/man1/virsh.1*
 %doc %{_mandir}/man1/virt-xml-validate.1*
@@ -1927,7 +1904,6 @@ fi
 %endif
 
 %files devel
-%defattr(-, root, root)
 %{_libdir}/libvirt.so
 %{_libdir}/libvirt-qemu.so
 %{_libdir}/libvirt-lxc.so
@@ -1941,7 +1917,6 @@ fi
 %{_datadir}/libvirt/api/libvirt-lxc-api.xml
 
 %files doc
-%defattr(-, root, root)
 # Website
 %dir %{_docdir}/libvirt
 %doc %{_docdir}/%{name}/*.png
@@ -1958,7 +1933,6 @@ fi
 %if %{with_sanlock}
 
 %files lock-sanlock
-%defattr(-, root, root)
 %doc %{_mandir}/man8/virt-sanlock-cleanup.8*
     %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/%{name}/qemu-sanlock.conf
@@ -1981,7 +1955,6 @@ fi
 %if %{with_wireshark}
 
 %files -n wireshark-plugin-libvirt
-%defattr(-, root, root)
 %{_libdir}/wireshark/plugins/libvirt.so
 %endif