diff --git a/ChangeLog b/ChangeLog
index 1b12bf5c9f..19f0504974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-01-14  GOTO Masanori  <gotom@debian.or.jp>
 
+	* sunrpc/rpc_main.c (s_output): Generate #include <rpc/pmap_clnt.h>
+	irrespective of Cflag.
+
 	* manual/memory.texi (sbrk): Fix definition.
 	* manual/string.texi (strcasestr): Fix example typo.
 
diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index fee83514d1..acc0132603 100644
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -695,11 +695,9 @@ s_output (int argc, const char *argv[], const char *infile, const char *define,
 
   fprintf (fout, "#include <stdio.h>\n");
   fprintf (fout, "#include <stdlib.h>\n");
+  fprintf (fout, "#include <rpc/pmap_clnt.h>\n");
   if (Cflag)
-    {
-      fprintf (fout, "#include <rpc/pmap_clnt.h>\n");
-      fprintf (fout, "#include <string.h>\n");
-    }
+    fprintf (fout, "#include <string.h>\n");
   if (strcmp (svcclosetime, "-1") == 0)
     indefinitewait = 1;
   else if (strcmp (svcclosetime, "0") == 0)