diff --git a/SOURCES/at-3.1.13-document-n.patch b/SOURCES/at-3.1.13-document-n.patch
new file mode 100644
index 0000000..21f2477
--- /dev/null
+++ b/SOURCES/at-3.1.13-document-n.patch
@@ -0,0 +1,22 @@
+diff -up at-3.1.13/atd.8.in.document-n at-3.1.13/atd.8.in
+--- at-3.1.13/atd.8.in.document-n	2011-06-25 14:43:14.000000000 +0200
++++ at-3.1.13/atd.8.in	2017-09-14 15:06:08.082433012 +0200
+@@ -9,6 +9,7 @@ atd \- run jobs queued for later executi
+ .IR batch_interval ]
+ .RB [ -d ]
+ .RB [ -f ]
++.RB [ -n ]
+ .RB [ -s ]
+ .SH DESCRIPTION
+ .B atd
+@@ -40,6 +41,10 @@ Run
+ .BR atd
+ in the foreground.
+ .TP 8
++.B -n
++Append the hostname of the system to the subject of the e-mails sent by
++.BR atd .
++.TP 8
+ .B -s
+ Process the at/batch queue only once.
+ This is primarily of use for compatibility with old versions of
diff --git a/SPECS/at.spec b/SPECS/at.spec
index d206aec..dd89b4a 100644
--- a/SPECS/at.spec
+++ b/SPECS/at.spec
@@ -4,7 +4,7 @@
 Summary:	Job spooling tools
 Name:		at
 Version:	3.1.13
-Release:	22%{?dist}.2
+Release:	23%{?dist}
 # http://packages.debian.org/changelogs/pool/main/a/at/current/copyright
 # + install-sh is MIT license with changes under Public Domain
 License:	GPLv3+ and GPLv2+ and ISC and MIT and Public Domain
@@ -33,6 +33,7 @@ Patch12:        at-3.1.10-filter-environment.patch
 Patch13:	at-3.1.13-fclose-error.patch
 Patch14:	at-3.1.13-clear-nonjobs.patch
 Patch15:	at-3.1.13-utc-dst.patch
+Patch16:	at-3.1.13-document-n.patch
 Patch17:	at-3.1.13-aborted-jobs.patch
 
 BuildRequires: fileutils /etc/init.d
@@ -91,6 +92,7 @@ cp %{SOURCE1} .
 %patch13 -p1 -b .fclose
 %patch14 -p1 -b .clear-nonjobs
 %patch15 -p1 -b .dst
+%patch16 -p1 -b .document-n
 %patch17 -p1 -b .aborted-jobs
 
 %build
@@ -152,7 +154,7 @@ make test
 %post
 touch %{_localstatedir}/spool/at/.SEQ
 chmod 600 %{_localstatedir}/spool/at/.SEQ
-chown daemon:daemon %{_localstatedir}/spool/at/.SEQ
+chown root:root %{_localstatedir}/spool/at/.SEQ
 %systemd_post atd.service
 
 %preun
@@ -181,9 +183,9 @@ chown daemon:daemon %{_localstatedir}/spool/at/.SEQ
 %doc docs/*
 %attr(0644,root,root)		%config(noreplace) %{_sysconfdir}/at.deny
 %attr(0644,root,root)		%config(noreplace) %{_sysconfdir}/sysconfig/atd
-%attr(0700,daemon,daemon)	%dir %{_localstatedir}/spool/at
-%attr(0600,daemon,daemon)	%verify(not md5 size mtime) %ghost %{_localstatedir}/spool/at/.SEQ
-%attr(0700,daemon,daemon)	%dir %{_localstatedir}/spool/at/spool
+%attr(0700,root,root)		%dir %{_localstatedir}/spool/at
+%attr(0600,root,root)		%verify(not md5 size mtime) %ghost %{_localstatedir}/spool/at/.SEQ
+%attr(0700,root,root)		%dir %{_localstatedir}/spool/at/spool
 %attr(0644,root,root)		%config(noreplace) %{_sysconfdir}/pam.d/atd
 %{_sbindir}/atrun
 %attr(0755,root,root)		%{_sbindir}/atd
@@ -198,7 +200,9 @@ chown daemon:daemon %{_localstatedir}/spool/at/.SEQ
 %attr(0755,root,root)		%{_initrddir}/atd
 
 %changelog
-* Wed Dec 20 2017 Tomáš Mráz <tmraz@redhat.com> - 3.1.13-22.2
+* Thu Sep 14 2017 Tomáš Mráz <tmraz@redhat.com> - 3.1.13-23
+- fix the ownership of the spool directory (#1414228)
+- document the -n option of atd (#739870)
 - fix handling of the aborted jobs (due to possibly
   temporary conditions) and avoid flooding the syslog