diff --git a/ChangeLog b/ChangeLog
index c5320ff1e..c13553938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-27  Badlop  <badlop@process-one.net>
+
+	* src/mod_vcard_ldap.erl: Fix some field names (EJAB-483)
+
 2007-12-26  Badlop  <badlop@process-one.net>
 
 	* src/web/ejabberd_web_admin.erl: Translate menu items of webadmin
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index dffddf57b..173eceb8c 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -80,7 +80,7 @@
 	[{"NICKNAME", "%u", []},
 	 {"FN", "%s", ["displayName"]},
 	 {"FAMILY", "%s", ["sn"]},
-	 {"FIRST", "%s", ["givenName"]},
+	 {"GIVEN", "%s", ["givenName"]},
 	 {"MIDDLE", "%s", ["initials"]},
 	 {"ORGNAME", "%s", ["o"]},
 	 {"ORGUNIT", "%s", ["ou"]},
@@ -318,7 +318,7 @@ ldap_attribute_to_vcard(vCard, {"fn", Value}) ->
     {xmlelement,"FN",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCard, {"nickname", Value}) ->
-    {xmlelement,"NICK",[],[{xmlcdata,Value}]};
+    {xmlelement,"NICKNAME",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCard, {"title", Value}) ->
     {xmlelement,"TITLE",[],[{xmlcdata,Value}]};
@@ -350,10 +350,10 @@ ldap_attribute_to_vcard(vCard, {"photo", Value}) ->
 			    {xmlelement,"BINVAL",[],[{xmlcdata, jlib:encode_base64(Value)}]}]};
 
 ldap_attribute_to_vcard(vCardN, {"family", Value}) ->
-    {xmlelement,"LAST",[],[{xmlcdata,Value}]};
+    {xmlelement,"FAMILY",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCardN, {"given", Value}) ->
-    {xmlelement,"FIRST",[],[{xmlcdata,Value}]};
+    {xmlelement,"GIVEN",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCardN, {"middle", Value}) ->
     {xmlelement,"MIDDLE",[],[{xmlcdata,Value}]};