@@ -31,28 +31,28 @@
 /**
  * \brief Creates a new OFDate with the current date and time.
  *
  * \return A new, autoreleased OFDate with the current date and time
  */
-+ date;
++ (instancetype)date;
 
 /**
  * \brief Creates a new OFDate with the specified date and time since
  *	  1970-01-01T00:00:00Z.
  *
  * \param seconds The seconds since 1970-01-01T00:00:00Z
  * \return A new, autoreleased OFDate with the specified date and time
  */
-+ dateWithTimeIntervalSince1970: (double)seconds;
++ (instancetype)dateWithTimeIntervalSince1970: (double)seconds;
 
 /**
  * \brief Creates a new OFDate with the specified date and time since now.
  *
  * \param seconds The seconds since now
  * \return A new, autoreleased OFDate with the specified date and time
  */
-+ dateWithTimeIntervalSinceNow: (double)seconds;
++ (instancetype)dateWithTimeIntervalSinceNow: (double)seconds;
 
 /**
  * \brief Creates a new OFDate with the specified string in the specified
  *	  format.
  *
@@ -66,12 +66,12 @@
  *
  * \param string The string describing the date
  * \param format The format of the string describing the date
  * \return A new, autoreleased OFDate with the specified date and time
  */
-+ dateWithDateString: (OFString*)string
-	      format: (OFString*)format;
++ (instancetype)dateWithDateString: (OFString*)string
+			    format: (OFString*)format;
 
 /**
  * \brief Creates a new OFDate with the specified string in the specified
  *	  format.
  *
@@ -82,30 +82,30 @@
  *
  * \param string The string describing the date
  * \param format The format of the string describing the date
  * \return A new, autoreleased OFDate with the specified date and time
  */
-+ dateWithLocalDateString: (OFString*)string
-		   format: (OFString*)format;
++ (instancetype)dateWithLocalDateString: (OFString*)string
+				 format: (OFString*)format;
 
 /**
  * \brief Returns a date in the distant future.
  *
  * The date is system-dependant.
  *
  * \return A date in the distant future
  */
-+ distantFuture;
++ (instancetype)distantFuture;
 
 /**
  * \brief Returns a date in the distant past.
  *
  * The date is system-dependant.
  *
  * \return A date in the distant past
  */
-+ distantPast;
++ (instancetype)distantPast;
 
 /**
  * \brief Initializes an already allocated OFDate with the specified date and
  *	  time since 1970-01-01T00:00:00Z.
  *