Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -173,11 +173,11 @@
 	@interface Foo
 	{
 		id bar;
 	}
 
-	@property (retain, nonatomic) id bar;
+	@property (nonatomic, retain) id bar;
 	@end
 ], [
 	Foo *foo = (id)0;
 	[foo setBar: (id)0];
 	foo = [foo bar];

Index: src/OFApplication.h
==================================================================
--- src/OFApplication.h
+++ src/OFApplication.h
@@ -134,21 +134,21 @@
 }
 
 /*!
  * The name of the program (argv[0]).
  */
-@property (readonly, assign) OFString *programName;
+@property (readonly, nonatomic) OFString *programName;
 
 /*!
  * The arguments passed to the application.
  */
-@property (readonly, assign) OFArray OF_GENERIC(OFString*) *arguments;
+@property (readonly, nonatomic) OFArray OF_GENERIC(OFString*) *arguments;
 
 /*!
  * The environment of the application.
  */
-@property (readonly, assign)
+@property (readonly, nonatomic)
     OFDictionary OF_GENERIC(OFString*, OFString*) *environment;
 
 /*!
  * @brief Returns the only OFApplication instance in the application.
  *

Index: src/OFHMAC.h
==================================================================
--- src/OFHMAC.h
+++ src/OFHMAC.h
@@ -31,11 +31,11 @@
 	id <OFCryptoHash> _outerHashCopy, _innerHashCopy;
 	bool _calculated;
 }
 
 /*! The class for the cryptographic hash used by the HMAC. */
-@property (assign, readonly) Class <OFCryptoHash> hashClass;
+@property (readonly, nonatomic) Class <OFCryptoHash> hashClass;
 
 /*!
  * @brief Returns a new OFHMAC with the specified hashing algorithm.
  *
  * @param hashClass The class of the hashing algorithm

Index: src/OFHTTPCookie.h
==================================================================
--- src/OFHTTPCookie.h
+++ src/OFHTTPCookie.h
@@ -34,31 +34,31 @@
 }
 
 /*!
  * The name of the cookie.
  */
-@property (copy) OFString *name;
+@property (nonatomic, copy) OFString *name;
 
 /*!
  * The value of the cookie.
  */
-@property (copy) OFString *value;
+@property (nonatomic, copy) OFString *value;
 
 /*!
  * The date when the cookie expires.
  */
-@property (copy) OFDate *expires;
+@property (nonatomic, copy) OFDate *expires;
 
 /*!
  * The domain for the cookie.
  */
-@property (copy) OFString *domain;
+@property (nonatomic, copy) OFString *domain;
 
 /*!
  * The path for the cookie.
  */
-@property (copy) OFString *path;
+@property (nonatomic, copy) OFString *path;
 
 /*!
  * Whether the cookie is only to be used with HTTPS.
  */
 @property (getter=isSecure) bool secure;
@@ -69,11 +69,12 @@
 @property (getter=isHTTPOnly) bool HTTPOnly;
 
 /*!
  * An array of other attributes.
  */
-@property (retain, readonly) OFMutableArray OF_GENERIC(OFString*) *extensions;
+@property (readonly, nonatomic)
+    OFMutableArray OF_GENERIC(OFString*) *extensions;
 
 /*!
  * @brief Create a new cookie with the specified name and value.
  *
  * @param name The name of the cookie

Index: src/OFHTTPRequest.h
==================================================================
--- src/OFHTTPRequest.h
+++ src/OFHTTPRequest.h
@@ -83,38 +83,38 @@
 }
 
 /*!
  * The URL of the HTTP request.
  */
-@property (copy) OFURL *URL;
+@property (nonatomic, copy) OFURL *URL;
 
 /*!
  * The request method of the HTTP request.
  */
 @property of_http_request_method_t method;
 
 /*!
  * The headers for the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (copy)
+@property OF_NULLABLE_PROPERTY (nonatomic, copy)
     OFDictionary OF_GENERIC(OFString*, OFString*) *headers;
 
 /*!
  * The cookies for the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (copy)
+@property OF_NULLABLE_PROPERTY (nonatomic, copy)
     OFArray OF_GENERIC(OFHTTPCookie*) *cookies;
 
 /*!
  * The entity body of the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (retain) OFDataArray *body;
+@property OF_NULLABLE_PROPERTY (nonatomic, retain) OFDataArray *body;
 
 /*!
  * The remote address from which the request originates.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *remoteAddress;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *remoteAddress;
 
 /*!
  * @brief Creates a new OFHTTPRequest.
  *
  * @return A new, autoreleased OFHTTPRequest

Index: src/OFHTTPResponse.h
==================================================================
--- src/OFHTTPResponse.h
+++ src/OFHTTPResponse.h
@@ -42,17 +42,17 @@
 @property short statusCode;
 
 /*!
  * The headers of the reply to the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (copy)
+@property OF_NULLABLE_PROPERTY (nonatomic, copy)
     OFDictionary OF_GENERIC(OFString*, OFString*) *headers;
 
 /*!
  * The cookies to set of the reply to the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (copy)
+@property OF_NULLABLE_PROPERTY (nonatomic, copy)
     OFArray OF_GENERIC(OFHTTPCookie*) *cookies;
 
 /*!
  * @brief Sets the protocol version of the HTTP request reply.
  *

Index: src/OFHTTPServer.h
==================================================================
--- src/OFHTTPServer.h
+++ src/OFHTTPServer.h
@@ -96,11 +96,11 @@
 }
 
 /*!
  * The host on which the HTTP server will listen.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString* host;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString* host;
 
 /*!
  * The port on which the HTTP server will listen.
  */
 @property uint16_t port;
