diff --git a/boards/winterfell.config b/boards/winterfell.config
index f93d2e75..fb2cb05c 100644
--- a/boards/winterfell.config
+++ b/boards/winterfell.config
@@ -35,6 +35,7 @@ CONFIG_LINUX_MLX4=y
 CONFIG_LINUX_ATA=y
 CONFIG_LINUX_AHCI=y
 CONFIG_LINUX_E1000E=y
+CONFIG_LINUX_NVME=y
 
 CONFIG_BOOTSCRIPT=/bin/generic-init
 
diff --git a/config/linux-linuxboot.config b/config/linux-linuxboot.config
index ab359f6c..58fead68 100644
--- a/config/linux-linuxboot.config
+++ b/config/linux-linuxboot.config
@@ -809,7 +809,9 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+# CONFIG_BLK_DEV_NVME_SCSI is not set
 # CONFIG_NVME_TARGET is not set
 
 #
diff --git a/modules/linux b/modules/linux
index 5adfe512..7c139f9b 100644
--- a/modules/linux
+++ b/modules/linux
@@ -73,6 +73,10 @@ linux_modules-$(CONFIG_LINUX_USB)	+= drivers/usb/host/xhci-hcd.ko
 linux_modules-$(CONFIG_LINUX_USB)	+= drivers/usb/host/xhci-pci.ko
 linux_modules-$(CONFIG_LINUX_USB)	+= drivers/usb/storage/usb-storage.ko
 
+# NVMe driver for winterfell and other servers
+linux_modules-$(CONFIG_LINUX_NVME)	+= drivers/nvme/host/nvme.ko
+linux_modules-$(CONFIG_LINUX_NVME)	+= drivers/nvme/host/nvme-core.ko
+
 EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches
 
 linux_target := \