diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index d976f6f3a864..c0f20700e432 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2009/04/22 15:23:07 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 2017/08/16 23:38:16 ginsbach Exp $
 
 .include <bsd.own.mk>
 
@@ -21,6 +21,7 @@ CPPFLAGS+=	-DINET6
 # Uncomment these to get any useful output from 'rpcbind -d'
 # CPPFLAGS+=	-DRPCBIND_DEBUG
 # CPPFLAGS+=	-DSVC_RUN_DEBUG
+CPPFLAGS+= -DWARMSTART
 
 LDADD+= -lwrap -lutil
 DPADD+= ${LIBWRAP} ${LIBUTIL}
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index 9a357944ee58..e9852f7ece67 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: warmstart.c,v 1.6 2017/08/16 08:44:40 christos Exp $	*/
+/*	$NetBSD: warmstart.c,v 1.7 2017/08/16 23:38:16 ginsbach Exp $	*/
 /* $FreeBSD: head/usr.sbin/rpcbind/warmstart.c 258564 2013-11-25 16:44:02Z hrs $*/
 
 /*-
@@ -42,6 +42,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <err.h>
+#include <paths.h>
 #include <rpc/rpc.h>
 #include <rpc/rpcb_prot.h>
 #include <rpc/xdr.h>
@@ -61,9 +62,9 @@
 
 
 /* These files keep the pmap_list and rpcb_list in XDR format */
-#define	RPCBFILE	"/tmp/rpcbind.file"
+#define	RPCBFILE	_PATH_VARRUN "rpcbind.file"
 #ifdef PORTMAP
-#define	PMAPFILE	"/tmp/portmap.file"
+#define	PMAPFILE	_PATH_VARRUN "portmap.file"
 #endif
 
 static bool_t write_struct(const char *, xdrproc_t, void *);