@@ -, +, @@ 
---
 configure.ac               | 4 ++++
 systemd/rpcbind.service.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
--- a/configure.ac	
+++ a/configure.ac	
@@ -20,6 +20,10 @@ AM_CONDITIONAL(LIBSETDEBUG, test x$lib_setdebug = xyes)
 AC_ARG_ENABLE([warmstarts],
   AS_HELP_STRING([--enable-warmstarts], [Enables Warm Starts @<:@default=no@:>@]))
 AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes)
+if test x"$enable_warmstarts" = xyes; then
+AC_SUBST([rpcbind_warmstart_flags], [-w])
+fi
+
 
 AC_ARG_WITH([statedir],
   AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/var/run/rpcbind@:>@])
--- a/systemd/rpcbind.service.in	
+++ a/systemd/rpcbind.service.in	
@@ -12,7 +12,7 @@ Wants=rpcbind.target
 [Service]
 Type=notify
 # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
-ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
+ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS @rpcbind_warmstart_flags@ -f
 
 [Install]
 WantedBy=multi-user.target
--