diff --git a/src/common/servlist.c b/src/common/servlist.c
index dd06d52d..c2eb3e77 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -990,11 +990,10 @@ servlist_load (void)
 
 	while (fgets (buf, sizeof (buf) - 2, fp))
 	{
+		g_strchomp (buf);
 		len = strlen (buf);
 		if (!len)
 			continue;
-		buf[len] = 0;
-		buf[len-1] = 0;	/* remove the trailing \n */
 		if (net)
 		{
 			switch (buf[0])