@@ -124,12 +124,11 @@
 		    @"Cannot extract a specific file of a .gz archive!")];
 		app->_exitStatus = 1;
 		return;
 	}
 
-	/* FIXME: Should use IRI-specific path extension deletion. */
-	fileName = _archiveIRI.lastPathComponent.stringByDeletingPathExtension;
+	fileName = _archiveIRI.IRIByDeletingPathExtension.lastPathComponent;
 
 	if (app->_outputLevel >= 0)
 		[OFStdOut writeString: OF_LOCALIZED(@"extracting_file",
 		    @"Extracting %[file]...",
 		    @"file", fileName)];
@@ -162,13 +161,12 @@
 	}
 }
 
 - (void)printFiles: (OFArray OF_GENERIC(OFString *) *)files
 {
-	/* FIXME: Should use IRI-specific path extension deletion. */
-	OFString *fileName = _archiveIRI.lastPathComponent
-	    .stringByDeletingPathExtension;
+	OFString *fileName =
+	    _archiveIRI.IRIByDeletingPathExtension.lastPathComponent;
 
 	if (files.count > 0) {
 		[OFStdErr writeLine: OF_LOCALIZED(
 		    @"cannot_print_specific_file_from_gz",
 		    @"Cannot print a specific file of a .gz archive!")];