@@ -257,10 +257,12 @@
 - (void)parseHosts: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFCharacterSet *whitespaceCharacterSet =
 	    [OFCharacterSet whitespaceCharacterSet];
+	OFCharacterSet *commentCharacterSet =
+	    [OFCharacterSet characterSetWithCharactersInString: @"#;"];
 	OFMutableDictionary *staticHosts;
 	OFFile *file;
 	OFString *line;
 
 	@try {
@@ -276,11 +278,11 @@
 	    [file readLineWithEncoding: [OFLocale encoding]]) != nil) {
 		OFArray *components, *hosts;
 		size_t pos;
 		OFString *address;
 
-		pos = [line rangeOfString: @"#"].location;
+		pos = [line indexOfCharacterFromSet: commentCharacterSet];
 		if (pos != OFNotFound)
 			line = [line substringToIndex: pos];
 
 		components = [line
 		    componentsSeparatedByCharactersInSet: whitespaceCharacterSet