@@ -114,11 +114,11 @@
  * The server name the server presents to clients.
  *
  * Setting it to `nil` means no `Server` header will be sent, unless one is
  * specified in the response headers.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *name;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *name;
 
 /*!
  * @brief Creates a new HTTP server.
  *
  * @return A new HTTP server

Index: src/OFINICategory.h
==================================================================
--- src/OFINICategory.h
+++ src/OFINICategory.h
@@ -36,11 +36,11 @@
 }
 
 /*!
  * The name of the INI category
  */
-@property (copy) OFString *name;
+@property (nonatomic, copy) OFString *name;
 
 /*!
  * @brief Returns the string value for the specified key, or `nil` if it does
  *	  not exist.
  *

Index: src/OFIntrospection.h
==================================================================
--- src/OFIntrospection.h
+++ src/OFIntrospection.h
@@ -55,11 +55,11 @@
 @property (readonly) SEL selector;
 
 /*!
  * The name of the method.
  */
-@property (readonly, copy) OFString *name;
+@property (readonly, nonatomic) OFString *name;
 
 /*!
  * The type encoding for the method.
  */
 @property OF_NULLABLE_PROPERTY (readonly) const char *typeEncoding;
@@ -78,11 +78,11 @@
 }
 
 /*!
  * The name of the property.
  */
-@property (readonly, copy) OFString *name;
+@property (readonly, nonatomic) OFString *name;
 
 /*!
  * The attributes of the property.
  *
  * The attributes are a bitmask with the following possible flags:@n
@@ -102,16 +102,16 @@
 @property (readonly) unsigned attributes;
 
 /*!
  * The name of the getter.
  */
-@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *getter;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *getter;
 
 /*!
  * @return The name of the setter.
  */
-@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *setter;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *setter;
 @end
 
 /*!
  * @class OFInstanceVariable OFIntrospection.h ObjFW/OFIntrospection.h
  *
@@ -125,11 +125,11 @@
 }
 
 /*!
  * The name of the instance variable.
  */
-@property (readonly, copy) OFString *name;
+@property (readonly, nonatomic) OFString *name;
 
 /*!
  * The offset of the instance variable.
  */
 @property (readonly) ptrdiff_t offset;
@@ -154,16 +154,16 @@
 }
 
 /*!
  * The class methods of the class.
  */
-@property (readonly, copy) OFArray OF_GENERIC(OFMethod*) *classMethods;
+@property (readonly, nonatomic) OFArray OF_GENERIC(OFMethod*) *classMethods;
 
 /*!
  * The instance methods of the class.
  */
-@property (readonly, copy) OFArray OF_GENERIC(OFMethod*) *instanceMethods;
+@property (readonly, nonatomic) OFArray OF_GENERIC(OFMethod*) *instanceMethods;
 
 /*!
  * The properties of the class.
  *
  * @warning **Do not rely on this, as this behaves differently depending on the
@@ -181,16 +181,16 @@
  *	    used.
  *
  * @warning GCC does not emit any data for property introspection for the GNU
  *	    ABI.
  */
-@property (readonly, copy) OFArray OF_GENERIC(OFProperty*) *properties;
+@property (readonly, nonatomic) OFArray OF_GENERIC(OFProperty*) *properties;
 
 /*!
  * The instance variables of the class.
  */
-@property (readonly, copy)
+@property (readonly, nonatomic)
     OFArray OF_GENERIC(OFInstanceVariable*) *instanceVariables;
 
 /* TODO: protocols */
 
 /*!

Index: src/OFLocalization.h
==================================================================
--- src/OFLocalization.h
+++ src/OFLocalization.h
@@ -47,18 +47,18 @@
 /**
  * The language of the locale for messages.
  *
  * If the language is unknown, it is `nil`.
  */
-@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *language;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *language;
 
 /*!
  * The territory of the locale for messages.
  *
  * If the territory is unknown, it is `nil`.
  */
-@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *territory;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *territory;
 
 /*!
  * The native 8-bit string encoding of the locale for messages.
  *
  * This is useful to encode strings correctly for passing them to operating
@@ -69,11 +69,11 @@
 @property (readonly) of_string_encoding_t encoding;
 
 /*!
  * The decimal point of the system's locale.
  */
-@property (readonly, copy) OFString *decimalPoint;
+@property (readonly, nonatomic) OFString *decimalPoint;
 
 /*!
  * @brief Returns the shared OFLocalization instance.
  *
  * @warning If you don't use @ref OFApplication, this might be `nil`! In this

Index: src/OFLocking.h
==================================================================
--- src/OFLocking.h
+++ src/OFLocking.h
@@ -25,11 +25,11 @@
  */
 @protocol OFLocking <OFObject>
 /*!
  * The name of the lock.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *name;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *name;
 
 /*!
  * @brief Locks the lock.
  */
 - (void)lock;

Index: src/OFMessagePackExtension.h
==================================================================
--- src/OFMessagePackExtension.h
+++ src/OFMessagePackExtension.h
@@ -40,11 +40,11 @@
 @property (readonly) int8_t type;
 
 /*!
  * @return The data of the extension.
  */
-@property (readonly, retain) OFDataArray *data;
+@property (readonly, nonatomic) OFDataArray *data;
 
 /*!
  * @brief Creates a new OFMessagePackRepresentation with the specified type and
  *	  data.
  *

Index: src/OFOptionsParser.h
==================================================================
--- src/OFOptionsParser.h
+++ src/OFOptionsParser.h
@@ -99,17 +99,17 @@
  *
  * @warning Unlike @ref lastOption, which returns the short option even if the
  *	    user specified a long option, this only returns the long option if
  *	    it was actually specified as a long option by the user.
  */
