diff --git a/libbb/login.c b/libbb/login.c
index 3f67a819a..2d6162564 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -96,6 +96,7 @@ void print_login_issue(const char *issue_file, const char *tty)
 
 					case 'h':
 						gethostname(buf, sizeof(buf) - 1);
+						buf[sizeof(buf) - 1] = '\0';
 						break;
 
 					case 'l':
@@ -105,7 +106,7 @@ void print_login_issue(const char *issue_file, const char *tty)
 					default:
 						buf[0] = c;
 				}
-		}
+			}
 			fputs(outbuf, stdout);
 		}