diff --git a/shadow-4.8.1-man-include-lastlog-file-caveat.patch b/shadow-4.8.1-man-include-lastlog-file-caveat.patch
new file mode 100644
index 0000000..7be60c5
--- /dev/null
+++ b/shadow-4.8.1-man-include-lastlog-file-caveat.patch
@@ -0,0 +1,33 @@
+From df6ec1d1693c8c80c323b40d6fc82bb549363db3 Mon Sep 17 00:00:00 2001
+From: Iker Pedrosa <ipedrosa@redhat.com>
+Date: Mon, 29 Mar 2021 05:26:28 +0200
+Subject: [PATCH] man: include lastlog file caveat (#313)
+
+man/lastlog.8.xml: add another point to the caveats section regarding
+the handling of the lastlog file by external tools.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=951564
+---
+ man/lastlog.8.xml | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/man/lastlog.8.xml b/man/lastlog.8.xml
+index fc096c8f..7e68282f 100644
+--- a/man/lastlog.8.xml
++++ b/man/lastlog.8.xml
+@@ -233,5 +233,12 @@
+       is no entries for users with UID between 170 and 800 lastlog will appear
+       to hang as it processes entries with UIDs 171-799).
+     </para>
++    <para>
++      Having high UIDs can create problems when handling the <term><filename>
++      /var/log/lastlog</filename></term> with external tools. Although the
++      actual file is sparse and does not use too much space, certain
++      applications are not designed to identify sparse files by default and may
++      require a specific option to handle them.
++    </para>
+   </refsect1>
+ </refentry>
+-- 
+2.30.2
+
diff --git a/shadow-utils.spec b/shadow-utils.spec
index 0d25632..8d1f5ea 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.8.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 2
 URL: https://github.com/shadow-maint/shadow
 Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz
@@ -15,17 +15,19 @@ Source6: shadow-utils.HOME_MODE.xml
 Patch0: shadow-4.6-redhat.patch
 # Be more lenient with acceptable user/group names - non upstreamable
 Patch1: shadow-4.8-goodname.patch
-# Docfix for newusers - could be upstreamed
+# https://github.com/shadow-maint/shadow/commit/7384865775b0203b9cf5337a047744f0a4555868
 Patch2: shadow-4.1.5.1-info-parent-dir.patch
 # Misc SElinux related changes - upstreamability unknown
 Patch6: shadow-4.8-selinux.patch
-# Syslog message change - could be upstreamed
+# https://github.com/shadow-maint/shadow/commit/a8361e741040cd926c9c93aac89820052531b1a3
 Patch11: shadow-4.1.5.1-logmsg.patch
 # SElinux related - upstreamability unknown
 Patch14: shadow-4.1.5.1-default-range.patch
-# Misc manual page changes - only some of them could be upstreamed
+# Misc manual page changes
+# https://github.com/shadow-maint/shadow/commit/c0818ab01d1896784245eedec9495e1e6e0260af
+# Changes in man/groupmems.8.xml, man/ja/man5/login.defs.5 and man/login.defs.5.xml not upstreamed
 Patch15: shadow-4.8.1-manfix.patch
-# Userdel usage message change - could be upstreamed
+# https://github.com/shadow-maint/shadow/commit/f4cbf38ad7801bab6fae50e9b5a2effc3c48a1ea
 Patch17: shadow-4.1.5.1-userdel-helpfix.patch
 # Date parsing improvement - could be upstreamed
 Patch19: shadow-4.2.1-date-parsing.patch
@@ -58,6 +60,8 @@ Patch43: shadow-4.8.1-useradd-man-clarification.patch
 Patch44: shadow-4.8.1-check-local-groups.patch
 # https://github.com/shadow-maint/shadow/commit/599cc003daf833bffdc9cbe0d33dc8b3e7ec74c8
 Patch45: shadow-4.8.1-commonio-force-lock-file-sync.patch
+# https://github.com/shadow-maint/shadow/commit/df6ec1d1693c8c80c323b40d6fc82bb549363db3
+Patch46: shadow-4.8.1-man-include-lastlog-file-caveat.patch
 
 License: BSD and GPLv2+
 BuildRequires: make
@@ -111,6 +115,7 @@ are used for managing group accounts.
 %patch43 -p1 -b .useradd-man-clarification
 %patch44 -p1 -b .check-local-groups
 %patch45 -p1 -b .commonio-force-lock-file-sync
+%patch46 -p1 -b .man-include-lastlog-file-caveat
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -264,6 +269,12 @@ done
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Mon Mar 29 2021 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.8.1-8
+- man: include lastlog file caveat (#951564)
+- Upstream links to several patches
+- Spec file cleanup by Robert Scheck
+- Add BuildRequires: make by Tom Stellard
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:4.8.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild