diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index b24e869cdd4..5efe78b9c16 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -684,6 +684,8 @@ jail_enable="NO"	# Set to NO to disable starting of any jails
 jail_parallel_start="NO"	# Start jails in the background
 jail_list=""		# Space separated list of names of jails
 
+hv_kvpd_enable="NO"	# Start the Hyper-V key-value Pair Driver hv_kvp(4)
+
 ##############################################################
 ### Define source_rc_confs, the mechanism used by /etc/rc.* ##
 ### scripts to source rc_conf_files overrides safely.	    ##
diff --git a/etc/rc.d/hv_kvpd b/etc/rc.d/hv_kvpd
index 78e4b744732..284c7de8dff 100644
--- a/etc/rc.d/hv_kvpd
+++ b/etc/rc.d/hv_kvpd
@@ -8,6 +8,7 @@
 . /etc/rc.subr
 
 name="hv_kvp_daemon"
+rcvar="kp_kvpd_enable"
 command="/usr/sbin/${name}"
 required_dirs="/var/db/hyperv"