-@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *lastLongOption;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *lastLongOption;
 
 /*!
  * The argument for the last parsed option, or `nil` if the last parsed option
  * takes no argument.
  */
-@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *argument;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *argument;
 
 /*!
  * @brief Creates a new OFOptionsParser which accepts the specified options.
  *
  * @param options An array of @ref of_options_parser_option_t specifying all

Index: src/OFSettings.h
==================================================================
--- src/OFSettings.h
+++ src/OFSettings.h
@@ -38,11 +38,11 @@
 }
 
 /*!
  * The name of the application whose settings are accessed by the instance.
  */
-@property (readonly, copy) OFString *applicationName;
+@property (readonly, nonatomic) OFString *applicationName;
 
 /*!
  * @brief Create a new OFSettings instance for the application with the
  *	  specified name.
  *

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -71,11 +71,11 @@
 }
 
 /*!
  * The host to use as a SOCKS5 proxy.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *SOCKS5Host;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *SOCKS5Host;
 
 /*!
  * The port to use on the SOCKS5 proxy.
  */
 @property uint16_t SOCKS5Port;

Index: src/OFTLSSocket.h
==================================================================
--- src/OFTLSSocket.h
+++ src/OFTLSSocket.h
@@ -60,16 +60,16 @@
 @property OF_NULLABLE_PROPERTY (assign) id <OFTLSSocketDelegate> delegate;
 
 /*!
  * The path to the X.509 certificate file to use.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *certificateFile;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *certificateFile;
 
 /*!
  * The path to the PKCS#8 private key file to use.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *privateKeyFile;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *privateKeyFile;
 
 /*!
  * The passphrase to decrypt the PKCS#8 private key file.
  *
  * @warning You have to ensure that this is in secure memory protected from

Index: src/OFTarArchiveEntry.h
==================================================================
--- src/OFTarArchiveEntry.h
+++ src/OFTarArchiveEntry.h
@@ -63,11 +63,11 @@
 }
 
 /*!
  * The file name of the entry.
  */
-@property (readonly, copy) OFString *fileName;
+@property (readonly, nonatomic) OFString *fileName;
 
 /*!
  * The mode of the entry.
  */
 @property (readonly) uint32_t mode;
@@ -78,11 +78,11 @@
 @property (readonly) uint64_t size;
 
 /*!
  * The date of the last modification of the file.
  */
-@property (readonly, copy) OFDate *modificationDate;
+@property (readonly, nonatomic) OFDate *modificationDate;
 
 /*!
  * The type of the archive entry.
  *
  * See @ref of_tar_archive_entry_type_t.
@@ -90,21 +90,21 @@
 @property (readonly) of_tar_archive_entry_type_t type;
 
 /*!
  * The file name of the target (for a hard link or symbolic link).
  */
-@property (readonly, copy) OFString *targetFileName;
+@property (readonly, nonatomic) OFString *targetFileName;
 
 /*!
  * The owner of the file.
  */
-@property (readonly, copy) OFString *owner;
+@property (readonly, nonatomic) OFString *owner;
 
 /*!
  * The group of the file.
  */
-@property (readonly, copy) OFString *group;
+@property (readonly, nonatomic) OFString *group;
 
 /*!
  * The device major (if the file is a device).
  */
 @property (readonly) uint32_t deviceMajor;

Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -79,11 +79,11 @@
 
 #ifdef OF_HAVE_BLOCKS
 /*!
  * The block to execute in the thread.
  */
-@property (readonly, copy) of_thread_block_t threadBlock;
+@property (readonly, nonatomic) of_thread_block_t threadBlock;
 #endif
 
 /*!
  * @brief Creates a new thread.
  *

Index: src/OFTimer+Private.h
==================================================================
--- src/OFTimer+Private.h
+++ src/OFTimer+Private.h
@@ -17,10 +17,10 @@
 #import "OFTimer.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OFTimer ()
-@property OF_NULLABLE_PROPERTY (retain, setter=OF_setInRunLoop:)
+@property OF_NULLABLE_PROPERTY (nonatomic, retain, setter=OF_setInRunLoop:)
     OFRunLoop *OF_inRunLoop;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFURL.h
==================================================================
--- src/OFURL.h
+++ src/OFURL.h
@@ -34,51 +34,51 @@
 }
 
 /*!
  * The scheme part of the URL.
  */
-@property (copy) OFString *scheme;
+@property (nonatomic, copy) OFString *scheme;
 
 /*!
  * The host part of the URL.
  */
-@property (copy) OFString *host;
+@property (nonatomic, copy) OFString *host;
 
 /*!
  * The port part of the URL.
  */
 @property uint16_t port;
 
 /*!
  * The user part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *user;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *user;
 
 /*!
  * The password part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *password;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *password;
 
 /*!
  * The path part of the URL.
  */
-@property (copy) OFString *path;
+@property (nonatomic, copy) OFString *path;
 
 /*!
  * The parameters part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *parameters;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *parameters;
 
 /*!
  * The query part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *query;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *query;
 
 /*!
  * The fragment part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *fragment;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *fragment;
 
 /*!
  * @brief Creates a new URL.
  *
  * @return A new, autoreleased OFURL

Index: src/OFXMLAttribute.h
==================================================================
--- src/OFXMLAttribute.h
+++ src/OFXMLAttribute.h
@@ -32,19 +32,19 @@
 }
 
 /*!
  * The name of the attribute.
  */
