diff -Nru nfs-utils-1.3.3.orig/support/nfs/getport.c nfs-utils-1.3.3/support/nfs/getport.c
--- nfs-utils-1.3.3.orig/support/nfs/getport.c	2015-09-26 16:01:11.000000000 +0200
+++ nfs-utils-1.3.3/support/nfs/getport.c	2015-11-06 13:12:12.565448067 +0100
@@ -903,7 +903,7 @@
  * listen on AF_LOCAL.
  *
  * If that doesn't work (for example, if portmapper is running, or rpcbind
- * isn't listening on /var/run/rpcbind.sock), send a query via UDP to localhost
+ * isn't listening on /run/rpcbind.sock), send a query via UDP to localhost
  * (UDP doesn't leave a socket in TIME_WAIT, and the timeout is a relatively
  * short 3 seconds).
  */
diff -Nru nfs-utils-1.3.3.orig/systemd/nfs-blkmap.service nfs-utils-1.3.3/systemd/nfs-blkmap.service
--- nfs-utils-1.3.3.orig/systemd/nfs-blkmap.service	2015-11-06 13:10:23.376392802 +0100
+++ nfs-utils-1.3.3/systemd/nfs-blkmap.service	2015-11-06 13:11:11.836973182 +0100
@@ -9,7 +9,7 @@
 
 [Service]
 Type=forking
-PIDFile=/var/run/blkmapd.pid
-EnvironmentFile=-/run/sysconfig/nfs-utils
+PIDFile=/run/blkmapd.pid
+EnvironmentFile=-/run/nfs-utils
 ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS
 
diff -Nru nfs-utils-1.3.3.orig/systemd/rpc-statd.service nfs-utils-1.3.3/systemd/rpc-statd.service
--- nfs-utils-1.3.3.orig/systemd/rpc-statd.service	2015-11-06 13:10:23.381392759 +0100
+++ nfs-utils-1.3.3/systemd/rpc-statd.service	2015-11-06 13:10:49.572165905 +0100
@@ -13,5 +13,5 @@
 [Service]
 EnvironmentFile=-/run/nfs-utils
 Type=forking
-PIDFile=/var/run/rpc.statd.pid
+PIDFile=/run/rpc.statd.pid
 ExecStart=/usr/sbin/rpc.statd --no-notify $STATDARGS
diff -Nru nfs-utils-1.3.3.orig/tests/test-lib.sh nfs-utils-1.3.3/tests/test-lib.sh
--- nfs-utils-1.3.3.orig/tests/test-lib.sh	2015-09-26 16:01:11.000000000 +0200
+++ nfs-utils-1.3.3/tests/test-lib.sh	2015-11-06 13:11:48.084659658 +0100
@@ -56,5 +56,5 @@
 
 # shut down statd
 kill_statd() {
-	kill `cat /var/run/rpc.statd.pid`
+	kill `cat /run/rpc.statd.pid`
 }
diff -Nru nfs-utils-1.3.3.orig/utils/blkmapd/device-discovery.c nfs-utils-1.3.3/utils/blkmapd/device-discovery.c
--- nfs-utils-1.3.3.orig/utils/blkmapd/device-discovery.c	2015-09-26 16:01:11.000000000 +0200
+++ nfs-utils-1.3.3/utils/blkmapd/device-discovery.c	2015-11-06 13:11:29.333821808 +0100
@@ -58,7 +58,7 @@
 #define BL_PIPE_FILE	"/var/lib/nfs/rpc_pipefs/nfs/blocklayout"
 #define NFSPIPE_DIR	"/var/lib/nfs/rpc_pipefs/nfs"
 #define RPCPIPE_DIR	"/var/lib/nfs/rpc_pipefs"
-#define PID_FILE	"/var/run/blkmapd.pid"
+#define PID_FILE	"/run/blkmapd.pid"
 
 struct bl_disk *visible_disk_list;
 int    bl_watch_fd, bl_pipe_fd, nfs_pipedir_wfd, rpc_pipedir_wfd;
diff -Nru nfs-utils-1.3.3.orig/utils/statd/sm-notify.c nfs-utils-1.3.3/utils/statd/sm-notify.c
--- nfs-utils-1.3.3.orig/utils/statd/sm-notify.c	2015-09-26 16:01:11.000000000 +0200
+++ nfs-utils-1.3.3/utils/statd/sm-notify.c	2015-11-06 13:12:03.394527318 +0100
@@ -871,7 +871,7 @@
 }
 
 /*
- * Record pid in /var/run/sm-notify.pid
+ * Record pid in /run/sm-notify.pid
  * This file should remain until a reboot, even if the
  * program exits.
  * If file already exists, fail.
@@ -883,7 +883,7 @@
 	int fd;
 
 	(void)snprintf(pid, sizeof(pid), "%d\n", (int)getpid());
-	fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
+	fd = open("/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
 	if (fd < 0)
 		return 0;
 
diff -Nru nfs-utils-1.3.3.orig/utils/statd/start-statd nfs-utils-1.3.3/utils/statd/start-statd
--- nfs-utils-1.3.3.orig/utils/statd/start-statd	2015-09-26 16:01:11.000000000 +0200
+++ nfs-utils-1.3.3/utils/statd/start-statd	2015-11-06 13:12:36.640240100 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 # nfsmount calls this script when mounting a filesystem with locking
 # enabled, but when statd does not seem to be running (based on
-# /var/run/rpc.statd.pid).
+# /run/rpc.statd.pid).
 # It should run statd with whatever flags are apropriate for this
 # site.
 PATH="/sbin:/usr/sbin:/bin:/usr/bin"
diff -Nru nfs-utils-1.3.3.orig/utils/statd/statd.c nfs-utils-1.3.3/utils/statd/statd.c
--- nfs-utils-1.3.3.orig/utils/statd/statd.c	2015-09-26 16:01:11.000000000 +0200
+++ nfs-utils-1.3.3/utils/statd/statd.c	2015-11-06 13:12:24.620343918 +0100
@@ -159,7 +159,7 @@
 	fprintf(stderr,"      -H                   Specify a high-availability callout program.\n");
 }
 
-static const char *pidfile = "/var/run/rpc.statd.pid";
+static const char *pidfile = "/run/rpc.statd.pid";
 
 int pidfd = -1;
 static void create_pidfile(void)
diff -Nru nfs-utils-1.3.3.orig/utils/statd/statd.man nfs-utils-1.3.3/utils/statd/statd.man
--- nfs-utils-1.3.3.orig/utils/statd/statd.man	2015-09-26 16:01:11.000000000 +0200
+++ nfs-utils-1.3.3/utils/statd/statd.man	2015-11-06 13:12:50.900116969 +0100
@@ -398,7 +398,7 @@
 .I /var/lib/nfs/state
 NSM state number for this host
 .TP 2.5i
-.I /var/run/run.statd.pid
+.I /run/run.statd.pid
 pid file
 .TP 2.5i
 .I /etc/netconfig