diff --git a/debian/changelog b/debian/changelog
index e8bbccc55..e9a6b49d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium
   * [x86] hyperv-daemons: Use pid file name in init script status operation
   * Update policy version to 4.1.1:
     - linux-doc: Build an empty package when the nodoc profile is used
+    - [x86] hyperv-daemons: Create pid files under /run, not /var/run
 
   [ Uwe Kleine-König ]
   * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin
diff --git a/debian/hyperv-daemons.hv-fcopy-daemon.init b/debian/hyperv-daemons.hv-fcopy-daemon.init
index 923b67b63..7ecfc2a25 100755
--- a/debian/hyperv-daemons.hv-fcopy-daemon.init
+++ b/debian/hyperv-daemons.hv-fcopy-daemon.init
@@ -12,7 +12,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Hyper-V file copy service (FCOPY) daemon"
 NAME=hv_fcopy_daemon
 DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/hyperv-daemons.hv-fcopy-daemon
 
 # Exit if the package is not installed
diff --git a/debian/hyperv-daemons.hv-kvp-daemon.init b/debian/hyperv-daemons.hv-kvp-daemon.init
index bf1623076..20a8117af 100755
--- a/debian/hyperv-daemons.hv-kvp-daemon.init
+++ b/debian/hyperv-daemons.hv-kvp-daemon.init
@@ -12,7 +12,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Hyper-V key-value pair (KVP) daemon"
 NAME=hv_kvp_daemon
 DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/hyperv-daemons.hv-kvp-daemon
 
 # Exit if the package is not installed
diff --git a/debian/hyperv-daemons.hv-vss-daemon.init b/debian/hyperv-daemons.hv-vss-daemon.init
index a99d8f2be..ec2df0a18 100755
--- a/debian/hyperv-daemons.hv-vss-daemon.init
+++ b/debian/hyperv-daemons.hv-vss-daemon.init
@@ -12,7 +12,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Hyper-V volume shadow copy service (VSS) daemon"
 NAME=hv_vss_daemon
 DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/hyperv-daemons.hv-vss-daemon
 
 # Exit if the package is not installed