diff --git a/debian/changelog b/debian/changelog
index fada9fbf4..4d2afee66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,6 +100,8 @@ linux (4.0.4-1) UNRELEASED; urgency=medium
   * [x86] vmwgfx: Enable DRM_VMWGFX_FBCON (Closes: #714929)
   * media: Enable DVB_SMIPCIE as module (Closes: #785153)
   * Bump ABI to 2
+  * [x86] i2c: Change I2C to built-in and enable ACPI_I2C_OPREGION
+    (Closes: #778896)
 
   [ Ian Campbell ]
   * [armhf+arm64] Enabled generic SYSCON regmap reset driver
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index cffab3bf5..f6c91cba5 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -584,7 +584,8 @@ CONFIG_SENSORS_ACPI_POWER=m
 ##
 ## file: drivers/i2c/Kconfig
 ##
-CONFIG_I2C=m
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set