diff --git a/man/einfo.3 b/man/einfo.3
index 9ecee2a7..17777632 100644
--- a/man/einfo.3
+++ b/man/einfo.3
@@ -130,7 +130,7 @@ and
 .Fn ewendv
 are the counterparts to the above functions. If
 .Fa retval
-is zero then OK in green is printed in a bracket at the end of the prior
+is zero then ok in green is printed in a bracket at the end of the prior
 line. Otherwise we print the formatted string using
 .Fn error
 (or
@@ -149,7 +149,7 @@ does the same as
 .Fn eend
 but prints
 .Fa msg
-instead of OK or !! in the color 
+instead of ok or !! in the color 
 .Fa color
 at the column
 .Fa col .
diff --git a/src/libeinfo.c b/src/libeinfo.c
index bc03fa3e..80338ad6 100644
--- a/src/libeinfo.c
+++ b/src/libeinfo.c
@@ -778,7 +778,7 @@ static void _eend (FILE * restrict fp, int col, einfo_color_t color,
 	if (! msg)
 		return;
 
-	cols = get_term_columns (fp) - (strlen (msg) + 5);
+	cols = get_term_columns (fp) - (strlen (msg) + 3);
 
 	/* cons25 is special - we need to remove one char, otherwise things
 	 * do not align properly at all. */
@@ -793,14 +793,14 @@ static void _eend (FILE * restrict fp, int col, einfo_color_t color,
 		cols--;
 
 	if (cols > 0 && colour_terminal (fp)) {
-		fprintf (fp, "%s%s %s[ %s%s %s]%s\n", up, tgoto (goto_column, 0, cols),
+		fprintf (fp, "%s%s %s[%s%s%s]%s\n", up, tgoto (goto_column, 0, cols),
 				 ecolor (ECOLOR_BRACKET), ecolor (color), msg,
 				 ecolor (ECOLOR_BRACKET), ecolor (ECOLOR_NORMAL));
 	} else {
 		if (col > 0)
 			for (i = 0; i < cols - col; i++)
 				fprintf (fp, " ");
-		fprintf (fp, " [ %s ]\n", msg);
+		fprintf (fp, " [%s]\n", msg);
 	}
 }