diff --git a/ntfs-3g_ntfsprogs.changes b/ntfs-3g_ntfsprogs.changes
index f22c9a6..189daf0 100644
--- a/ntfs-3g_ntfsprogs.changes
+++ b/ntfs-3g_ntfsprogs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug  6 09:04:06 UTC 2018 - schwab@suse.de
+
+- Rebuild configure to pick up the updated AC_HEADER_MAJOR
+- Use %license for COPYING, COPYING.LIB
+
 -------------------------------------------------------------------
 Wed Jul 12 11:19:52 UTC 2017 - jengelh@inai.de
 
diff --git a/ntfs-3g_ntfsprogs.spec b/ntfs-3g_ntfsprogs.spec
index 8a0eee3..38bcffa 100644
--- a/ntfs-3g_ntfsprogs.spec
+++ b/ntfs-3g_ntfsprogs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ntfs-3g_ntfsprogs
 #
-# Copyright (c) 2017 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
@@ -20,13 +20,14 @@
 
 Name:           ntfs-3g_ntfsprogs
 Summary:        NTFS Support in Userspace
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Filesystems
 Version:        2017.3.23
 Release:        0
 Source:         http://tuxera.com/opensource/%{name}-%{version}.tgz
 Source2:        21-storage-ntfs-3g.fdi
 Url:            http://www.tuxera.com/community/ntfs-3g-download/
+BuildRequires:  autoconf
 # SLES 11 is still supported
 %if 0%{?sles_version} && 0%{?suse_version} == 1110
 BuildRequires:  cpp48
@@ -49,7 +50,7 @@ Vista and Windows Seven.
 
 %package -n ntfs-3g
 Summary:        NTFS Support in Userspace
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Filesystems
 Provides:       ntfsprogs-fuse = 1.13.1
 Obsoletes:      ntfsprogs-fuse < 1.13.1
@@ -68,7 +69,7 @@ Vista and Windows Seven.
 
 %package -n libntfs-3g%sover
 Summary:        NTFS Support in Userspace -- Library
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Filesystems
 
 %description -n libntfs-3g%sover
@@ -78,7 +79,7 @@ Vista and Windows Seven.
 
 %package -n libntfs-3g-devel
 Summary:        NTFS Support in Userspace -- Development Files
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Filesystems
 Requires:       glibc-devel
 Requires:       libntfs-3g%sover = %{version}
@@ -92,7 +93,7 @@ Vista and Windows Seven.
 
 %package -n ntfsprogs
 Summary:        NTFS Utilities
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Filesystems
 
 %description -n ntfsprogs
@@ -102,7 +103,7 @@ options to display the version number and usage syntax.
 
 %package -n ntfsprogs-extra
 Summary:        NTFS Utilities which can damage your filesystem such that Windows can't read it
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Filesystems
 
 %description -n ntfsprogs-extra
@@ -115,6 +116,8 @@ They have been orphaned for ten years and are unlikely to be upgraded (except nt
 
 %prep
 %setup -q
+# Rebuild configure to pick up the updated AC_HEADER_MAJOR
+autoconf
 
 %build
 %if 0%{?sles_version} && 0%{?suse_version} == 1110
@@ -184,7 +187,8 @@ fi
 
 %files -n ntfs-3g
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%doc AUTHORS ChangeLog CREDITS NEWS README
+%license COPYING
 %dir %{_datadir}/hal
 %dir %{_datadir}/hal/fdi
 %dir %{_datadir}/hal/fdi/policy
@@ -214,7 +218,7 @@ fi
 
 %files -n libntfs-3g%sover
 %defattr(-,root,root,-)
-%doc COPYING.LIB
+%license COPYING.LIB
 %{_libdir}/libntfs-3g.so.*
 
 %files -n libntfs-3g-devel
@@ -225,7 +229,8 @@ fi
 
 %files -n ntfsprogs
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%doc AUTHORS ChangeLog CREDITS NEWS README
+%license COPYING
 /sbin/mkfs.ntfs
 %{_sbindir}/mkntfs
 %{_sbindir}/ntfsclone
@@ -264,7 +269,8 @@ fi
 
 %files -n ntfsprogs-extra
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%doc AUTHORS ChangeLog CREDITS NEWS README
+%license COPYING
 %{_bindir}/ntfsck
 %{_bindir}/ntfsdump_logfile
 %{_bindir}/ntfsfallocate