diff --git a/config-x86-generic b/config-x86-generic
index 17b96c7da..98385cf05 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -144,7 +144,8 @@ CONFIG_IPW2200_QOS=y
 CONFIG_BLK_DEV_AMD74XX=y
 
 # I2C_ACPI casues I2C to be built in.  This should probably be fixed.
-CONFIG_I2C_ACPI=y
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
diff --git a/kernel.spec b/kernel.spec
index f33fd7247..ac492fe87 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2219,6 +2219,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable ACPI_I2C_OPREGION
+
 * Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git3.1
 - Linux v3.17-rc4-168-g7ec62d421bdf
 - Add support for touchpad in Asus X450 and X550 (rhbz 1110011)