--- rpcbind-0.1.4/man/rpcbind.8.orig	2004-10-25 08:07:44.000000000 -0400
+++ rpcbind-0.1.4/man/rpcbind.8	2006-08-10 16:19:55.000000000 -0400
@@ -131,6 +131,14 @@ to use non-privileged ports for outgoing
 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 (in /tmp) when
+.Nm
+starts up. The state file is created when
+.Nm
+terminates.
 .El
 .Sh NOTES
 All RPC servers must be restarted if
--- rpcbind-0.1.4/src/Makefile.am.orig	2006-08-10 14:56:50.000000000 -0400
+++ rpcbind-0.1.4/src/Makefile.am	2006-08-10 15:36:04.000000000 -0400
@@ -1,5 +1,14 @@
 INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
                                                 -D_GNU_SOURCE -Wall -pipe
+if DEBUG
+INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
+INCLUDES +=	-DND_DEBUG -DBIND_DEBUG
+endif
+
+if WARMSTART
+INCLUDES +=	-DWARMSTART
+endif
+
 
 bin_PROGRAMS = rpcbind rpcinfo
 
@@ -18,10 +27,6 @@ rpcbind_LDFLAGS = -lpthread -ltirpc
 rpcbind_LDADD = $(LIB_TIRPC)
 AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
                        -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
-if DEBUG
-INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
-INCLUDES +=	-DND_DEBUG -DBIND_DEBUG
-endif
 
 $(rpcbind_OBJECTS) :    security.o util.o check_bound.o pmap_svc.o \
                         rpcb_svc.o rpcb_svc_com.o rpcb_svc_4.o \
--- rpcbind-0.1.4/configure.in.orig	2006-08-10 10:47:42.000000000 -0400
+++ rpcbind-0.1.4/configure.in	2006-08-10 15:37:29.000000000 -0400
@@ -18,6 +18,14 @@ AC_ARG_ENABLE(debug,[  --enable-debug   
 	esac],[debug=false])
 AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
 
+AC_ARG_ENABLE(warmstarts,[  --enable-warmstarts  Enables Warm Starts], 
+	[case "${enableval}" in
+		yes) warmstarts=true ;;
+		no)  warmstarts=no ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-warmstarts) ;;
+	esac],[warmstarts=false])
+AM_CONDITIONAL(WARMSTART, test x$warmstarts = xtrue)
+
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
                   netinet/in.h stdlib.h string.h \
                   sys/param.h sys/socket.h \