@@ -15,19 +15,22 @@
 
 #include "config.h"
 
 #import "Property.h"
 
+#import "OFArray.h"
+#import "OFString.h"
+
 #import "OFInvalidArgumentException.h"
 #import "OFOutOfRangeException.h"
 
 @interface Property ()
 - (void)parseString: (OFString *)string;
 @end
 
 @implementation Property
-@synthesize name = _name, type = _type;
+@synthesize name = _name, type = _type, attributes = _attributes;
 
 + (instancetype)propertyWithString: (OFString *)string
 {
 	return [[[self alloc] initWithString: string] autorelease];
 }
@@ -46,16 +49,57 @@
 	return self;
 }
 
 - (void)parseString: (OFString *)string
 {
+	void *pool = objc_autoreleasePoolPush();
 	const char *UTF8String = string.UTF8String;
 	size_t length = string.UTF8StringLength, nameIdx = -1;
+	OFMutableArray *attributes = nil;
 
 	if (length > SSIZE_MAX)
 		@throw [OFOutOfRangeException exception];
 
+	if (UTF8String[0] == '(') {
+		for (size_t i = 0, level = 0; i < length; i++) {
+			if (UTF8String[i] == '(')
+				level++;
+			else if (UTF8String[i] == ')') {
+				if (--level == 0) {
+					OFString *attributesString = [OFString
+					    stringWithUTF8String: UTF8String + 1
+							  length: i - 1];
+					attributes = [[[attributesString
+					    componentsSeparatedByString: @","]
+					    mutableCopy] autorelease];
+
+					UTF8String += i + 1;
+					length += i + 1;
+
+					while (*UTF8String == ' ' ||
+					    *UTF8String == '\t') {
+						UTF8String++;
+						length--;
+					}
+
+					break;
+				}
+			}
+		}
+	}
+
+	for (size_t i = 0; i < attributes.count; i++) {
+		OFString *attribute = [[attributes objectAtIndex: i]
+		    stringByDeletingEnclosingWhitespaces];
+
+		[attributes replaceObjectAtIndex: i
+				      withObject: attribute];
+	}
+
+	[attributes makeImmutable];
+	_attributes = [attributes copy];
+
 	for (ssize_t i = (ssize_t)length - 1; i > 0; i--) {
 		if (UTF8String[i] == '*' || UTF8String[i] == ' ' ||
 		    UTF8String[i] == '\t') {
 			nameIdx = i + 1;
 			break;
@@ -66,10 +110,12 @@
 		@throw [OFInvalidArgumentException exception];
 
 	_name = [[OFString alloc] initWithUTF8String: UTF8String + nameIdx];
 	_type = [[OFString alloc] initWithUTF8String: UTF8String
 					      length: (size_t)nameIdx];
+
+	objc_autoreleasePoolPop(pool);
 }
 
 - (void)dealloc
 {
 	[_name release];