-@property (readonly, copy) OFString *name;
+@property (readonly, nonatomic) OFString *name;
 
 /*!
  * The namespace of the attribute.
  */
 #ifndef __cplusplus
-@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *namespace;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *namespace;
 #else
-@property OF_NULLABLE_PROPERTY (readonly, copy, getter=namespace)
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic, getter=namespace)
     OFString *namespace_;
 #endif
 
 /*!
  * @brief Creates a new XML attribute.

Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -41,26 +41,26 @@
 }
 
 /*!
  * The name of the element.
  */
-@property (copy) OFString *name;
+@property (nonatomic, copy) OFString *name;
 
 /*!
  * The namespace of the element.
  */
 #ifndef __cplusplus
-@property OF_NULLABLE_PROPERTY (copy) OFString *namespace;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *namespace;
 #else
-@property OF_NULLABLE_PROPERTY (copy, getter=namespace, setter=setNamespace:)
-    OFString *namespace_;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy,
+    getter=namespace, setter=setNamespace:) OFString *namespace_;
 #endif
 
 /*!
  * The default namespace for the element to be used if there is no parent.
  */
-@property OF_NULLABLE_PROPERTY (copy) OFString *defaultNamespace;
+@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *defaultNamespace;
 
 /*!
  * @brief Creates a new XML element with the specified name.
  *
  * @param name The name for the element

Index: src/OFZIPArchive.h
==================================================================
--- src/OFZIPArchive.h
+++ src/OFZIPArchive.h
@@ -48,11 +48,11 @@
 }
 
 /*!
  * The archive comment.
  */
-@property (readonly, copy) OFString *archiveComment;
+@property (readonly, nonatomic) OFString *archiveComment;
 
 /*!
  * @brief Creates a new OFZIPArchive object with the specified seekable stream.
  *
  * @param stream A seekable stream from which the ZIP archive will be read

Index: src/OFZIPArchiveEntry.h
==================================================================
--- src/OFZIPArchiveEntry.h
+++ src/OFZIPArchiveEntry.h
@@ -104,16 +104,16 @@
 }
 
 /*!
  * The file name of the entry.
  */
-@property (readonly, copy) OFString *fileName;
+@property (readonly, nonatomic) OFString *fileName;
 
 /*!
  * The comment of the entry's file.
  */
-@property (readonly, copy) OFString *fileComment;
+@property (readonly, nonatomic) OFString *fileComment;
 
 /*!
  * The version which made the entry.
  *
  * The lower 8 bits are the ZIP specification version.@n

Index: src/exceptions/OFAcceptFailedException.h
==================================================================
--- src/exceptions/OFAcceptFailedException.h
+++ src/exceptions/OFAcceptFailedException.h
@@ -33,11 +33,11 @@
 }
 
 /*!
  * The socket which could not accept a connection.
  */
-@property (readonly, retain) id socket;
+@property (readonly, nonatomic) id socket;
 
 /*!
  * @return The errno from when the exception was created.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFAddressTranslationFailedException.h
==================================================================
--- src/exceptions/OFAddressTranslationFailedException.h
+++ src/exceptions/OFAddressTranslationFailedException.h
@@ -34,11 +34,11 @@
 }
 
 /*!
  * The host for which the address translation was requested.
  */
-@property (readonly, copy) OFString *host;
+@property (readonly, nonatomic) OFString *host;
 
 /*!
  * @brief Creates a new, autoreleased address translation failed exception.
  *
  * @param host The host for which translation was requested

Index: src/exceptions/OFAlreadyConnectedException.h
==================================================================
--- src/exceptions/OFAlreadyConnectedException.h
+++ src/exceptions/OFAlreadyConnectedException.h
@@ -33,11 +33,11 @@
 }
 
 /*!
  * The socket which is already connected.
  */
-@property (readonly, retain) id socket;
+@property (readonly, nonatomic) id socket;
 
 /*!
  * @brief Creates a new, autoreleased already connected exception.
  *
  * @param socket The socket which is already connected

Index: src/exceptions/OFBindFailedException.h
==================================================================
--- src/exceptions/OFBindFailedException.h
+++ src/exceptions/OFBindFailedException.h
@@ -35,21 +35,21 @@
 }
 
 /*!
  * The host on which binding failed.
  */
-@property (readonly, copy) OFString *host;
+@property (readonly, nonatomic) OFString *host;
 
 /*!
  * The port on which binding failed.
  */
 @property (readonly) uint16_t port;
 
 /*!
  * The socket which could not be bound.
  */
-@property (readonly, retain) id socket;
+@property (readonly, nonatomic) id socket;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFChangeCurrentDirectoryPathFailedException.h
==================================================================
--- src/exceptions/OFChangeCurrentDirectoryPathFailedException.h
+++ src/exceptions/OFChangeCurrentDirectoryPathFailedException.h
@@ -31,11 +31,11 @@
 }
 
 /*!
  * The path of the directory to which the current path could not be changed.
  */
-@property (readonly, copy) OFString *path;
+@property (readonly, nonatomic) OFString *path;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFChangeOwnerFailedException.h
==================================================================
--- src/exceptions/OFChangeOwnerFailedException.h
+++ src/exceptions/OFChangeOwnerFailedException.h
@@ -30,21 +30,21 @@
 }
 
 /*!
  * The path of the item.
  */
-@property (readonly, copy) OFString *path;
+@property (readonly, nonatomic) OFString *path;
 
 /*!
  * The new owner for the item.
  */
