diff --git a/ChangeLog b/ChangeLog
index 9fb871da32..91826c2a0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-26  Roland McGrath  <roland@hack.frob.com>
+
+	* sunrpc/rpc_hout.c (pdeclaration): Call f_print with a "%s" format
+	rather than a string variable.
+	* sunrpc/rpc_main.c (h_output): Likewise.
+	* sunrpc/rpc_svcout.c (write_real_program): Likewise.
+
 2012-07-26  Pino Toscano  <toscano.pino@tiscali.it>
 
 	* inet/check_native.c: New file.
diff --git a/sunrpc/rpc_hout.c b/sunrpc/rpc_hout.c
index 31b6d3a3fe..10f793d233 100644
--- a/sunrpc/rpc_hout.c
+++ b/sunrpc/rpc_hout.c
@@ -579,7 +579,7 @@ pdeclaration (const char *name, declaration * dec, int tab,
 	  break;
 	}
     }
-  f_print (fout, separator);
+  f_print (fout, "%s", separator);
 }
 
 static int
diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index 3096455eec..06d951aa6a 100644
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -643,7 +643,7 @@ h_output (const char *infile, const char *define, int extend,
     }
   else if (tblflag)
     {
-      fprintf (fout, rpcgen_table_dcl);
+      fprintf (fout, "%s", rpcgen_table_dcl);
     }
 
   if (Cflag)
diff --git a/sunrpc/rpc_svcout.c b/sunrpc/rpc_svcout.c
index be234aee8a..4f12a8146c 100644
--- a/sunrpc/rpc_svcout.c
+++ b/sunrpc/rpc_svcout.c
@@ -353,7 +353,7 @@ write_real_program (const definition * def)
 	      f_print (fout, " (");
 	      /* arg name */
 	      if (proc->arg_num > 1)
-		f_print (fout, proc->args.argname);
+		f_print (fout, "%s", proc->args.argname);
 	      else
 		ptype (proc->args.decls->decl.prefix,
 		       proc->args.decls->decl.type, 0);