--- drivers/orig-upsdrvctl.c	Thu Aug 22 02:30:50 2002
+++ drivers/upsdrvctl.c	Tue Jun 24 19:19:01 2003
@@ -143,11 +143,12 @@
 	char	pidfn[SMALLBUF], buf[SMALLBUF];
 	int	ret, pid;
 	struct	stat	fs;
 	FILE	*pidf;
 
-	printf("Stopping UPS: %s\n", upsname);
+	if (verbose)
+		printf("Stopping UPS: %s\n", upsname);
 
 	snprintf(pidfn, sizeof(pidfn), "%s/%s-%s.pid", ALTPIDPATH,
 		driver, xbasename(port));
 	ret = stat(pidfn, &fs);
 
@@ -536,13 +537,10 @@
 int main(int argc, char **argv)
 {
 	int	i;
 	char	*prog;
 
-	printf("Network UPS Tools - UPS driver controller %s\n",
-		UPS_VERSION);
-
 	prog = argv[0];
 	while ((i = getopt(argc, argv, "+htv")) != EOF) {
 		switch(i) {
 			case 'v':
 				verbose++;
@@ -562,12 +560,16 @@
 				help(prog);
 				break;
 		}
 	}
 
+	if (verbose)
+		printf("Network UPS Tools - UPS driver controller %s\n",
+			UPS_VERSION);
+
 	argc -= optind;
-        argv += optind;
+	argv += optind;
 
 	if (argc < 1)
 		help(prog);
 
 	if (testmode)
--- drivers/orig-main.c	Sun Nov 17 07:52:51 2002
+++ drivers/main.c	Tue Jun 24 19:23:39 2003
@@ -439,12 +439,10 @@
 	int 	shmok = 1;
 #endif
 
 	droproot();
 
-	upsdrv_banner();
-
 	if (experimental_driver) {
 		printf("Warning: This is an experimental driver.\n");
 		printf("Some features may not function correctly.\n\n");
 	}
 
--- server/orig-upsd.c	Thu Feb 27 11:31:07 2003
+++ server/upsd.c	Tue Jun 24 19:31:20 2003
@@ -2375,12 +2375,10 @@
 	/* set up some things for later */
 
 	listenaddr.s_addr = INADDR_ANY;
 	snprintf(pidfn, sizeof(pidfn), "%s/upsd.pid", ALTPIDPATH);
 
-	printf("Network UPS Tools upsd %s\n", UPS_VERSION);
-
 	while ((i = getopt(argc, argv, "+hp:t:i:fu:Vc:D")) != EOF) {
 		switch (i) {
 			case 'h':
 				help(progname);
 				break;
@@ -2402,14 +2400,12 @@
 				break;
 			case 'u':
 				user = optarg;
 				break;
 			case 'V':
-
-				/* do nothing - we already printed the banner */
+				printf("Network UPS Tools upsd %s\n", UPS_VERSION);
 				exit(0);
-
 			case 'c':
 				if (!strncmp(optarg, "reload", strlen(optarg)))
 					cmd = SIGCMD_RELOAD;
 				if (!strncmp(optarg, "stop", strlen(optarg)))
 					cmd = SIGCMD_STOP;
@@ -2454,11 +2450,12 @@
 
 	/* open the log now since readconf() calls upslogx() */
 	openlog("upsd", LOG_PID, LOG_FACILITY);
 
 	/* send logging to the syslog pre-background for later use */
-        xbit_set(&upslog_flags, UPSLOG_SYSLOG);
+	xbit_clear(&upslog_flags, UPSLOG_STDERR);
+	xbit_set(&upslog_flags, UPSLOG_SYSLOG);
 
 	if (nut_statepath_env)
 		statepath = xstrdup(nut_statepath_env);
 
 	if (chdir(statepath))