@@ -30,11 +30,11 @@
 # import "OFOnce.h"
 # import "OFPlainMutex.h"
 #endif
 
 struct EmbeddedFile {
-	const char *name;
+	OFString *path;
 	const uint8_t *bytes;
 	size_t size;
 } *embeddedFiles = NULL;
 size_t numEmbeddedFiles = 0;
 #ifdef OF_HAVE_THREADS
@@ -46,11 +46,11 @@
 	OFEnsure(OFPlainMutexNew(&mutex) == 0);
 }
 #endif
 
 void
-OFRegisterEmbeddedFile(const char *name, const uint8_t *bytes, size_t size)
+OFRegisterEmbeddedFile(OFString *path, const uint8_t *bytes, size_t size)
 {
 #ifdef OF_HAVE_THREADS
 	static OFOnceControl onceControl = OFOnceControlInitValue;
 	OFOnce(&onceControl, init);
 
@@ -59,11 +59,11 @@
 
 	embeddedFiles = realloc(embeddedFiles,
 	    sizeof(*embeddedFiles) * (numEmbeddedFiles + 1));
 	OFEnsure(embeddedFiles != NULL);
 
-	embeddedFiles[numEmbeddedFiles].name = name;
+	embeddedFiles[numEmbeddedFiles].path = [path retain];
 	embeddedFiles[numEmbeddedFiles].bytes = bytes;
 	embeddedFiles[numEmbeddedFiles].size = size;
 	numEmbeddedFiles++;
 
 #ifdef OF_HAVE_THREADS
@@ -72,11 +72,11 @@
 }
 
 @implementation OFEmbeddedURIHandler
 - (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
 {
-	const char *path;
+	OFString *path;
 
 	if (![URI.scheme isEqual: @"embedded"] || URI.host.length > 0 ||
 	    URI.port != nil || URI.user != nil || URI.password != nil ||
 	    URI.query != nil || URI.fragment != nil)
 		@throw [OFInvalidArgumentException exception];
@@ -84,20 +84,20 @@
 	if (![mode isEqual: @"r"])
 		@throw [OFOpenItemFailedException exceptionWithURI: URI
 							      mode: mode
 							     errNo: EROFS];
 
-	if ((path = URI.path.UTF8String) == NULL) {
+	if ((path = URI.path) == nil) {
 		@throw [OFInvalidArgumentException exception];
 	}
 
 #ifdef OF_HAVE_THREADS
 	OFEnsure(OFPlainMutexLock(&mutex) == 0);
 	@try {
 #endif
 		for (size_t i = 0; i < numEmbeddedFiles; i++) {
-			if (strcmp(embeddedFiles[i].name, path) != 0)
+			if (![embeddedFiles[i].path isEqual: path])
 				continue;
 
 			return [OFMemoryStream
 			    streamWithMemoryAddress: (void *)
 							 embeddedFiles[i].bytes