@@ -51,59 +51,59 @@
 /**
  * \brief Creates a new OFDictionary.
  *
  * \return A new autoreleased OFDictionary
  */
-+ dictionary;
++ (instancetype)dictionary;
 
 /**
  * \brief Creates a new OFDictionary with the specified dictionary.
  *
  * \param dictionary An OFDictionary
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithDictionary: (OFDictionary*)dictionary;
++ (instancetype)dictionaryWithDictionary: (OFDictionary*)dictionary;
 
 /**
  * \brief Creates a new OFDictionary with the specified key and object.
  *
  * \param key The key
  * \param object The object
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithObject: (id)object
-		forKey: (id)key;
++ (instancetype)dictionaryWithObject: (id)object
+			      forKey: (id)key;
 
 /**
  * \brief Creates a new OFDictionary with the specified keys and objects.
  *
  * \param keys An array of keys
  * \param objects An array of objects
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithObjects: (OFArray*)objects
-		forKeys: (OFArray*)keys;
++ (instancetype)dictionaryWithObjects: (OFArray*)objects
+			      forKeys: (OFArray*)keys;
 
 /**
  * \brief Creates a new OFDictionary with the specified keys and objects.
  *
  * \param keys An array of keys
  * \param objects An array of objects
  * \param count The number of objects in the arrays
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithObjects: (id const*)objects
-		forKeys: (id const*)keys
++ (instancetype)dictionaryWithObjects: (id const*)objects
+			      forKeys: (id const*)keys
 		  count: (size_t)count;
 
 /**
  * \brief Creates a new OFDictionary with the specified keys objects.
  *
  * \param firstKey The first key
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithKeysAndObjects: (id)firstKey, ...;
++ (instancetype)dictionaryWithKeysAndObjects: (id)firstKey, ...;
 
 /**
  * \brief Initializes an already allocated OFDictionary.
  *
  * \return An initialized OFDictionary