diff -u pam-1.0.1/debian/changelog pam-1.0.1/debian/changelog
--- pam-1.0.1/debian/changelog
+++ pam-1.0.1/debian/changelog
@@ -1,3 +1,9 @@
+pam (1.0.1-1ubuntu2) intrepid; urgency=low
+
+  * Documented how to set limits for root user.  (LP: #65244)
+
+ -- Jonathan Marsden <jmarsden@fastmail.fm>  Sat, 02 Aug 2008 12:03:43 -0700
+
 pam (1.0.1-1ubuntu1) intrepid; urgency=low
 
   * Merge from Debian unstable
diff -u pam-1.0.1/debian/patches-applied/series pam-1.0.1/debian/patches-applied/series
--- pam-1.0.1/debian/patches-applied/series
+++ pam-1.0.1/debian/patches-applied/series
@@ -27,0 +28 @@
+root_limits.conf_documentation
only in patch2:
unchanged:
--- pam-1.0.1.orig/debian/patches-applied/root_limits.conf_documentation
+++ pam-1.0.1/debian/patches-applied/root_limits.conf_documentation
@@ -0,0 +1,46 @@
+Index: pam-1.0.1/modules/pam_limits/limits.conf
+===================================================================
+--- pam-1.0.1.orig/modules/pam_limits/limits.conf	2008-08-02 10:39:32.000000000 -0700
++++ pam-1.0.1/modules/pam_limits/limits.conf	2008-08-02 10:43:12.000000000 -0700
+@@ -11,6 +11,9 @@
+ #        - the wildcard *, for default entry
+ #        - the wildcard %, can be also used with %group syntax,
+ #                 for maxlogin limit
++#        - NOTE: group and wildcard limits are not applied to root.
++#          To apply a limit to the root user, <domain> must be
++#          the literal username root.
+ #
+ #<type> can have the two values:
+ #        - "soft" for enforcing the soft limits
+@@ -41,6 +44,7 @@
+ #
+ 
+ #*               soft    core            0
++#root            hard    core            100000
+ #*               hard    rss             10000
+ #@student        hard    nproc           20
+ #@faculty        soft    nproc           20
+Index: pam-1.0.1/modules/pam_limits/limits.conf.5.xml
+===================================================================
+--- pam-1.0.1.orig/modules/pam_limits/limits.conf.5.xml	2008-08-02 10:43:51.000000000 -0700
++++ pam-1.0.1/modules/pam_limits/limits.conf.5.xml	2008-08-02 10:48:24.000000000 -0700
+@@ -57,6 +57,11 @@
+               </para>
+             </listitem>
+           </itemizedlist>
++	  <para>
++	    <emphasis remap='B'>NOTE:</emphasis> group and wildcard limits are not
++	    applied to the root user.  To set a limit for the root user, this field
++	    must contain the literal username <emphasis remap='B'>root</emphasis>.
++	  </para>
+         </listitem>
+       </varlistentry>
+ 
+@@ -266,6 +271,7 @@
+     </para>
+     <programlisting>
+ *               soft    core            0
++root            hard    core            100000
+ *               hard    rss             10000
+ @student        hard    nproc           20
+ @faculty        soft    nproc           20