diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c
index 4b90f6b9fdbc..9dfc4082dab8 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc.yppasswdd.c,v 1.13 2009/10/20 00:51:14 snj Exp $	*/
+/*	$NetBSD: rpc.yppasswdd.c,v 1.14 2011/05/24 13:27:16 joerg Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rpc.yppasswdd.c,v 1.13 2009/10/20 00:51:14 snj Exp $");
+__RCSID("$NetBSD: rpc.yppasswdd.c,v 1.14 2011/05/24 13:27:16 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -93,7 +93,7 @@ main(int argc, char *argv[])
 
 				arglen = strlen(argv[i]);
 				if ((len + arglen) > (int)(sizeof(make_arg) - 2))
-					errx(EXIT_FAILURE, strerror(E2BIG));
+					errx(EXIT_FAILURE, "%s", strerror(E2BIG));
 				make_arg[len++] = ' ';
 				(void)strcpy(&make_arg[len], argv[i]);
 				len += arglen;
diff --git a/usr.sbin/syslogd/tls.c b/usr.sbin/syslogd/tls.c
index 9ba9d30f0851..cc2721836910 100644
--- a/usr.sbin/syslogd/tls.c
+++ b/usr.sbin/syslogd/tls.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls.c,v 1.5 2010/05/13 17:52:12 tnozaki Exp $	*/
+/*	$NetBSD: tls.c,v 1.6 2011/05/24 13:26:41 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.5 2010/05/13 17:52:12 tnozaki Exp $");
+__RCSID("$NetBSD: tls.c,v 1.6 2011/05/24 13:26:41 joerg Exp $");
 
 #ifndef DISABLE_TLS
 #include "syslogd.h"
@@ -829,7 +829,7 @@ socksetup_tls(const int af, const char *bindhostname, const char *port)
 	error = getaddrinfo(bindhostname, (port ? port : "syslog-tls"),
 	    &hints, &res);
 	if (error) {
-		logerror(gai_strerror(error));
+		logerror("%s", gai_strerror(error));
 		errno = 0;
 		die(0, 0, NULL);
 	}
@@ -989,7 +989,7 @@ tls_connect(struct tls_conn_settings *conn_info)
 	error = getaddrinfo(conn_info->hostname,
 	    (conn_info->port ? conn_info->port : "syslog-tls"), &hints, &res);
 	if (error) {
-		logerror(gai_strerror(error));
+		logerror("%s", gai_strerror(error));
 		return false;
 	}