Index: head/release/tools/ec2.conf
===================================================================
--- head/release/tools/ec2.conf
+++ head/release/tools/ec2.conf
@@ -98,6 +98,10 @@
 	# Load the kernel module for the Amazon "Elastic Network Adapter"
 	echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf
 
+	# Use the "nda" driver for accessing NVMe disks rather than the
+	# historical "nvd" driver.
+	echo 'hw.nvme.use_nvd="0"' >> ${DESTDIR}/boot/loader.conf
+
 	# Disable ChallengeResponseAuthentication according to EC2
 	# requirements.
 	sed -i '' -e \