diff --git a/ChangeLog b/ChangeLog
index 860531064f..e249c9c342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2013-10-21  Ondřej Bílka  <neleai@seznam.cz>
+
+	[BZ #15825]
+	* sunrpc/rpc_main.c: Document rpcgen -5.
+
 2013-10-19  Michael Stahl  <mstahl@redhat.com>
 
 	* elf/rtld.c (do_preload): Print the reason why preloading failed.
 
 2013-10-19  Ondřej Bílka  <neleai@seznam.cz>
 
-	BZ #10278]
+	[BZ #10278]
 	* posix/glob.c: Match only directories when trailing slash is present.
 	* posix/tst-gnuglob.c (my_opendir): Do not open files.
 	(main): Add testcase.
diff --git a/NEWS b/NEWS
index f19c4d5db1..3358ac6c84 100644
--- a/NEWS
+++ b/NEWS
@@ -12,10 +12,10 @@ Version 2.19
   156, 431, 832, 10278, 13028, 13982, 13985, 14155, 14547, 14699, 14910,
   15048, 15218, 15277, 15308, 15362, 15400, 15427, 15522, 15531, 15532,
   15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680, 15681, 15723,
-  15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, 15797, 15844,
-  15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890,
-  15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, 15939,
-  15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041.
+  15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, 15797, 15825,
+  15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
+  15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923,
+  15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache
diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index 0223c9a9fc..0a51e2cfa2 100644
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -1442,6 +1442,9 @@ options_usage (FILE *stream, int status)
   f_print (stream, _("-t\t\tgenerate RPC dispatch table\n"));
   f_print (stream, _("-T\t\tgenerate code to support RPC dispatch tables\n"));
   f_print (stream, _("-Y path\t\tdirectory name to find C preprocessor (cpp)\n"));
+  f_print (stream, _("-5\t\tSysVr4 compatibility mode\n"));
+  f_print (stream, _("--help\t\tgive this help list\n"));
+  f_print (stream, _("--version\tprint program version\n"));
 
   f_print (stream, _("\n\
 For bug reporting instructions, please see:\n\