diff --git a/device.go b/device.go
index f748f375c9..10f889eed9 100644
--- a/device.go
+++ b/device.go
@@ -27,6 +27,7 @@ const (
 	driver9pType        = "9p"
 	driverBlkType       = "blk"
 	driverSCSIType      = "scsi"
+	driverNvdimmType    = "nvdimm"
 	driverEphemeralType = "ephemeral"
 )
 
@@ -58,8 +59,9 @@ var (
 type deviceHandler func(device pb.Device, spec *pb.Spec, s *sandbox) error
 
 var deviceHandlerList = map[string]deviceHandler{
-	driverBlkType:  virtioBlkDeviceHandler,
-	driverSCSIType: virtioSCSIDeviceHandler,
+	driverBlkType:    virtioBlkDeviceHandler,
+	driverSCSIType:   virtioSCSIDeviceHandler,
+	driverNvdimmType: nvdimmDeviceHandler,
 }
 
 func rescanPciBus() error {
@@ -192,6 +194,10 @@ func virtioSCSIDeviceHandler(device pb.Device, spec *pb.Spec, s *sandbox) error
 	return updateSpecDeviceList(device, spec)
 }
 
+func nvdimmDeviceHandler(device pb.Device, spec *pb.Spec, s *sandbox) error {
+	return updateSpecDeviceList(device, spec)
+}
+
 // updateSpecDeviceList takes a device description provided by the caller,
 // trying to find it on the guest. Once this device has been identified, the
 // "real" information that can be read from inside the VM is used to update