diff --git a/at-3.1.10-newpam.patch b/at-3.1.10-newpam.patch
index b253d56..e41ca06 100644
--- a/at-3.1.10-newpam.patch
+++ b/at-3.1.10-newpam.patch
@@ -1,16 +1,14 @@
 --- at-3.1.10/pam_atd.newpam	2007-01-30 13:04:19.000000000 +0100
 +++ at-3.1.10/pam_atd	2007-01-30 13:02:09.000000000 +0100
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,13 @@
 +# The PAM configuration file for the at daemon
 +#
 +#
 +auth		sufficient	pam_rootok.so
-+auth		required	pam_stack.so 
 +auth		include		system-auth
 +auth		required	pam_env.so
-+account		required	pam_stack.so 
 +account		include		system-auth
-+session		required	pam_stack.so 
++session		required	pam_loginuid.so 
 +session		include		system-auth
 +# Sets up user limits, please uncomment and read /etc/security/limits.conf
 +# to enable this functionality.
diff --git a/at.spec b/at.spec
index 0f79bd3..e1f0672 100644
--- a/at.spec
+++ b/at.spec
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 9%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -32,6 +32,7 @@ Patch15: at-3.1.10-makefile.patch
 Patch16: at-3.1.10-daylight.patch
 Patch17: at-3.1.10-perm.patch
 Patch18: at-3.1.10-newpam.patch
+Patch19: at-3.1.10-debug.patch
 
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
@@ -45,7 +46,6 @@ Conflicts: crontabs <= 1.5
 BuildRequires: smtpdaemon
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define debug_package %{nil}
 %description
 At and batch read commands from standard input or from a specified
 file. At allows you to specify that a command will be run at a
@@ -85,6 +85,7 @@ cp %{SOURCE1} .
 %patch16 -p1 -b .daylight
 %patch17 -p1 -b .perm
 %patch18 -p1 -b .newpam
+%patch19 -p1 -b .debug
 
 %build
 # patch10 touches configure.in
@@ -98,8 +99,6 @@ rm -f lex.yy.* y.tab.*
 	--with-selinux \
 %if %{WITH_PAM}
 	--with-pam
-%else
-
 %endif
 
 make
@@ -173,7 +172,7 @@ fi
 %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(0640,root,daemon)		%config(noreplace) /etc/pam.d/atd
+%attr(0644,root,root)		%config(noreplace) /etc/pam.d/atd
 %{_sbindir}/atrun
 %attr(0755,root,root)	%{_sbindir}/atd
 %{_mandir}/man*/*
@@ -183,6 +182,13 @@ fi
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Tue Mar 27 2007 Marcela Maslanova <mmaslano@redhat.com> - 3.1.10-11
+- mistake in pam_atd
+- rhbz#234120
+
+* Tue Mar 05 2007 Marcela Maslanova <mmaslano@redhat.com> - 3.1.10-10
+- rhbz#224597
+
 * Mon Mar 03 2007 Marcela Maslanova <mmaslano@redhat.com> - 3.1.10-9
 - review