diff --git a/debian/changelog b/debian/changelog
index 082500d8f..921f4786c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ linux (3.12.2-1~exp1) UNRELEASED; urgency=low
   [ Ian Campbell ]
   * [armhf]: Enable AHCI_IMX in armmp+lpae flavours.
 
+  [ Aurelien Jarno ]
+  * [mips/octeon] Add kernel udebs.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 22 Nov 2013 00:41:09 +0000
 
 linux (3.12-1~exp1) experimental; urgency=low
diff --git a/debian/installer/mips/kernel-versions b/debian/installer/mips/kernel-versions
index 8267e14a5..ac007d3d5 100644
--- a/debian/installer/mips/kernel-versions
+++ b/debian/installer/mips/kernel-versions
@@ -3,3 +3,4 @@ mips   -       sb1-bcm91250a -             y      -
 mips   -       r4k-ip22      -             y      -
 mips   -       r5k-ip32      -             y      -
 mips   -       4kc-malta     -             y      -
+mips   -       octeon        -             y      -
diff --git a/debian/installer/mips/modules/mips-octeon/btrfs-modules b/debian/installer/mips/modules/mips-octeon/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/cdrom-core-modules b/debian/installer/mips/modules/mips-octeon/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/crc-modules b/debian/installer/mips/modules/mips-octeon/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/crypto-dm-modules b/debian/installer/mips/modules/mips-octeon/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/crypto-modules b/debian/installer/mips/modules/mips-octeon/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/fat-modules b/debian/installer/mips/modules/mips-octeon/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/fuse-modules b/debian/installer/mips/modules/mips-octeon/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/input-modules b/debian/installer/mips/modules/mips-octeon/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/isofs-modules b/debian/installer/mips/modules/mips-octeon/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/jfs-modules b/debian/installer/mips/modules/mips-octeon/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/kernel-image b/debian/installer/mips/modules/mips-octeon/kernel-image
new file mode 100644
index 000000000..1bb8bf6d7
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/kernel-image
@@ -0,0 +1 @@
+# empty
diff --git a/debian/installer/mips/modules/mips-octeon/loop-modules b/debian/installer/mips/modules/mips-octeon/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/md-modules b/debian/installer/mips/modules/mips-octeon/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/multipath-modules b/debian/installer/mips/modules/mips-octeon/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/nbd-modules b/debian/installer/mips/modules/mips-octeon/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/nic-shared-modules b/debian/installer/mips/modules/mips-octeon/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/ppp-modules b/debian/installer/mips/modules/mips-octeon/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/rtc-modules b/debian/installer/mips/modules/mips-octeon/rtc-modules
new file mode 100644
index 000000000..e20e792f2
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/rtc-modules
@@ -0,0 +1 @@
+#include <rtc-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/sata-modules b/debian/installer/mips/modules/mips-octeon/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/scsi-common-modules b/debian/installer/mips/modules/mips-octeon/scsi-common-modules
new file mode 100644
index 000000000..609f0f620
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/scsi-common-modules
@@ -0,0 +1,4 @@
+aic79xx
+BusLogic ?
+sym53c8xx ?
+sym53c8xx_2 ?
diff --git a/debian/installer/mips/modules/mips-octeon/scsi-core-modules b/debian/installer/mips/modules/mips-octeon/scsi-core-modules
new file mode 100644
index 000000000..1fde8eedc
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/scsi-core-modules
@@ -0,0 +1 @@
+scsi_dh
diff --git a/debian/installer/mips/modules/mips-octeon/scsi-modules b/debian/installer/mips/modules/mips-octeon/scsi-modules
new file mode 100644
index 000000000..8e5723c14
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/scsi-modules
@@ -0,0 +1,9 @@
+3w-9xxx
+3w-xxxx
+aacraid
+atp870u ?
+ch
+iscsi_tcp
+lpfc
+qla2xxx
+sg
diff --git a/debian/installer/mips/modules/mips-octeon/squashfs-modules b/debian/installer/mips/modules/mips-octeon/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/udf-modules b/debian/installer/mips/modules/mips-octeon/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/usb-modules b/debian/installer/mips/modules/mips-octeon/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/usb-storage b/debian/installer/mips/modules/mips-octeon/usb-storage
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/usb-storage
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/usb-storage-modules b/debian/installer/mips/modules/mips-octeon/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/xfs-modules b/debian/installer/mips/modules/mips-octeon/xfs-modules
new file mode 100644
index 000000000..98374e2bb
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/xfs-modules
@@ -0,0 +1 @@
+#include <xfs-modules>
diff --git a/debian/installer/mips/modules/mips-octeon/zlib-modules b/debian/installer/mips/modules/mips-octeon/zlib-modules
new file mode 100644
index 000000000..e02ad64bf
--- /dev/null
+++ b/debian/installer/mips/modules/mips-octeon/zlib-modules
@@ -0,0 +1 @@
+#include <zlib-modules>
diff --git a/debian/installer/mips/package-list b/debian/installer/mips/package-list
index 8cb98eb65..0bab67d91 100644
--- a/debian/installer/mips/package-list
+++ b/debian/installer/mips/package-list
@@ -7,3 +7,4 @@ Package: kernel-image
 Provides: ext2-modules, ext3-modules, ext4-modules, rtc-modules
 Provides_4kc-malta: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules
 Provides_sb1-bcm91250a: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules
+Provides_octeon: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules