diff --git a/modlists/base b/modlists/base
index e309164..5f79312 100644
--- a/modlists/base
+++ b/modlists/base
@@ -1,3 +1,4 @@
+bfq
 packages-base
 hostname
 sources
diff --git a/mods/bfq/data/etc/default/grub.d/bfq.cfg b/mods/bfq/data/etc/default/grub.d/bfq.cfg
new file mode 100644
index 0000000..147a9fd
--- /dev/null
+++ b/mods/bfq/data/etc/default/grub.d/bfq.cfg
@@ -0,0 +1 @@
+GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT scsi_mod.use_blk_mq=1"
diff --git a/mods/bfq/data/etc/udev/rules.d/60-bfq.rules b/mods/bfq/data/etc/udev/rules.d/60-bfq.rules
new file mode 100644
index 0000000..6b16a3c
--- /dev/null
+++ b/mods/bfq/data/etc/udev/rules.d/60-bfq.rules
@@ -0,0 +1 @@
+ACTION=="add|change", SUBSYSTEM=="block", DRIVERS=="sd|sr", ATTR{queue/scheduler}!="bfq", ATTR{queue/scheduler}="bfq"
\ No newline at end of file
diff --git a/mods/bfq/modscript b/mods/bfq/modscript
new file mode 100755
index 0000000..a456986
--- /dev/null
+++ b/mods/bfq/modscript
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "bfq" >>"$1/etc/modules"