diff --git a/src/map.c b/src/map.c
index 28908c534..c3a13a7cb 100644
--- a/src/map.c
+++ b/src/map.c
@@ -248,7 +248,7 @@ static int map_read_entries_from_file(const char *filename,
 			c++;
 
 		/* empty lines are ignored too */
-		if (*c == '\0')
+		if (*c == '\0' || *c == '\r' || *c == '\n')
 			continue;
 
 		/* look for the end of the key */