diff --git a/source4/ntvfs/posix/pvfs_util.c b/source4/ntvfs/posix/pvfs_util.c
index eb0f04728c0..7eedc38cf9e 100644
--- a/source4/ntvfs/posix/pvfs_util.c
+++ b/source4/ntvfs/posix/pvfs_util.c
@@ -68,11 +68,16 @@ NTSTATUS pvfs_match_attrib(struct pvfs_state *pvfs, struct pvfs_filename *name,
 /*
   normalise a file attribute
 */
-uint32_t pvfs_attrib_normalise(uint32_t attrib)
+uint32_t pvfs_attrib_normalise(uint32_t attrib, mode_t mode)
 {
 	if (attrib != FILE_ATTRIBUTE_NORMAL) {
 		attrib &= ~FILE_ATTRIBUTE_NORMAL;
 	}
+	if (S_ISDIR(mode)) {
+		attrib |= FILE_ATTRIBUTE_DIRECTORY;
+	} else {
+		attrib &= ~FILE_ATTRIBUTE_DIRECTORY;
+	}
 	return attrib;
 }
 
diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c
index c2af2e10bde..7c4fa317d67 100644
--- a/source4/ntvfs/posix/pvfs_xattr.c
+++ b/source4/ntvfs/posix/pvfs_xattr.c
@@ -184,7 +184,8 @@ NTSTATUS pvfs_dosattrib_load(struct pvfs_state *pvfs, struct pvfs_filename *name
 	switch (attrib.version) {
 	case 1:
 		info1 = &attrib.info.info1;
-		name->dos.attrib = pvfs_attrib_normalise(info1->attrib);
+		name->dos.attrib = pvfs_attrib_normalise(info1->attrib, 
+							 name->st.st_mode);
 		name->dos.ea_size = info1->ea_size;
 		if (name->st.st_size == info1->size) {
 			name->dos.alloc_size = 
@@ -201,7 +202,8 @@ NTSTATUS pvfs_dosattrib_load(struct pvfs_state *pvfs, struct pvfs_filename *name
 
 	case 2:
 		info2 = &attrib.info.info2;
-		name->dos.attrib = pvfs_attrib_normalise(info2->attrib);
+		name->dos.attrib = pvfs_attrib_normalise(info2->attrib, 
+							 name->st.st_mode);
 		name->dos.ea_size = info2->ea_size;
 		if (name->st.st_size == info2->size) {
 			name->dos.alloc_size = 
@@ -248,7 +250,7 @@ NTSTATUS pvfs_dosattrib_save(struct pvfs_state *pvfs, struct pvfs_filename *name
 	attrib.version = 2;
 	info2 = &attrib.info.info2;
 
-	name->dos.attrib = pvfs_attrib_normalise(name->dos.attrib);
+	name->dos.attrib = pvfs_attrib_normalise(name->dos.attrib, name->st.st_mode);
 
 	info2->attrib      = name->dos.attrib;
 	info2->ea_size     = name->dos.ea_size;