diff --git a/libdbusmenu.changes b/libdbusmenu.changes
index 83cea9a..8576674 100644
--- a/libdbusmenu.changes
+++ b/libdbusmenu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:34:14 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Thu Sep  8 13:41:52 UTC 2016 - dimstar@opensuse.org
 
diff --git a/libdbusmenu.spec b/libdbusmenu.spec
index 6c8a57b..df3bd4d 100644
--- a/libdbusmenu.spec
+++ b/libdbusmenu.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdbusmenu
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -24,9 +24,9 @@ Name:           libdbusmenu
 Version:        16.04.0
 Release:        0
 Summary:        Small library that passes a menu structure across DBus
-License:        GPL-3.0 and (LGPL-2.1 or LGPL-3.0)
+License:        GPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only)
 Group:          System/Libraries
-Url:            https://launchpad.net/dbusmenu
+URL:            https://launchpad.net/dbusmenu
 Source:         https://launchpad.net/libdbusmenu/16.04/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -214,24 +214,17 @@ mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \
   %{buildroot}%{_docdir}/%{name}-glib-devel/examples/
 
 %post glib%{soname_glib} -p /sbin/ldconfig
-
 %postun glib%{soname_glib} -p /sbin/ldconfig
-
 %post gtk%{soname_gtk2} -p /sbin/ldconfig
-
 %postun gtk%{soname_gtk2} -p /sbin/ldconfig
-
 %post gtk3-%{soname_gtk3} -p /sbin/ldconfig
-
 %postun gtk3-%{soname_gtk3} -p /sbin/ldconfig
-
 %post jsonloader%{soname_jsonloader} -p /sbin/ldconfig
-
 %postun jsonloader%{soname_jsonloader} -p /sbin/ldconfig
 
 %files tools
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libexecdir}/dbusmenu-bench
 %{_libexecdir}/dbusmenu-dumper
 %{_libexecdir}/dbusmenu-testapp
@@ -242,18 +235,18 @@ mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \
 %doc %{_docdir}/%{name}-tools/README.dbusmenu-bench
 
 %files glib%{soname_glib}
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libdir}/libdbusmenu-glib.so.%{soname_glib}*
 
 %files -n typelib-1_0-Dbusmenu-0_4
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib
 
 %files glib-devel
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %dir %{_includedir}/libdbusmenu-glib-0.4/
 %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/
 %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/client.h
@@ -273,23 +266,23 @@ mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \
 %doc %{_docdir}/%{name}-glib-devel/examples/glib-server-nomenu.c
 
 %files glib-doc
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %doc %{_datadir}/gtk-doc/html/libdbusmenu-glib/
 
 %files gtk%{soname_gtk2}
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libdir}/libdbusmenu-gtk.so.%{soname_gtk2}*
 
 %files -n typelib-1_0-DbusmenuGtk-0_4
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib
 
 %files gtk-devel
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %dir %{_includedir}/libdbusmenu-gtk-0.4/
 %dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/
 %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/client.h
@@ -304,18 +297,18 @@ mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \
 %{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi
 
 %files gtk3-%{soname_gtk3}
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libdir}/libdbusmenu-gtk3.so.%{soname_gtk3}*
 
 %files -n typelib-1_0-DbusmenuGtk3-0_4
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib
 
 %files gtk3-devel
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %dir %{_includedir}/libdbusmenu-gtk3-0.4/
 %dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/
 %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/client.h
@@ -330,18 +323,18 @@ mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \
 %{_datadir}/vala/vapi/DbusmenuGtk3-0.4.vapi
 
 %files gtk-doc
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %doc %{_datadir}/gtk-doc/html/libdbusmenu-gtk/
 
 %files jsonloader%{soname_jsonloader}
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %{_libdir}/libdbusmenu-jsonloader.so.%{soname_jsonloader}*
 
 %files jsonloader-devel
-%defattr(-,root,root)
-%doc COPYING* NEWS
+%license COPYING*
+%doc NEWS
 %dir %{_includedir}/libdbusmenu-glib-0.4/
 %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/
 %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/json-loader.h