diff --git a/lib/libnetbsd/util.h b/lib/libnetbsd/util.h
index 5cb017cebe3..99bc3cabcf1 100644
--- a/lib/libnetbsd/util.h
+++ b/lib/libnetbsd/util.h
@@ -39,4 +39,4 @@
 char	*flags_to_string(u_long flags, const char *def);
 int	 string_to_flags(char **stringp, u_long *setp, u_long *clrp);
 
-#endif	/* _UTIL_H_ */
+#endif
diff --git a/sys/arm/allwinner/timer.c b/sys/arm/allwinner/a10_timer.c
similarity index 100%
rename from sys/arm/allwinner/timer.c
rename to sys/arm/allwinner/a10_timer.c
diff --git a/sys/arm/allwinner/files.allwinner_up b/sys/arm/allwinner/files.allwinner_up
index d90f99d53bc..c776c3de791 100644
--- a/sys/arm/allwinner/files.allwinner_up
+++ b/sys/arm/allwinner/files.allwinner_up
@@ -1,3 +1,3 @@
 # $FreeBSD$
 
-arm/allwinner/timer.c			standard
+arm/allwinner/a10_timer.c		standard
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 259fe0d22cc..f24499dbd7f 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -667,13 +667,13 @@ udp_input(struct mbuf **mp, int *offp, int proto)
 		    INPLOOKUP_RLOCKPCB, ifp, m);
 	if (inp == NULL) {
 		if (udp_log_in_vain) {
-			char buf[4*sizeof "123"];
+			char src[INET_ADDRSTRLEN];
+			char dst[INET_ADDRSTRLEN];
 
-			strcpy(buf, inet_ntoa(ip->ip_dst));
 			log(LOG_INFO,
 			    "Connection attempt to UDP %s:%d from %s:%d\n",
-			    buf, ntohs(uh->uh_dport), inet_ntoa(ip->ip_src),
-			    ntohs(uh->uh_sport));
+			    inet_ntoa_r(ip->ip_dst, dst), ntohs(uh->uh_dport),
+			    inet_ntoa_r(ip->ip_src, src), ntohs(uh->uh_sport));
 		}
 		UDPSTAT_INC(udps_noport);
 		if (m->m_flags & (M_BCAST | M_MCAST)) {