diff --git a/debian/changelog b/debian/changelog
index 2b0a9f98d..a15de1d86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ linux (4.12.6-1) UNRELEASED; urgency=medium
     (Closes: #869565)
   * [x86] sound: Enable SND_X86; enable HDMI_LPE_AUDIO as module
     (Closes: #869372)
+  * blk-mq: Change MQ_IOSCHED_KYBER from built-in to module
 
   [ Salvatore Bonaccorso ]
   * packet: fix tp_reserve race in packet_set_ring (CVE-2017-1000111)
diff --git a/debian/config/config b/debian/config/config
index 0289bdafe..da4aeff7d 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -36,6 +36,8 @@ CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 ## end choice
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
 
 ##
 ## file: block/partitions/Kconfig