@@ -1575,10 +1575,32 @@
 
 	if (lsetxattr([path cStringWithEncoding: encoding],
 	    [name cStringWithEncoding: encoding], data.items,
 	    data.count * data.itemSize, 0) != 0) {
 		int errNo = errno;
+
+		/* TODO: Add an attribute (prefix?) for extended attributes? */
+		@throw [OFSetItemAttributesFailedException
+		    exceptionWithIRI: IRI
+			  attributes: [OFDictionary dictionary]
+		     failedAttribute: @""
+			       errNo: errNo];
+	}
+
+	objc_autoreleasePoolPop(pool);
+}
+
+- (void)removeExtendedAttributeForName: (OFString *)name
+			   ofItemAtIRI: (OFIRI *)IRI
+{
+	void *pool = objc_autoreleasePoolPush();
+	OFString *path = IRI.fileSystemRepresentation;
+	OFStringEncoding encoding = [OFLocale encoding];
+
+	if (lremovexattr([path cStringWithEncoding: encoding],
+	    [name cStringWithEncoding: encoding]) != 0) {
+		int errNo = errno;
 
 		/* TODO: Add an attribute (prefix?) for extended attributes? */
 		@throw [OFSetItemAttributesFailedException
 		    exceptionWithIRI: IRI
 			  attributes: [OFDictionary dictionary]