diff --git a/debian/changelog b/debian/changelog
index 95b293cf1..50375202f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ linux (3.6.6-1~experimental.2) UNRELEASED; urgency=low
   * fs: Re-enable link security restrictions that are disabled by default
     in 3.6.5
   * [rt] bump to 3.6.5-rt15
+  * rc: Enable RC_DEVICES; re-enable LIRC; re-enable the drivers that
+    depend on those; enable IR_SANYO_DECODER and IR_IGUANA as modules
 
  -- Uwe Kleine-König <uwe@kleine-koenig.org>  Mon, 29 Oct 2012 15:50:12 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 7e55b3e44..a48fcd794 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1162,6 +1162,8 @@ CONFIG_I2C_SI470X=y
 ##
 ## file: drivers/media/rc/Kconfig
 ##
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
@@ -1169,7 +1171,9 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -1177,6 +1181,7 @@ CONFIG_IR_MCEUSB=m
 # CONFIG_IR_NUVOTON is not set
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGUANA=m
 CONFIG_RC_LOOPBACK=m
 
 ##