-@property (readonly, copy) OFString *owner;
+@property (readonly, nonatomic) OFString *owner;
 
 /*!
  * The new group for the item.
  */
-@property (readonly, copy) OFString *group;
+@property (readonly, nonatomic) OFString *group;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFChangePermissionsFailedException.h
==================================================================
--- src/exceptions/OFChangePermissionsFailedException.h
+++ src/exceptions/OFChangePermissionsFailedException.h
@@ -34,11 +34,11 @@
 }
 
 /*!
  * The path of the item.
  */
-@property (readonly, copy) OFString *path;
+@property (readonly, nonatomic) OFString *path;
 
 /*!
  * The new permissions for the item.
  */
 @property (readonly) mode_t permissions;

Index: src/exceptions/OFConditionBroadcastFailedException.h
==================================================================
--- src/exceptions/OFConditionBroadcastFailedException.h
+++ src/exceptions/OFConditionBroadcastFailedException.h
@@ -35,11 +35,11 @@
 }
 
 /*!
  * The condition which could not be broadcasted.
  */
-@property (readonly, retain) OFCondition *condition;
+@property (readonly, nonatomic) OFCondition *condition;
 
 /*!
  * @brief Returns a new, autoreleased condition broadcast failed exception.
  *
  * @param condition The condition which could not be broadcasted

Index: src/exceptions/OFConditionSignalFailedException.h
==================================================================
--- src/exceptions/OFConditionSignalFailedException.h
+++ src/exceptions/OFConditionSignalFailedException.h
@@ -35,11 +35,11 @@
 }
 
 /*!
  * The condition which could not be signaled.
  */
-@property (readonly, retain) OFCondition *condition;
+@property (readonly, nonatomic) OFCondition *condition;
 
 /*!
  * @brief Creates a new, autoreleased condition signal failed exception.
  *
  * @param condition The condition which could not be signaled

Index: src/exceptions/OFConditionStillWaitingException.h
==================================================================
--- src/exceptions/OFConditionStillWaitingException.h
+++ src/exceptions/OFConditionStillWaitingException.h
@@ -36,11 +36,11 @@
 }
 
 /*!
  * The condition for which is still being waited.
  */
-@property (readonly, retain) OFCondition *condition;
+@property (readonly, nonatomic) OFCondition *condition;
 
 /*!
  * @brief Creates a new, autoreleased condition still waiting exception.
  *
  * @param condition The condition for which is still being waited

Index: src/exceptions/OFConditionWaitFailedException.h
==================================================================
--- src/exceptions/OFConditionWaitFailedException.h
+++ src/exceptions/OFConditionWaitFailedException.h
@@ -35,11 +35,11 @@
 }
 
 /*!
  * The condition for which could not be waited.
  */
-@property (readonly, retain) OFCondition *condition;
+@property (readonly, nonatomic) OFCondition *condition;
 
 /*!
  * @brief Creates a new, autoreleased condition wait failed exception.
  *
  * @param condition The condition for which could not be waited

Index: src/exceptions/OFConnectionFailedException.h
==================================================================
--- src/exceptions/OFConnectionFailedException.h
+++ src/exceptions/OFConnectionFailedException.h
@@ -35,16 +35,16 @@
 }
 
 /*!
  * The socket which could not connect.
  */
-@property (readonly, retain) id socket;
+@property (readonly, nonatomic) id socket;
 
 /*!
  * The host to which the connection failed.
  */
-@property (readonly, copy) OFString *host;
+@property (readonly, nonatomic) OFString *host;
 
 /*!
  * The port on the host to which the connection failed.
  */
 @property (readonly) uint16_t port;

Index: src/exceptions/OFCopyItemFailedException.h
==================================================================
--- src/exceptions/OFCopyItemFailedException.h
+++ src/exceptions/OFCopyItemFailedException.h
@@ -29,16 +29,16 @@
 }
 
 /*!
  * The path of the source item.
  */
-@property (readonly, copy) OFString *sourcePath;
+@property (readonly, nonatomic) OFString *sourcePath;
 
 /*!
  * The destination path.
  */
-@property (readonly, copy) OFString *destinationPath;
+@property (readonly, nonatomic) OFString *destinationPath;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFCreateDirectoryFailedException.h
==================================================================
--- src/exceptions/OFCreateDirectoryFailedException.h
+++ src/exceptions/OFCreateDirectoryFailedException.h
@@ -30,11 +30,11 @@
 }
 
 /*!
  * The path of the directory which couldn't be created.
  */
-@property (readonly, copy) OFString *path;
+@property (readonly, nonatomic) OFString *path;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFCreateSymbolicLinkFailedException.h
==================================================================
--- src/exceptions/OFCreateSymbolicLinkFailedException.h
+++ src/exceptions/OFCreateSymbolicLinkFailedException.h
@@ -31,16 +31,16 @@
 }
 
 /*!
  * The source for the symlink.
  */
-@property (readonly, copy) OFString *sourcePath;
+@property (readonly, nonatomic) OFString *sourcePath;
 
 /*!
  * The destination for the symlink.
  */
-@property (readonly, copy) OFString *destinationPath;
+@property (readonly, nonatomic) OFString *destinationPath;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFEnumerationMutationException.h
==================================================================
--- src/exceptions/OFEnumerationMutationException.h
+++ src/exceptions/OFEnumerationMutationException.h
@@ -30,11 +30,11 @@
 }
 
 /*!
  * The object which was mutated during enumeration.
  */
