diff --git a/buildroot b/buildroot
index 13f9e11..981d867 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 13f9e110cb6243092b25b95c870d3c88503e1aac
+Subproject commit 981d8677207653a5e4e665b0e30c8c893c5e70f2
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index d3ac61d..06fbd7c 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -20,6 +20,7 @@
 CONFIG_LOG_BUF_SHIFT=20
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_NVME=y
 # CONFIG_RD_GZIP is not set
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
diff --git a/openpower/package/petitboot/Config.in b/openpower/package/petitboot/Config.in
index b85618d..08801ec 100644
--- a/openpower/package/petitboot/Config.in
+++ b/openpower/package/petitboot/Config.in
@@ -12,6 +12,8 @@
 	select BR2_PACKAGE_POWERPC_UTILS if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 	# run-time dependency only
 	select BR2_PACKAGE_IPRUTILS if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
+	# run-time dependency only
+	select BR2_PACKAGE_NVME if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 	help
 	  Petitboot is a small kexec-based bootloader