@@ -1100,20 +1100,22 @@
  * @return A boolean whether the string has the specified suffix
  */
 - (bool)hasSuffix: (OFString *)suffix;
 
 /*!
- * @brief Separates an OFString into an OFArray of OFStrings.
+ * @brief Separates the string into an array of strings, split by the specified
+ *	  delimiter.
  *
  * @param delimiter The delimiter for separating
  * @return An autoreleased OFArray with the separated string
  */
-- (OFArray OF_GENERIC(OFString *) *)componentsSeparatedByString:
-    (OFString *)delimiter;
+- (OFArray OF_GENERIC(OFString *) *)
+    componentsSeparatedByString: (OFString *)delimiter;
 
 /*!
- * @brief Separates an OFString into an OFArray of OFStrings.
+ * @brief Separates the string into an array of strings, split by the specified
+ *	  delimiter.
  *
  * @param delimiter The delimiter for separating
  * @param options Options according to which the string should be separated.@n
  *		  Possible values are:
  *		  Value                  | Description
@@ -1123,10 +1125,36 @@
  */
 - (OFArray OF_GENERIC(OFString *) *)
     componentsSeparatedByString: (OFString *)delimiter
 			options: (int)options;
 
+/*!
+ * @brief Separates the string into an array of strings, split by characters in
+ *	  the specified set.
+ *
+ * @param characterSet The character set for separating
+ * @return An autoreleased OFArray with the separated string
+ */
+- (OFArray OF_GENERIC(OFString *) *)
+    componentsSeparatedByCharactersInSet: (OFCharacterSet *)characterSet;
+
+/*!
+ * @brief Separates the string into an array of strings, split by characters in
+ *	  the specified set.
+ *
+ * @param characterSet The character set for separating
+ * @param options Options according to which the string should be separated.@n
+ *		  Possible values are:
+ *		  Value                  | Description
+ *		  -----------------------|----------------------
+ * 		  `OF_STRING_SKIP_EMPTY` | Skip empty components
+ * @return An autoreleased OFArray with the separated string
+ */
+- (OFArray OF_GENERIC(OFString *) *)
+    componentsSeparatedByCharactersInSet: (OFCharacterSet *)characterSet
+				 options: (int)options;
+
 /*!
  * @brief Returns the string in UTF-16 encoding with the specified byte order.
  *
  * The result is valid until the autorelease pool is released. If you want to
  * use the result outside the scope of the current autorelease pool, you have to