diff --git a/gap.changes b/gap.changes
index 9e81d13..f01ba5f 100644
--- a/gap.changes
+++ b/gap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 20 16:58:25 UTC 2017 - jengelh@inai.de
+
+- Update macros.gap to classify well-known license text files
+  as %doc.
+
 -------------------------------------------------------------------
 Fri Sep  8 20:23:32 UTC 2017 - jengelh@inai.de
 
diff --git a/gap.spec b/gap.spec
index 213c2e5..7200dc6 100644
--- a/gap.spec
+++ b/gap.spec
@@ -439,9 +439,9 @@ cp -a . "$b/%gapdir";
 rm -Rf "$b/%gapdir"/{autom4*,cnf,configu*,.hgignore,.travis.yml}
 
 # RPM extras
-mkdir -p "$b/%_sysconfdir/rpm"
-cp "%_sourcedir/macros.gap" "$b/%_sysconfdir/rpm/"
-cat >>"$b/%_sysconfdir/rpm/macros.gap" <<-EOF
+mkdir -p "$b/%_prefix/lib/rpm/macros.d"
+cp "%_sourcedir/macros.gap" "$b/%_prefix/lib/rpm/macros.d/"
+cat >>"$b/%_prefix/lib/rpm/macros.d/macros.gapdirs" <<-EOF
 	# Anchor directory for %%files list
 	%%gap_sitelib_anchor %gap_sitelib_anchor
 	%%gap_sitearch_anchor %gap_sitearch_anchor
@@ -526,7 +526,7 @@ EOF
 
 %files rpm-devel
 %defattr(-,root,root)
-%config %_sysconfdir/rpm/
+%_prefix/lib/rpm/
 
 %files small-groups
 %defattr(-,root,root)
diff --git a/macros.gap b/macros.gap
index f3c0a6d..8b5ce48 100644
--- a/macros.gap
+++ b/macros.gap
@@ -6,19 +6,26 @@
 # The macro sets $gapmoddir.
 #
 %gappkg_simple_install() \
+	set -x; \
 	moddir="$(readlink -f .)"; \
 	if [ "%_target_cpu" = "noarch" ]; then \
 		moddir="%gap_sitelib/${moddir##*/}"; \
 		stopdir="%gap_sitelib_anchor"; \
-		mkdir -p "%buildroot/$moddir"; \
-		mv * "%buildroot/$moddir/"; \
+		mkdir -pv "%buildroot/$moddir"; \
+		mv -v * "%buildroot/$moddir/"; \
 	else \
 		moddir="%gap_sitearch/${moddir##*/}"; \
 		stopdir="%gap_sitearch_anchor"; \
-		mkdir -p "%buildroot/$moddir"; \
-		cp -a * "%buildroot/$moddir/"; \
+		mkdir -pv "%buildroot/$moddir"; \
+		cp -av * "%buildroot/$moddir/"; \
 	fi; \
-	echo "$moddir" >>"%name.files"; \
+	\
+	fmoddir="${moddir#/}"; \
+	( \
+		echo "$fmoddir"; \
+		cd "%buildroot"; \
+		find "$fmoddir" -type f "(" -iname "LICENCE*" -o -iname "LICENSE*" -o -iname "COPYING*" -o -iname "GPL*" ")" -printf "%%%%doc /%%p\\n"; \
+	) >>"%name.files"; \
 	d="${moddir%/*}"; \
 	while [ -n "$d" -a "$d" != "/" -a "$d" != "$stopdir" ]; do \
 		echo "%%dir $d" >>"%name.files"; \