diff --git a/debian/changelog b/debian/changelog
index 698c80390..4dd6830e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux-2.6 (2.6.39~rc6-1~experimental.1) UNRELEASED; urgency=low
   [ Aurelien Jarno ]
   * drm/nouveau, drm/radeon: remove fix for non-powerpc/sparc/x86.
   * [mips,mipsel] Disabled CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS.
+  * [mips/octeon] Disabled CONFIG_HOTPLUG_CPU and CONFIG_PM.
 
  -- maximilian attems <maks@debian.org>  Tue, 01 May 2011 14:36:33 +0100
 
diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon
index 02b232b01..151070363 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@@ -13,6 +13,7 @@ CONFIG_PCI=y
 CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
+# CONFIG_HOTPLUG_CPU is not set
 
 ##
 ## file: arch/mips/cavium-octeon/Kconfig
@@ -120,6 +121,11 @@ CONFIG_EXT2_FS=y
 ##
 CONFIG_EXT3_FS=y
 
+##
+## file: kernel/power/Kconfig
+##
+# CONFIG_PM is not set
+
 ##
 ## file: mm/Kconfig
 ##