-@property (readonly, retain) id object;
+@property (readonly, nonatomic) id object;
 
 /*!
  * @brief Creates a new, autoreleased enumeration mutation exception.
  *
  * @param object The object which was mutated during enumeration

Index: src/exceptions/OFGetOptionFailedException.h
==================================================================
--- src/exceptions/OFGetOptionFailedException.h
+++ src/exceptions/OFGetOptionFailedException.h
@@ -31,11 +31,11 @@
 }
 
 /*!
  * The stream for which the option could not be retrieved.
  */
-@property (readonly, retain) OFStream *stream;
+@property (readonly, nonatomic) OFStream *stream;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFHTTPRequestFailedException.h
==================================================================
--- src/exceptions/OFHTTPRequestFailedException.h
+++ src/exceptions/OFHTTPRequestFailedException.h
@@ -37,16 +37,16 @@
 }
 
 /*!
  * The HTTP request which failed.
  */
-@property (readonly, retain) OFHTTPRequest *request;
+@property (readonly, nonatomic) OFHTTPRequest *request;
 
 /*!
  * The response for the failed HTTP request.
  */
-@property (readonly, retain) OFHTTPResponse *response;
+@property (readonly, nonatomic) OFHTTPResponse *response;
 
 /*!
  * @brief Creates a new, autoreleased HTTP request failed exception.
  *
  * @param request The HTTP request which failed

Index: src/exceptions/OFHashAlreadyCalculatedException.h
==================================================================
--- src/exceptions/OFHashAlreadyCalculatedException.h
+++ src/exceptions/OFHashAlreadyCalculatedException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The hash which has already been calculated.
  */
-@property (readonly, retain) id object;
+@property (readonly, nonatomic) id object;
 
 /*!
  * @brief Creates a new, autoreleased hash already calculated exception.
  *
  * @param object The hash which has already been calculated

Index: src/exceptions/OFInitializationFailedException.h
==================================================================
--- src/exceptions/OFInitializationFailedException.h
+++ src/exceptions/OFInitializationFailedException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The class for which initialization failed.
  */
-@property (readonly, assign) Class inClass;
+@property (readonly, nonatomic) Class inClass;
 
 /*!
  * @brief Creates a new, autoreleased initialization failed exception.
  *
  * @param class_ The class for which initialization failed

Index: src/exceptions/OFInvalidJSONException.h
==================================================================
--- src/exceptions/OFInvalidJSONException.h
+++ src/exceptions/OFInvalidJSONException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The string containing the invalid JSON representation.
  */
-@property (readonly, copy) OFString *string;
+@property (readonly, nonatomic) OFString *string;
 
 /*!
  * The line in which parsing the JSON representation failed.
  */
 @property (readonly) size_t line;

Index: src/exceptions/OFLinkFailedException.h
==================================================================
--- src/exceptions/OFLinkFailedException.h
+++ src/exceptions/OFLinkFailedException.h
@@ -30,16 +30,16 @@
 }
 
 /*!
  * A string with the source for the link.
  */
-@property (readonly, copy) OFString *sourcePath;
+@property (readonly, nonatomic) OFString *sourcePath;
 
 /*!
  * A string with the destination for the link.
  */
-@property (readonly, copy) OFString *destinationPath;
+@property (readonly, nonatomic) OFString *destinationPath;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFListenFailedException.h
==================================================================
--- src/exceptions/OFListenFailedException.h
+++ src/exceptions/OFListenFailedException.h
@@ -33,11 +33,11 @@
 }
 
 /*!
  * The socket which failed to listen.
  */
-@property (readonly, retain) id socket;
+@property (readonly, nonatomic) id socket;
 
 /*!
  * The requested back log.
  */
 @property (readonly) int backLog;

Index: src/exceptions/OFLockFailedException.h
==================================================================
--- src/exceptions/OFLockFailedException.h
+++ src/exceptions/OFLockFailedException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The lock which could not be locked.
  */
-@property (readonly, retain) id <OFLocking> lock;
+@property (readonly, nonatomic) id <OFLocking> lock;
 
 /*!
  * @brief Creates a new, autoreleased lock failed exception.
  *
  * @param lock The lock which could not be locked

Index: src/exceptions/OFMalformedXMLException.h
==================================================================
--- src/exceptions/OFMalformedXMLException.h
+++ src/exceptions/OFMalformedXMLException.h
@@ -30,11 +30,11 @@
 }
 
 /*!
  * The parser which encountered malformed XML.
  */
-@property (readonly, retain) OFXMLParser *parser;
+@property (readonly, nonatomic) OFXMLParser *parser;
 
 /*!
  * @brief Creates a new, autoreleased malformed XML exception.
  *
  * @param parser The parser which encountered malformed XML

Index: src/exceptions/OFMemoryNotPartOfObjectException.h
==================================================================
--- src/exceptions/OFMemoryNotPartOfObjectException.h
+++ src/exceptions/OFMemoryNotPartOfObjectException.h
@@ -35,11 +35,11 @@
 @property (readonly) void *pointer;
 
 /*!
  * The object which the memory is not part of.
  */
-@property (readonly, retain) id object;
+@property (readonly, nonatomic) id object;
 
 /*!
  * @brief Creates a new, autoreleased memory not part of object exception.
  *
  * @param pointer A pointer to the memory that is not part of the object

Index: src/exceptions/OFMoveItemFailedException.h
==================================================================
--- src/exceptions/OFMoveItemFailedException.h
+++ src/exceptions/OFMoveItemFailedException.h
@@ -29,16 +29,16 @@
 }
 
 /*!
  * The original path.
  */
-@property (readonly, copy) OFString *sourcePath;
+@property (readonly, nonatomic) OFString *sourcePath;
 
 /*!
  * The new path.
  */
