diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index e9830c9..a285ab3 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -434,6 +434,24 @@ const struct ldb_map_attribute samba3_attributes[] =
                        },
                },
        },
+
+       /* givenName */
+       {
+               .local_name = "givenName",
+               .type = LDB_MAP_KEEP,
+       },
+
+       /* sn */
+       {
+               .local_name = "sn",
+               .type = LDB_MAP_KEEP,
+       },
+
+        /* mail */
+       {
+               .local_name = "mail",
+               .type = LDB_MAP_KEEP,
+       },

        /* cn */
        {
@@ -875,6 +893,51 @@ const struct ldb_map_attribute samba3_attributes[] =
                .type = LDB_MAP_IGNORE,
        },

+       /* sambaHomeDrive -> homeDrive */
+        {
+               .local_name = "sambaHomeDrive",
+               .type = LDB_MAP_RENAME,
+               .u = {
+                       .rename = {
+                               .remote_name = "homeDrive",
+                       },
+               },
+       },
+
+
+        /* sambaHomePath -> homeDirectory */
+       {
+               .local_name = "sambaHomePath",
+               .type = LDB_MAP_RENAME,
+               .u = {
+                       .rename = {
+                               .remote_name = "homeDirectory",
+                       },
+               },
+       },
+
+        /* sambaLogonScript -> scriptPath */
+       {
+               .local_name = "sambaLogonScript",
+               .type = LDB_MAP_RENAME,
+               .u = {
+                       .rename = {
+                               .remote_name = "scriptPath",
+                       },
+               },
+       },
+
+        /* sambaProfilePath -> ProfilePath */
+       {
+               .local_name = "sambaProfilePath",
+               .type = LDB_MAP_RENAME,
+               .u = {
+                       .rename = {
+                               .remote_name = "profilePath",
+                       },
+               },
+       },
+
        /* uidNumber */
        {
                .local_name = "unixName",