diff --git a/rpcbind-0.2.4-runstatdir.patch b/rpcbind-0.2.4-runstatdir.patch
new file mode 100644
index 0000000..53abb23
--- /dev/null
+++ b/rpcbind-0.2.4-runstatdir.patch
@@ -0,0 +1,61 @@
+diff -up rpcbind-0.2.4/configure.ac.orig rpcbind-0.2.4/configure.ac
+--- rpcbind-0.2.4/configure.ac.orig	2017-01-03 13:51:48.426758826 -0500
++++ rpcbind-0.2.4/configure.ac	2017-01-16 11:19:12.888958858 -0500
+@@ -22,8 +22,8 @@ AC_ARG_ENABLE([warmstarts],
+ AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes)
+ 
+ AC_ARG_WITH([statedir],
+-  AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/var/run/rpcbind@:>@])
+-  ,, [with_statedir=/var/run/rpcbind])
++  AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/run/rpcbind@:>@])
++  ,, [with_statedir=/run/rpcbind])
+ AC_SUBST([statedir], [$with_statedir])
+ 
+ AC_ARG_WITH([rpcuser],
+diff -up rpcbind-0.2.4/configure.orig rpcbind-0.2.4/configure
+--- rpcbind-0.2.4/configure.orig	2017-01-03 13:51:50.222749413 -0500
++++ rpcbind-0.2.4/configure	2017-01-16 11:20:29.650978018 -0500
+@@ -1389,7 +1389,7 @@ Optional Features:
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-statedir=ARG     use ARG as state dir [default=/var/run/rpcbind]
++  --with-statedir=ARG     use ARG as state dir [default=/run/rpcbind]
+ 
+   --with-rpcuser=ARG      use ARG for RPC [default=root]
+ 
+@@ -3887,7 +3887,7 @@ fi
+ if test "${with_statedir+set}" = set; then :
+   withval=$with_statedir;
+ else
+-  with_statedir=/var/run/rpcbind
++  with_statedir=/run/rpcbind
+ fi
+ 
+ statedir=$with_statedir
+diff -up rpcbind-0.2.4/man/rpcbind-fr.8.orig rpcbind-0.2.4/man/rpcbind-fr.8
+--- rpcbind-0.2.4/man/rpcbind-fr.8.orig	2016-11-28 15:47:28.000000000 -0500
++++ rpcbind-0.2.4/man/rpcbind-fr.8	2017-01-16 11:19:12.888958858 -0500
+@@ -138,8 +138,8 @@ est red�marr�.
+ .Xr rpcbind 3 ,
+ .Xr rpcinfo 8
+ .Sh FILES
+-.Bl -tag -width /var/run/rpcbind.sock -compact
+-.It Pa /var/run/rpcbind.sock
++.Bl -tag -width /run/rpcbind.sock -compact
++.It Pa /run/rpcbind.sock
+ .Sh TRADUCTION
+ Aurelien CHARBON (Sept 2003)
+ .El
+diff -up rpcbind-0.2.4/src/rpcbind.c.orig rpcbind-0.2.4/src/rpcbind.c
+--- rpcbind-0.2.4/src/rpcbind.c.orig	2016-11-28 15:47:28.000000000 -0500
++++ rpcbind-0.2.4/src/rpcbind.c	2017-01-16 11:20:16.499974736 -0500
+@@ -106,7 +106,7 @@ char *nss_modules = "files";
+ /* who to suid to if -s is given */
+ #define RUN_AS  "daemon"
+ 
+-#define RPCBINDDLOCK "/var/run/rpcbind.lock"
++#define RPCBINDDLOCK RPCBIND_STATEDIR "/rpcbind.lock"
+ 
+ int runasdaemon = 0;
+ int insecure = 0;
diff --git a/rpcbind.spec b/rpcbind.spec
index 884c542..13fcb09 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -23,6 +23,7 @@ Patch001: rpcbind-0.2.4-systemd-statdir.patch
 
 Patch100: rpcbind-0.2.3-systemd-envfile.patch
 Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
+Patch102: rpcbind-0.2.4-runstatdir.patch
 
 Provides: portmap = %{version}-%{release}
 Obsoletes: portmap <= 4.0-65.3
@@ -40,6 +41,7 @@ RPC calls on a server on that machine.
 
 %patch100 -p1
 %patch101 -p1
+%patch102 -p1
 %build
 %ifarch s390 s390x
 PIE="-fPIE"
@@ -133,6 +135,9 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Mon Jan 16 2017 Steve Dickson <steved@redhat.com> - 0.2.4-2
+- Document /run/rpcbind is the state directory (bz 1401561)
+
 * Tue Jan  3 2017 Steve Dickson <steved@redhat.com> - 0.2.4-1
 - Fix boot dependency in systemd service file (bz 1401561)