diff --git a/functions/imap.xml b/functions/imap.xml
index 330cbfe60c..ba514bbab8 100644
--- a/functions/imap.xml
+++ b/functions/imap.xml
@@ -1,4 +1,4 @@
- <reference id="ref.imap">
+ <reference id='ref.imap'>
   <title>IMAP, POP3 and NNTP functions</title>
   <titleabbrev>IMAP</titleabbrev>
 
@@ -31,13 +31,13 @@
     <itemizedlist>
      <listitem>
       <simpara>
-       <ulink url="&url.rfc;rfc821.html">RFC821</ulink>: Simple Mail
+       <ulink url="&url.rfc;rfc2821.html">RFC2821</ulink>: Simple Mail
 			 Transfer Protocol (SMTP).
       </simpara>
      </listitem>
      <listitem>
       <simpara>
-       <ulink url="&url.rfc;rfc822.html">RFC822</ulink>: Standard for
+       <ulink url="&url.rfc;rfc2822.html">RFC822</ulink>: Standard for
 			 ARPA internet text messages.
       </simpara>
      </listitem>
@@ -837,7 +837,7 @@ imap_close($mbox);
     </funcsynopsis>
     <para>
      This function causes a fetch of the complete, unfiltered 
-     <ulink url="&url.rfc;rfc822.html">RFC822</ulink>
+     <ulink url="&url.rfc;rfc2822.html">RFC2822</ulink>
      format header of the specified message as a text string and
      returns that text string.
     </para>
@@ -2163,7 +2163,7 @@ imap_close($mbox);
     </funcsynopsis>
     <para>
      This function parses the address string as defined in 
-     <ulink url="&url.rfc;rfc822.html">RFC822</ulink> and 
+     <ulink url="&url.rfc;rfc2822.html">RFC2822</ulink> and 
      for each address, returns an array of objects.  
      The objects properties are:
     </para>
@@ -2258,7 +2258,7 @@ while(list($key,$val)=each($address_array)){
     </funcsynopsis>
     <para>
      Returns a properly formatted email address as defined in 
-     <ulink url="&url.rfc;rfc822.html">RFC822</ulink>
+     <ulink url="&url.rfc;rfc2822.html">RFC2822</ulink>
      given the mailbox, host, and personal info.
     </para>
     <para>