@@ -70,10 +70,48 @@
 		s->cString[0] = '\0';
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
+
+	return self;
+}
+
+- _initWithUTF8String: (const char*)UTF8String
+	       length: (size_t)UTF8StringLength
+	      storage: (char*)storage
+{
+	self = [super init];
+
+	@try {
+		if (UTF8StringLength >= 3 &&
+		    !memcmp(UTF8String, "\xEF\xBB\xBF", 3)) {
+			UTF8String += 3;
+			UTF8StringLength -= 3;
+		}
+
+		s = &s_store;
+
+		s->cString = storage;
+		s->cStringLength = UTF8StringLength;
+
+		switch (of_string_check_utf8(UTF8String, UTF8StringLength,
+		    &s->length)) {
+		case 1:
+			s->UTF8 = YES;
+			break;
+		case -1:
+			@throw [OFInvalidEncodingException
+			    exceptionWithClass: isa];
+		}
+
+		memcpy(s->cString, UTF8String, UTF8StringLength);
+		s->cString[UTF8StringLength] = 0;
+	} @catch (id e) {
+		[self release];
+		@throw e;
+	}
 
 	return self;
 }
 
 - initWithCString: (const char*)cString