diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index caf0444850..557f4ce125 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -3865,19 +3865,19 @@ DEFUN (bgp_evpn_advertise_type5,
 
 	if (!(afi == AFI_IP || afi == AFI_IP6)) {
 		vty_out(vty,
-			"%%only ipv4 or ipv6 address families are supported");
+			"%%only ipv4 or ipv6 address families are supported\n");
 		return CMD_WARNING;
 	}
 
 	if (safi != SAFI_UNICAST) {
 		vty_out(vty,
-			"%%only ipv4 unicast or ipv6 unicast are supported");
+			"%%only ipv4 unicast or ipv6 unicast are supported\n");
 		return CMD_WARNING;
 	}
 
 	if ((oly != OVERLAY_INDEX_TYPE_NONE)
 	    && (oly != OVERLAY_INDEX_GATEWAY_IP)) {
-		vty_out(vty, "%%Unknown overlay-index type specified");
+		vty_out(vty, "%%Unknown overlay-index type specified\n");
 		return CMD_WARNING;
 	}
 
@@ -4056,13 +4056,13 @@ DEFUN (no_bgp_evpn_advertise_type5,
 
 	if (!(afi == AFI_IP || afi == AFI_IP6)) {
 		vty_out(vty,
-			"%%only ipv4 or ipv6 address families are supported");
+			"%%only ipv4 or ipv6 address families are supported\n");
 		return CMD_WARNING;
 	}
 
 	if (safi != SAFI_UNICAST) {
 		vty_out(vty,
-			"%%only ipv4 unicast or ipv6 unicast are supported");
+			"%%only ipv4 unicast or ipv6 unicast are supported\n");
 		return CMD_WARNING;
 	}
 
diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index 5d1ae766e2..857462a601 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -1261,7 +1261,7 @@ DEFPY (show_rpki_prefix,
 	if (pfx_table_validate_r(rtr_config->pfx_table, &matches, &match_count,
 				 asn, &addr, prefix->prefixlen, &result)
 	    != PFX_SUCCESS) {
-		vty_out(vty, "Prefix lookup failed");
+		vty_out(vty, "Prefix lookup failed\n");
 		return CMD_WARNING;
 	}
 
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index afe4c7ae6f..d21e257cb5 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8566,7 +8566,7 @@ DEFPY (af_sid_vpn_export,
 
 	if (!yes) {
 		/* implement me */
-		vty_out(vty, "It's not implemented");
+		vty_out(vty, "It's not implemented\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
diff --git a/lib/command.c b/lib/command.c
index ebdbf162d1..1989668bf0 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2239,9 +2239,9 @@ DEFUN (banner_motd_file,
 	int cmd = cmd_banner_motd_file(filename);
 
 	if (cmd == CMD_ERR_NO_FILE)
-		vty_out(vty, "%s does not exist", filename);
+		vty_out(vty, "%s does not exist\n", filename);
 	else if (cmd == CMD_WARNING_CONFIG_FAILED)
-		vty_out(vty, "%s must be in %s", filename, SYSCONFDIR);
+		vty_out(vty, "%s must be in %s\n", filename, SYSCONFDIR);
 
 	return cmd;
 }
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 0b7c3c6831..780521bfe4 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -9705,7 +9705,7 @@ DEFUN (ospf_max_metric_router_lsa_startup,
 	unsigned int seconds;
 
 	if (argc < 4) {
-		vty_out(vty, "%% Must supply stub-router period");
+		vty_out(vty, "%% Must supply stub-router period\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
@@ -9761,7 +9761,7 @@ DEFUN (ospf_max_metric_router_lsa_shutdown,
 	unsigned int seconds;
 
 	if (argc < 4) {
-		vty_out(vty, "%% Must supply stub-router shutdown period");
+		vty_out(vty, "%% Must supply stub-router shutdown period\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
index 21c1409e91..b5946bd40d 100644
--- a/pbrd/pbr_vty.c
+++ b/pbrd/pbr_vty.c
@@ -358,7 +358,7 @@ DEFPY(pbr_map_match_mark, pbr_map_match_mark_cmd,
 	struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence);
 
 #ifndef GNU_LINUX
-	vty_out(vty, "pbr marks are not supported on this platform");
+	vty_out(vty, "pbr marks are not supported on this platform\n");
 	return CMD_WARNING_CONFIG_FAILED;
 #endif
 
diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c
index ceed9cf739..78cc57cc44 100644
--- a/sharpd/sharp_vty.c
+++ b/sharpd/sharp_vty.c
@@ -540,7 +540,7 @@ DEFPY(vrf_label, vrf_label_cmd,
 		vrf = vrf_lookup_by_name(vrf_name);
 
 	if (!vrf) {
-		vty_out(vty, "Unable to find vrf you silly head");
+		vty_out(vty, "Unable to find vrf you silly head\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 1d9ed4ddd9..bb16232118 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -3425,7 +3425,7 @@ DEFUN (show_evpn_mac_vni_mac,
 
 	vni = strtoul(argv[4]->arg, NULL, 10);
 	if (!prefix_str2mac(argv[6]->arg, &mac)) {
-		vty_out(vty, "%% Malformed MAC address");
+		vty_out(vty, "%% Malformed MAC address\n");
 		return CMD_WARNING;
 	}
 	zvrf = zebra_vrf_get_evpn();