diff -urpN busybox.6/libbb/dump.c busybox.7/libbb/dump.c
--- busybox.6/libbb/dump.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/libbb/dump.c	2006-09-04 21:39:32.000000000 +0200
@@ -220,7 +220,7 @@ static void rewrite(FS * fs)
 				}
 			} else {
 			DO_BAD_CONV_CHAR:
-				bb_error_msg_and_die("bad conversion character %%%s.\n", p1);
+				bb_error_msg_and_die("bad conversion character %%%s.", p1);
 			}
 
 			/*
@@ -253,7 +253,7 @@ static void rewrite(FS * fs)
 
 			/* only one conversion character if byte count */
 			if (!(pr->flags & F_ADDRESS) && fu->bcnt && nconv++) {
-				bb_error_msg_and_die("byte count with multiple conversion characters.\n");
+				bb_error_msg_and_die("byte count with multiple conversion characters.");
 			}
 		}
 		/*
diff -urpN busybox.6/libbb/inet_common.c busybox.7/libbb/inet_common.c
--- busybox.6/libbb/inet_common.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/libbb/inet_common.c	2006-09-04 21:39:09.000000000 +0200
@@ -205,7 +205,7 @@ int INET6_rresolve(char *name, size_t le
 	/* Grmpf. -FvK */
 	if (sin6->sin6_family != AF_INET6) {
 #ifdef DEBUG
-		bb_error_msg(_("rresolve: unsupport address family %d !\n"),
+		bb_error_msg(_("rresolve: unsupport address family %d!"),
 				  sin6->sin6_family);
 #endif
 		errno = EAFNOSUPPORT;
diff -urpN busybox.6/libbb/xfuncs.c busybox.7/libbb/xfuncs.c
--- busybox.6/libbb/xfuncs.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/libbb/xfuncs.c	2006-09-04 21:38:54.000000000 +0200
@@ -108,8 +108,8 @@ FILE *xfopen(const char *path, const cha
 /* Die if we can't open an existing file and return an fd. */
 int xopen(const char *pathname, int flags)
 {
-	if (ENABLE_DEBUG && (flags && O_CREAT))
-		bb_error_msg_and_die("xopen() with O_CREAT\n");
+	if (ENABLE_DEBUG && (flags & O_CREAT))
+		bb_error_msg_and_die("xopen() with O_CREAT");
 
 	return xopen3(pathname, flags, 0777);
 }
diff -urpN busybox.6/networking/httpd.c busybox.7/networking/httpd.c
--- busybox.6/networking/httpd.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/networking/httpd.c	2006-09-04 21:37:42.000000000 +0200
@@ -1809,7 +1809,7 @@ static int miniHttpd(int server)
 				config->rmt_ip & 0xff);
 	config->port = ntohs(fromAddr.sin_port);
 #if DEBUG
-	bb_error_msg("connection from IP=%s, port %u\n",
+	bb_error_msg("connection from IP=%s, port %u",
 					config->rmt_ip_str, config->port);
 #endif
 #endif /* CONFIG_FEATURE_HTTPD_CGI */
diff -urpN busybox.6/networking/ipcalc.c busybox.7/networking/ipcalc.c
--- busybox.6/networking/ipcalc.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/networking/ipcalc.c	2006-09-04 21:38:17.000000000 +0200
@@ -119,7 +119,7 @@ int ipcalc_main(int argc, char **argv)
 					unsigned int msk;
 
 					if (safe_strtoul(prefixstr, &netprefix) || netprefix > 32) {
-						IPCALC_MSG(bb_error_msg_and_die("bad IP prefix: %s\n", prefixstr),
+						IPCALC_MSG(bb_error_msg_and_die("bad IP prefix: %s", prefixstr),
 								exit(EXIT_FAILURE));
 					}
 					netmask = 0;
@@ -149,7 +149,7 @@ int ipcalc_main(int argc, char **argv)
 
 	if (argc == 2) {
 		if (ENABLE_FEATURE_IPCALC_FANCY && have_netmask) {
-			IPCALC_MSG(bb_error_msg_and_die("Use prefix or netmask, not both.\n"),
+			IPCALC_MSG(bb_error_msg_and_die("Use prefix or netmask, not both"),
 					exit(EXIT_FAILURE));
 		}
 
diff -urpN busybox.6/networking/libiproute/iproute.c busybox.7/networking/libiproute/iproute.c
--- busybox.6/networking/libiproute/iproute.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/networking/libiproute/iproute.c	2006-09-04 21:37:19.000000000 +0200
@@ -608,7 +608,7 @@ static int iproute_list_or_flush(int arg
 			}
 			filter.flushed = 0;
 			if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
-				bb_error_msg("Flush terminated\n");
+				bb_error_msg("Flush terminated");
 				return -1;
 			}
 			if (filter.flushed == 0) {
diff -urpN busybox.6/networking/traceroute.c busybox.7/networking/traceroute.c
--- busybox.6/networking/traceroute.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/networking/traceroute.c	2006-09-04 21:37:38.000000000 +0200
@@ -515,16 +515,16 @@ str2val(const char *str, const char *wha
 	} else
 		val = (int)strtol(str, &ep, 10);
 	if (*ep != '\0') {
-		bb_error_msg_and_die("\"%s\" bad value for %s \n", str, what);
+		bb_error_msg_and_die("\"%s\" bad value for %s", str, what);
 	}
 	if (val < mi && mi >= 0) {
 		if (mi == 0)
-			bb_error_msg_and_die("%s must be >= %d\n", what, mi);
+			bb_error_msg_and_die("%s must be >= %d", what, mi);
 		else
-			bb_error_msg_and_die("%s must be > %d\n", what, mi - 1);
+			bb_error_msg_and_die("%s must be > %d", what, mi - 1);
 	}
 	if (val > ma && ma >= 0)
-		bb_error_msg_and_die("%s must be <= %d\n", what, ma);
+		bb_error_msg_and_die("%s must be <= %d", what, ma);
 	return val;
 }
 
diff -urpN busybox.6/networking/vconfig.c busybox.7/networking/vconfig.c
--- busybox.6/networking/vconfig.c	2006-09-04 21:40:50.000000000 +0200
+++ busybox.7/networking/vconfig.c	2006-09-04 21:37:51.000000000 +0200
@@ -133,7 +133,7 @@ int vconfig_main(int argc, char **argv)
 		ifr.u.name_type = *xfind_str(name_types+1, argv[1]);
 	} else {
 		if (strlen(argv[1]) >= IF_NAMESIZE) {
-			bb_error_msg_and_die("if_name >= %d chars\n", IF_NAMESIZE);
+			bb_error_msg_and_die("if_name >= %d chars", IF_NAMESIZE);
 		}
 		strcpy(ifr.device1, argv[1]);
 		p = argv[2];