diff --git a/python-libmount.changes b/python-libmount.changes
index 7abc36a..fd0d2f8 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 20 13:02:18 CET 2018 - kukuk@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
 -------------------------------------------------------------------
 Fri Feb  9 15:08:22 CET 2018 - sbrabec@suse.com
 
diff --git a/python-libmount.spec b/python-libmount.spec
index 1f09d10..7f433e3 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -72,8 +72,8 @@ Name:           python-libmount
 %endif
 %endif
 Summary:        %main_summary
-License:        GPL-2.0+
-Group:          %main_group
+License:        GPL-2.0-or-later
+Group:          %group_pl
 BuildRequires:  audit-devel
 BuildRequires:  bc
 BuildRequires:  binutils-devel
@@ -396,6 +396,7 @@ SMP systems.
 %if %build_util_linux
 %package -n python-libmount
 Summary:        %summary_pl
+License:        GPL-2.0-or-later
 Group:          %group_pl
 
 %description -n python-libmount
@@ -884,11 +885,11 @@ getent passwd uuidd >/dev/null || \
 # Common files for all archs
 %defattr(-,root,root)
 # util-linux documentation files
-%doc README.licensing
-%doc COPYING
-%doc Documentation/licenses/COPYING.BSD-3
-%doc Documentation/licenses/COPYING.LGPLv2.1
-%doc Documentation/licenses/COPYING.UCB
+%license README.licensing
+%license COPYING
+%license Documentation/licenses/COPYING.BSD-3
+%license Documentation/licenses/COPYING.LGPLv2.1
+%license Documentation/licenses/COPYING.UCB
 %doc Documentation/blkid.txt
 %doc Documentation/cal.txt
 %doc Documentation/col.txt
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 7abc36a..fd0d2f8 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 20 13:02:18 CET 2018 - kukuk@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
 -------------------------------------------------------------------
 Fri Feb  9 15:08:22 CET 2018 - sbrabec@suse.com
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index 2064775..3a3d229 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -72,7 +72,7 @@ Name:           util-linux-systemd
 %endif
 %endif
 Summary:        %main_summary
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          %main_group
 BuildRequires:  audit-devel
 BuildRequires:  bc
@@ -884,11 +884,11 @@ getent passwd uuidd >/dev/null || \
 # Common files for all archs
 %defattr(-,root,root)
 # util-linux documentation files
-%doc README.licensing
-%doc COPYING
-%doc Documentation/licenses/COPYING.BSD-3
-%doc Documentation/licenses/COPYING.LGPLv2.1
-%doc Documentation/licenses/COPYING.UCB
+%license README.licensing
+%license COPYING
+%license Documentation/licenses/COPYING.BSD-3
+%license Documentation/licenses/COPYING.LGPLv2.1
+%license Documentation/licenses/COPYING.UCB
 %doc Documentation/blkid.txt
 %doc Documentation/cal.txt
 %doc Documentation/col.txt
diff --git a/util-linux.changes b/util-linux.changes
index 7abc36a..fd0d2f8 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 20 13:02:18 CET 2018 - kukuk@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
 -------------------------------------------------------------------
 Fri Feb  9 15:08:22 CET 2018 - sbrabec@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index 1992c3e..b9b7cf8 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -72,7 +72,7 @@ Name:           util-linux
 %endif
 %endif
 Summary:        %main_summary
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          %main_group
 BuildRequires:  audit-devel
 BuildRequires:  bc
@@ -884,11 +884,11 @@ getent passwd uuidd >/dev/null || \
 # Common files for all archs
 %defattr(-,root,root)
 # util-linux documentation files
-%doc README.licensing
-%doc COPYING
-%doc Documentation/licenses/COPYING.BSD-3
-%doc Documentation/licenses/COPYING.LGPLv2.1
-%doc Documentation/licenses/COPYING.UCB
+%license README.licensing
+%license COPYING
+%license Documentation/licenses/COPYING.BSD-3
+%license Documentation/licenses/COPYING.LGPLv2.1
+%license Documentation/licenses/COPYING.UCB
 %doc Documentation/blkid.txt
 %doc Documentation/cal.txt
 %doc Documentation/col.txt