diff --git a/ChangeLog b/ChangeLog
index 55c25c119..0c61d04e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-24  Badlop  <badlop@process-one.net>
 
+	* doc/guide.tex: mod_vcard_ldap replace NICK with NICKNAME (thanks
+	to Andreas Ntaflos)
+	* doc/guide.html: Likewise
+
 	* src/msgs/de.msg: Fix irc typo (thanks to Jonathan Schleifer)
 	* src/msgs/cs.msg: Likewise
 	* src/msgs/pl.msg: Likewise
diff --git a/doc/guide.html b/doc/guide.html
index b37d60517..3511a8b69 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -2577,7 +2577,7 @@ attributes. The pattern variables <TT>"%s"</TT> will be sequentially replaced
 with the values of LDAP attributes from <TT>List_of_LDAP_attributes</TT>,
 <TT>"%u"</TT> will be replaced with the user part of a JID, and <TT>"%d"</TT>
 will be replaced with the domain part of a JID. The default is:
-<PRE CLASS="verbatim">  [{"NICK", "%u", []},
+<PRE CLASS="verbatim">  [{"NICKNAME", "%u", []},
    {"FN", "%s", ["displayName"]},
    {"LAST", "%s", ["sn"]},
    {"FIRST", "%s", ["givenName"]},
@@ -2626,7 +2626,7 @@ is:
    {"Given Name", "FIRST"},
    {"Middle Name", "MIDDLE"},
    {"Family Name", "LAST"},
-   {"Nickname", "NICK"},
+   {"Nickname", "NICKNAME"},
    {"Birthday", "BDAY"},
    {"Country", "CTRY"},
    {"City", "LOCALITY"},
@@ -2667,7 +2667,7 @@ Also we want users to search each other. Let&#X2019;s see how we can set it up:<
       {ldap_filter, ""},
       %% Now we want to define vCard pattern
       {ldap_vcard_map,
-       [{"NICK", "%u", []}, % just use user's part of JID as his nickname
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
         {"FIRST", "%s", ["givenName"]},
         {"LAST", "%s", ["sn"]},
         {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
@@ -2684,7 +2684,7 @@ Also we want users to search each other. Let&#X2019;s see how we can set it up:<
       %% Note that JID is always returned with search results
       {ldap_search_reported,
        [{"Full Name", "FN"},
-        {"Nickname", "NICK"},
+        {"Nickname", "NICKNAME"},
         {"Birthday", "BDAY"}]}
     ]}
     ...
@@ -2692,7 +2692,7 @@ Also we want users to search each other. Let&#X2019;s see how we can set it up:<
 </PRE><P>Note that <TT>mod_vcard_ldap</TT> module checks an existence of the user before
 searching his info in LDAP.</P></LI><LI CLASS="li-itemize"><TT>ldap_vcard_map</TT> example:
 <PRE CLASS="verbatim">  {ldap_vcard_map,
-   [{"NICK", "%u", []},
+   [{"NICKNAME", "%u", []},
     {"FN", "%s", ["displayName"]},
     {"CTRY", "Russia", []},
     {"EMAIL", "%u@%d", []},
@@ -2709,7 +2709,7 @@ searching his info in LDAP.</P></LI><LI CLASS="li-itemize"><TT>ldap_vcard_map</T
    [{"Full Name", "FN"},
     {"Email", "EMAIL"},
     {"Birthday", "BDAY"},
-    {"Nickname", "NICK"}
+    {"Nickname", "NICKNAME"}
    ]},
 </PRE></LI></UL><!--TOC subsection <TT>mod_version</TT>-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc56">3.3.23</A>&#XA0;&#XA0;<TT>mod_version</TT></H3><!--SEC END --><P>
diff --git a/doc/guide.tex b/doc/guide.tex
index eb6f8a660..3802767de 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -3213,7 +3213,7 @@ consists of the following \modvcardldap{}-specific options:
   \term{"\%u"} will be replaced with the user part of a JID, and \term{"\%d"}
   will be replaced with the domain part of a JID. The default is:
   \begin{verbatim}
-  [{"NICK", "%u", []},
+  [{"NICKNAME", "%u", []},
    {"FN", "%s", ["displayName"]},
    {"LAST", "%s", ["sn"]},
    {"FIRST", "%s", ["givenName"]},
@@ -3266,7 +3266,7 @@ consists of the following \modvcardldap{}-specific options:
    {"Given Name", "FIRST"},
    {"Middle Name", "MIDDLE"},
    {"Family Name", "LAST"},
-   {"Nickname", "NICK"},
+   {"Nickname", "NICKNAME"},
    {"Birthday", "BDAY"},
    {"Country", "CTRY"},
    {"City", "LOCALITY"},
@@ -3321,7 +3321,7 @@ Also we want users to search each other. Let's see how we can set it up:
       {ldap_filter, ""},
       %% Now we want to define vCard pattern
       {ldap_vcard_map,
-       [{"NICK", "%u", []}, % just use user's part of JID as his nickname
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
         {"FIRST", "%s", ["givenName"]},
         {"LAST", "%s", ["sn"]},
         {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
@@ -3338,7 +3338,7 @@ Also we want users to search each other. Let's see how we can set it up:
       %% Note that JID is always returned with search results
       {ldap_search_reported,
        [{"Full Name", "FN"},
-        {"Nickname", "NICK"},
+        {"Nickname", "NICKNAME"},
         {"Birthday", "BDAY"}]}
     ]}
     ...
@@ -3351,7 +3351,7 @@ searching his info in LDAP.
 \item \term{ldap\_vcard\_map} example:
 \begin{verbatim}
   {ldap_vcard_map,
-   [{"NICK", "%u", []},
+   [{"NICKNAME", "%u", []},
     {"FN", "%s", ["displayName"]},
     {"CTRY", "Russia", []},
     {"EMAIL", "%u@%d", []},
@@ -3372,7 +3372,7 @@ searching his info in LDAP.
    [{"Full Name", "FN"},
     {"Email", "EMAIL"},
     {"Birthday", "BDAY"},
-    {"Nickname", "NICK"}
+    {"Nickname", "NICKNAME"}
    ]},
 \end{verbatim}
 \end{itemize}