diff --git a/debian/changelog b/debian/changelog
index 16ae2481d..d74e4fb1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -139,6 +139,7 @@ linux (3.12.8-1) UNRELEASED; urgency=low
     as module (Closes: #735870)
   * [x86] brcm80211: Enable BRCMFMAC as module, and BRCMFMAC_SDIO
     (Closes: #735245)
+  * [x86] staging: lustre: Make LUSTRE_LLITE_LLOOP tristate
 
   [ Ian Campbell ]
   * [armel/kirkwood] Fix interrupt handling on non-DT platforms (Closes: #735172)
diff --git a/debian/patches/bugfix/all/staging-lustre-Make-LUSTRE_LLITE_LLOOP-tristate.patch b/debian/patches/bugfix/all/staging-lustre-Make-LUSTRE_LLITE_LLOOP-tristate.patch
new file mode 100644
index 000000000..c0870bb38
--- /dev/null
+++ b/debian/patches/bugfix/all/staging-lustre-Make-LUSTRE_LLITE_LLOOP-tristate.patch
@@ -0,0 +1,25 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 29 Dec 2013 23:20:30 +0100
+Subject: staging: lustre: Make LUSTRE_LLITE_LLOOP tristate
+Forwarded: http://mid.gmane.org/1388356095.2900.34.camel@deadeye.wl.decadent.org.uk
+
+There seems to be no reason why it can't be a module; in fact that is
+currently supposed to be the default.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/staging/lustre/lustre/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/lustre/lustre/Kconfig b/drivers/staging/lustre/lustre/Kconfig
+index 2156a44..faa01fa 100644
+--- a/drivers/staging/lustre/lustre/Kconfig
++++ b/drivers/staging/lustre/lustre/Kconfig
+@@ -55,6 +55,6 @@ config LUSTRE_TRANSLATE_ERRNOS
+ 	default y
+ 
+ config LUSTRE_LLITE_LLOOP
+-	bool "Lustre virtual block device"
++	tristate "Lustre virtual block device"
+ 	depends on LUSTRE_FS && BLOCK
+ 	default m
diff --git a/debian/patches/series b/debian/patches/series
index feadb6b93..6b45c4085 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -88,3 +88,4 @@ debian/mm-avoid-abi-change-in-3.12.7.patch
 debian/net-avoid-abi-change-in-3.12.7.patch
 debian/mm-migrate-avoid-abi-change-in-3.12.7.patch
 debian/revert-net-unix-allow-set_peek_off-to-fail.patch
+bugfix/all/staging-lustre-Make-LUSTRE_LLITE_LLOOP-tristate.patch