diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c
index d0e8137756d..3062f341986 100644
--- a/contrib/diff/src/diff3.c
+++ b/contrib/diff/src/diff3.c
@@ -1405,7 +1405,7 @@ output_diff3 (FILE *outputfile, struct diff3_block *diff,
 	      line = 0;
 	      do
 		{
-		  fprintf (outputfile, line_prefix);
+		  fprintf (outputfile, "%s", line_prefix);
 		  cp = D_RELNUM (ptr, realfile, line);
 		  length = D_RELLEN (ptr, realfile, line);
 		  fwrite (cp, sizeof (char), length, outputfile);
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 568733801a6..8774039b5d0 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -17,6 +17,6 @@ CFLAGS+=-I${SRCTOP}/contrib/diff/lib
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
 
-WARNS?=	0
+WARNS?=	2
 
 .include <bsd.prog.mk>