-@property (readonly, copy) OFString *destinationPath;
+@property (readonly, nonatomic) OFString *destinationPath;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFNotImplementedException.h
==================================================================
--- src/exceptions/OFNotImplementedException.h
+++ src/exceptions/OFNotImplementedException.h
@@ -35,11 +35,11 @@
 @property (readonly) SEL selector;
 
 /*!
  * The object which does not (fully) implement the selector.
  */
-@property (readonly, retain) id object;
+@property (readonly, nonatomic) id object;
 
 /*!
  * @brief Creates a new, autoreleased not implemented exception.
  *
  * @param selector The selector which is not or not fully implemented

Index: src/exceptions/OFNotOpenException.h
==================================================================
--- src/exceptions/OFNotOpenException.h
+++ src/exceptions/OFNotOpenException.h
@@ -27,11 +27,11 @@
 }
 
 /*!
  * The object which is not open, connected or bound.
  */
-@property (readonly, retain) id object;
+@property (readonly, nonatomic) id object;
 
 /*!
  * @brief Creates a new, autoreleased not open exception.
  *
  * @param object The object which is not open, connected or bound

Index: src/exceptions/OFObserveFailedException.h
==================================================================
--- src/exceptions/OFObserveFailedException.h
+++ src/exceptions/OFObserveFailedException.h
@@ -31,11 +31,11 @@
 }
 
 /*!
  * The observer which failed to observe.
  */
-@property (readonly, retain) OFKernelEventObserver *observer;
+@property (readonly, nonatomic) OFKernelEventObserver *observer;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFOpenItemFailedException.h
==================================================================
--- src/exceptions/OFOpenItemFailedException.h
+++ src/exceptions/OFOpenItemFailedException.h
@@ -29,16 +29,16 @@
 }
 
 /*!
  * The path of the item which could not be opened.
  */
-@property (readonly, copy) OFString *path;
+@property (readonly, nonatomic) OFString *path;
 
 /*!
  * The mode in which the item should have been opened.
  */
-@property (readonly, copy) OFString *mode;
+@property (readonly, nonatomic) OFString *mode;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFReadOrWriteFailedException.h
==================================================================
--- src/exceptions/OFReadOrWriteFailedException.h
+++ src/exceptions/OFReadOrWriteFailedException.h
@@ -31,11 +31,11 @@
 }
 
 /*!
  * The stream which caused the read or write failed exception.
  */
-@property (readonly, retain) id object;
+@property (readonly, nonatomic) id object;
 
 /*!
  * The requested length of the data that could not be read / written.
  */
 @property (readonly) size_t requestedLength;

Index: src/exceptions/OFRemoveItemFailedException.h
==================================================================
--- src/exceptions/OFRemoveItemFailedException.h
+++ src/exceptions/OFRemoveItemFailedException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The path of the item which could not be removed.
  */
-@property (readonly, copy) OFString *path;
+@property (readonly, nonatomic) OFString *path;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFSandboxActivationFailedException.h
==================================================================
--- src/exceptions/OFSandboxActivationFailedException.h
+++ src/exceptions/OFSandboxActivationFailedException.h
@@ -32,11 +32,11 @@
 }
 
 /*!
  * The sandbox which could not be activated.
  */
-@property (readonly, retain) OFSandbox *sandbox;
+@property (readonly, nonatomic) OFSandbox *sandbox;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFSeekFailedException.h
==================================================================
--- src/exceptions/OFSeekFailedException.h
+++ src/exceptions/OFSeekFailedException.h
@@ -31,11 +31,11 @@
 }
 
 /*!
  * The stream for which seeking failed.
  */
-@property (readonly, retain) OFSeekableStream *stream;
+@property (readonly, nonatomic) OFSeekableStream *stream;
 
 /*!
  * The offset to which seeking failed.
  */
 @property (readonly) of_offset_t offset;

Index: src/exceptions/OFSetOptionFailedException.h
==================================================================
--- src/exceptions/OFSetOptionFailedException.h
+++ src/exceptions/OFSetOptionFailedException.h
@@ -31,11 +31,11 @@
 }
 
 /*!
  * The stream for which the option could not be set.
  */
-@property (readonly, retain) OFStream *stream;
+@property (readonly, nonatomic) OFStream *stream;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFStatItemFailedException.h
==================================================================
--- src/exceptions/OFStatItemFailedException.h
+++ src/exceptions/OFStatItemFailedException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * A string with the path of the item whose status could not be retrieved.
  */
-@property (readonly, copy) OFString *path;
+@property (readonly, nonatomic) OFString *path;
 
 /*!
  * The errno of the error that occurred.
  */
 @property (readonly) int errNo;

Index: src/exceptions/OFStillLockedException.h
==================================================================
--- src/exceptions/OFStillLockedException.h
+++ src/exceptions/OFStillLockedException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The lock which is still locked.
  */
-@property (readonly, retain) id <OFLocking> lock;
+@property (readonly, nonatomic) id <OFLocking> lock;
 
 /*!
  * @brief Creates a new, autoreleased still locked exception.
  *
  * @param lock The lock which is still locked

Index: src/exceptions/OFThreadJoinFailedException.h
==================================================================
--- src/exceptions/OFThreadJoinFailedException.h
+++ src/exceptions/OFThreadJoinFailedException.h
@@ -34,11 +34,11 @@
 }
 
 /*!
  * The thread which could not be joined.
  */
