diff --git a/debian/changelog b/debian/changelog
index 0798d8fa3..1f74eb4ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ linux (4.17~rc4-1~exp1) UNRELEASED; urgency=medium
     DMA_VIRT_OPS
   * rtl8192se: Fix warning introduced by "firmware: Remove redundant log
     messages from drivers"
+  * SCSI: Enable SCSI_MQ_DEFAULT. This can be reverted using the kernel
+    parameter: scsi_mod.use_blk_mq=n
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 02 May 2018 12:59:01 +0100
 
diff --git a/debian/config/config b/debian/config/config
index a437bcfa7..02212a724 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4217,6 +4217,7 @@ CONFIG_RTC_DRV_AB3100=m
 ##
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
+CONFIG_SCSI_MQ_DEFAULT=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m