@@ -42,14 +42,13 @@
 #ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
 	if ((entry.versionMadeBy >> 8) ==
 	    OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_UNIX) {
 		OFNumber *mode = [OFNumber numberWithUnsignedShort:
 		    (entry.versionSpecificAttributes >> 16) & 0777];
-		of_file_attribute_key_t key =
-		    of_file_attribute_key_posix_permissions;
-		of_file_attributes_t attributes =
-		    [OFDictionary dictionaryWithObject: mode forKey: key];
+		OFFileAttributes attributes = [OFDictionary
+		    dictionaryWithObject: mode
+				  forKey: OFFilePOSIXPermissions];
 
 		[[OFFileManager defaultManager] setAttributes: attributes
 						 ofItemAtPath: path];
 	}
 #endif
@@ -57,18 +56,18 @@
 
 static void
 setModificationDate(OFString *path, OFZIPArchiveEntry *entry)
 {
 	OFDate *modificationDate = entry.modificationDate;
-	of_file_attributes_t attributes;
+	OFFileAttributes attributes;
 
 	if (modificationDate == nil)
 		return;
 
 	attributes = [OFDictionary
 	    dictionaryWithObject: modificationDate
-			  forKey: of_file_attribute_key_modification_date];
+			  forKey: OFFileModificationDate];
 	[[OFFileManager defaultManager] setAttributes: attributes
 					 ofItemAtPath: path];
 }
 
 @implementation ZIPArchive
@@ -412,11 +411,11 @@
 
 	for (OFString *localFileName in files) {
 		void *pool = objc_autoreleasePoolPush();
 		OFArray OF_GENERIC (OFString *) *components;
 		OFString *fileName;
-		of_file_attributes_t attributes;
+		OFFileAttributes attributes;
 		bool isDirectory = false;
 		OFMutableZIPArchiveEntry *entry;
 		unsigned long long size;
 		OFStream *output;
 
@@ -424,11 +423,11 @@
 		fileName = [components componentsJoinedByString: @"/"];
 
 		attributes = [fileManager
 		    attributesOfItemAtPath: localFileName];
 
-		if ([attributes.fileType isEqual: of_file_type_directory]) {
+		if ([attributes.fileType isEqual: OFFileTypeDirectory]) {
 			isDirectory = true;
 			fileName = [fileName stringByAppendingString: @"/"];
 		}
 
 		if (app->_outputLevel >= 0)