-@property (readonly, retain) OFThread *thread;
+@property (readonly, nonatomic) OFThread *thread;
 
 /*!
  * @brief Creates a new, autoreleased thread join failed exception.
  *
  * @param thread The thread which could not be joined

Index: src/exceptions/OFThreadStartFailedException.h
==================================================================
--- src/exceptions/OFThreadStartFailedException.h
+++ src/exceptions/OFThreadStartFailedException.h
@@ -34,11 +34,11 @@
 }
 
 /*!
  * The thread which could not be started.
  */
-@property (readonly, retain) OFThread *thread;
+@property (readonly, nonatomic) OFThread *thread;
 
 /*!
  * @brief Creates a new, autoreleased thread start failed exception.
  *
  * @param thread The thread which could not be started

Index: src/exceptions/OFUnboundNamespaceException.h
==================================================================
--- src/exceptions/OFUnboundNamespaceException.h
+++ src/exceptions/OFUnboundNamespaceException.h
@@ -32,19 +32,19 @@
 
 /*!
  * The unbound namespace.
  */
 #ifndef __cplusplus
-@property (readonly, copy) OFString *namespace;
+@property (readonly, nonatomic) OFString *namespace;
 #else
-@property (readonly, copy, getter=namespace) OFString *namespace_;
+@property (readonly, nonatomic, getter=namespace) OFString *namespace_;
 #endif
 
 /*!
  * The element in which the namespace was not bound.
  */
-@property (readonly, retain) OFXMLElement *element;
+@property (readonly, nonatomic) OFXMLElement *element;
 
 /*!
  * @brief Creates a new, autoreleased unbound namespace exception.
  *
  * @param namespace_ The namespace which is unbound

Index: src/exceptions/OFUnboundPrefixException.h
==================================================================
--- src/exceptions/OFUnboundPrefixException.h
+++ src/exceptions/OFUnboundPrefixException.h
@@ -31,16 +31,16 @@
 }
 
 /*!
  * The unbound prefix.
  */
-@property (readonly, copy) OFString *prefix;
+@property (readonly, nonatomic) OFString *prefix;
 
 /*!
  * The parser which encountered the unbound prefix.
  */
-@property (readonly, retain) OFXMLParser *parser;
+@property (readonly, nonatomic) OFXMLParser *parser;
 
 /*!
  * @brief Creates a new, autoreleased unbound prefix exception.
  *
  * @param prefix The prefix which is unbound

Index: src/exceptions/OFUndefinedKeyException.h
==================================================================
--- src/exceptions/OFUndefinedKeyException.h
+++ src/exceptions/OFUndefinedKeyException.h
@@ -30,21 +30,21 @@
 }
 
 /*!
  * The object on which the key is undefined.
  */
-@property (readonly, retain) id object;
+@property (readonly, nonatomic) id object;
 
 /*!
  * The key which is undefined.
  */
-@property (readonly, copy) OFString *key;
+@property (readonly, nonatomic) OFString *key;
 
 /*!
  * The value for the undefined key
  */
-@property (readonly, retain) id value;
+@property (readonly, nonatomic) id value;
 
 /*!
  * @brief Creates a new, autoreleased undefined key exception.
  *
  * @param object The object on which the key is undefined

Index: src/exceptions/OFUnknownXMLEntityException.h
==================================================================
--- src/exceptions/OFUnknownXMLEntityException.h
+++ src/exceptions/OFUnknownXMLEntityException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The name of the unknown XML entity.
  */
-@property (readonly, copy) OFString *entityName;
+@property (readonly, nonatomic) OFString *entityName;
 
 /*!
  * @brief Creates a new, autoreleased unknown XML entity exception.
  *
  * @param entityName The name of the unknown XML entity

Index: src/exceptions/OFUnlockFailedException.h
==================================================================
--- src/exceptions/OFUnlockFailedException.h
+++ src/exceptions/OFUnlockFailedException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The lock which could not be unlocked.
  */
-@property (readonly, retain) id <OFLocking> lock;
+@property (readonly, nonatomic) id <OFLocking> lock;
 
 /*!
  * @brief Creates a new, autoreleased unlock failed exception.
  *
  * @param lock The lock which could not be unlocked

Index: src/exceptions/OFUnsupportedProtocolException.h
==================================================================
--- src/exceptions/OFUnsupportedProtocolException.h
+++ src/exceptions/OFUnsupportedProtocolException.h
@@ -32,11 +32,11 @@
 }
 
 /*!
  * The URL whose protocol is unsupported.
  */
-@property (readonly, retain) OFURL *URL;
+@property (readonly, nonatomic) OFURL *URL;
 
 /*!
  * @brief Creates a new, autoreleased unsupported protocol exception.
  *
  * @param URL The URL whose protocol is unsupported

Index: src/exceptions/OFUnsupportedVersionException.h
==================================================================
--- src/exceptions/OFUnsupportedVersionException.h
+++ src/exceptions/OFUnsupportedVersionException.h
@@ -29,11 +29,11 @@
 }
 
 /*!
  * The version which is unsupported.
  */
-@property (readonly, copy) OFString *version;
+@property (readonly, nonatomic) OFString *version;
 
 /*!
  * @brief Creates a new, autoreleased unsupported version exception.
  *
  * @param version The version which is unsupported

Index: tests/RuntimeTests.m
==================================================================
--- tests/RuntimeTests.m
+++ tests/RuntimeTests.m
@@ -32,11 +32,11 @@
 @interface RuntimeTest: OFObject
 {
 	OFString *_foo, *_bar;
 }
 
-@property (copy, nonatomic) OFString *foo;
+@property (nonatomic, copy) OFString *foo;
 @property (retain) OFString *bar;
 
 - (id)nilSuperTest;
 @end