--- man/rpcbind.8.ORIG	2009-05-29 09:38:22.000000000 -0400
+++ man/rpcbind.8	2012-10-02 15:36:24.287370856 -0400
@@ -127,14 +127,6 @@
 clients from using
 .Nm
 to connect to services from a privileged port.
-.It Fl w
-Cause
-.Nm
-to do a "warm start" by read a state file when
-.Nm
-starts up. The state file is created when
-.Nm
-terminates.
 .El
 .Sh NOTES
 All RPC servers must be restarted if
--- src/rpcbind.c.ORIG	2009-05-29 09:38:22.000000000 -0400
+++ src/rpcbind.c	2012-10-02 15:54:53.095575460 -0400
@@ -764,7 +764,12 @@
 			break;
 #endif
 		default:	/* error */
-			fprintf(stderr,	"usage: rpcbind [-Idwils]\n");
+#ifdef WARMSTART
+#define RPCBIND_VALID_OPTS "-Idwils"
+#else
+#define RPCBIND_VALID_OPTS "-Idils"
+#endif
+			fprintf(stderr,	"usage: rpcbind [%s]\n", RPCBIND_VALID_OPTS);
 			exit (1);
 		}
 	}