diff --git a/cwmrc.5 b/cwmrc.5
index 389083e..a29fd12 100644
--- a/cwmrc.5
+++ b/cwmrc.5
@@ -245,7 +245,6 @@ A special
 keyword
 .Dq all
 can be used to unbind all buttons.
-.Pp
 .El
 .Sh BIND FUNCTION LIST
 .Bl -tag -width 23n -compact
@@ -325,12 +324,12 @@ Vertically maximize current window (gap + border honored).
 Horizontally maximize current window (gap + border honored).
 .It window-htile
 Current window is placed at the top of the screen, maximized
-horizontally and resized to half of the vertical screen space. Other
-windows in its group share remaining screen space.
+horizontally and resized to half of the vertical screen space.
+Other windows in its group share remaining screen space.
 .It window-vtile
 Current window is placed on the left of the screen, maximized vertically
-and resized to half of the horizontal screen space. Other windows in its
-group share remaining screen space.
+and resized to half of the horizontal screen space.
+Other windows in its group share remaining screen space.
 .It window-move
 Move current window.
 .It window-resize
diff --git a/kbfunc.c b/kbfunc.c
index 5e3a458..2b93ed5 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -468,6 +468,7 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
 	char			 path[PATH_MAX];
 	int			 l;
 	size_t			 len;
+	ssize_t			 slen;
 
 	TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
 		if (strcmp(cmd->name, "term") == 0)
@@ -481,20 +482,16 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
 	}
 
 	lbuf = NULL;
-	while ((buf = fgetln(fp, &len))) {
-		if (buf[len - 1] == '\n')
-			buf[len - 1] = '\0';
-		else {
-			/* EOF without EOL, copy and add the NUL */
-			lbuf = xmalloc(len + 1);
-			(void)memcpy(lbuf, buf, len);
-			lbuf[len] = '\0';
-			buf = lbuf;
-		}
+	len = 0;
+	while ((slen = getline(&lbuf, &len, fp)) != -1) {
+		buf = lbuf;
+		if (buf[slen - 1] == '\n')
+			buf[slen - 1] = '\0';
+		
 		/* skip hashed hosts */
 		if (strncmp(buf, HASH_MARKER, strlen(HASH_MARKER)) == 0)
 			continue;
-		for (p = buf; *p != ',' && *p != ' ' && p != buf + len; p++) {
+		for (p = buf; *p != ',' && *p != ' ' && p != buf + slen; p++) {
 			/* do nothing */
 		}
 		/* ignore badness */
@@ -504,6 +501,8 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
 		menuq_add(&menuq, NULL, "%s", hostbuf);
 	}
 	free(lbuf);
+	if (ferror(fp))
+		err(1, "%s", path);
 	(void)fclose(fp);
 menu:
 	if ((mi = menu_filter(sc, &menuq, "ssh", NULL, (CWM_MENU_DUMMY),