diff --git a/debian/changelog b/debian/changelog
index 6c82578ed..e70519792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,8 @@ linux (3.12.8-1) UNRELEASED; urgency=low
     - rcutree/rcu_bh_qs: disable irq while calling rcu_preempt_qs()
   * Revert "net: unix: allow set_peek_off to fail", included in 3.12.8,
     as it would cause an ABI change
+  * media: Enable VIDEO_STK1160_COMMON (new dependency of VIDEO_STK1160)
+    as module (Closes: #735870)
 
   [ Ian Campbell ]
   * [armel/kirkwood] Fix interrupt handling on non-DT platforms (Closes: #735172)
diff --git a/debian/config/config b/debian/config/config
index cf6f59c03..829dd3be7 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1747,6 +1747,7 @@ CONFIG_USB_SN9C102=m
 ##
 ## file: drivers/media/usb/stk1160/Kconfig
 ##
+CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_STK1160_AC97=y