diff --git a/debian/changelog b/debian/changelog
index 3d0797178..fc3c74667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -157,6 +157,14 @@ linux (3.14.6-1) UNRELEASED; urgency=medium
   * [arm64] Update modules included in installer udebs.
   * Include virtio_mmio in virtio-modules udeb when available.
 
+  [ Aurelien Jarno ]
+  * topconfig: Enable modular HW_RANDOM.
+  * [kernelarch-powerpc] Remove HW_RANDOM.
+  * [kernelarch-x86] Remove HW_RANDOM.
+  * [mips/4kc-malta] Remove HW_RANDOM.
+  * [mips/5kc-malta] Remove HW_RANDOM.
+  * [mips/octeon] Remove HW_RANDOM.
+
  -- Ian Campbell <ijc@hellion.org.uk>  Fri, 06 Jun 2014 18:18:41 +0100
 
 linux (3.14.5-1) unstable; urgency=high
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index f9d65d975..6a9893c79 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -138,7 +138,6 @@ CONFIG_OMAP_INTERCONNECT=m
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_OMAP=m
 
 ##
diff --git a/debian/config/config b/debian/config/config
index 509bd4813..6e3613c94 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -335,7 +335,7 @@ CONFIG_TELCLOCK=m
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_TPM=m
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index 269ddb03c..eef104518 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -90,7 +90,6 @@ CONFIG_BLK_DEV_RSXX=m
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_PASEMI=m
 
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 234d65d08..812a5398e 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -310,7 +310,6 @@ CONFIG_AGP_VIA=y
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index 3410aace9..b3cc474d3 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -166,11 +166,6 @@ CONFIG_PPDEV=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
 
-##
-## file: drivers/char/hw_random/Kconfig
-##
-CONFIG_HW_RANDOM=m
-
 ##
 ## file: drivers/char/ipmi/Kconfig
 ##
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 83a35a092..70bda5b9d 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -169,11 +169,6 @@ CONFIG_PPDEV=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
 
-##
-## file: drivers/char/hw_random/Kconfig
-##
-CONFIG_HW_RANDOM=m
-
 ##
 ## file: drivers/char/ipmi/Kconfig
 ##
diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon
index da9b9f1f9..f0273903f 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@@ -37,7 +37,6 @@ CONFIG_PATA_OCTEON_CF=y
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_OCTEON=m
 
 ##