diff --git a/debian/changelog b/debian/changelog
index 4e6c14538..485940b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 linux (3.8-1~experimental.2) UNRELEASED; urgency=low
 
+  [ Ben Hutchings ]
   * linux-image: Increase minimum version of initramfs-tools to 0.110~
     which copes with the recently renamed EHCI and NFS modules
 
+  [ Aurelien Jarno ]
+  * [mips/octeon] Change HW_RANDOM and HW_RANDOM_OCTEON to modules.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 01 Mar 2013 14:01:07 +0000
 
 linux (3.8-1~experimental.1) experimental; urgency=low
diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon
index 23c8d005f..b2eb50874 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@@ -38,8 +38,8 @@ CONFIG_PATA_OCTEON_CF=y
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_OCTEON=y
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_OCTEON=m
 
 ##
 ## file: drivers/i2c/Kconfig