diff --git a/config-generic b/config-generic
index 121a6b422..9b63e75f9 100644
--- a/config-generic
+++ b/config-generic
@@ -2419,7 +2419,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_STUB_POULSBO is not set
 
 CONFIG_DRM=m
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_AST=m  # do not enable on f17 or older
 CONFIG_DRM_CIRRUS_QEMU=m  # do not enable on f17 or older
 # CONFIG_DRM_TDFX is not set
diff --git a/kernel.spec b/kernel.spec
index 82f09befc..8e83ca9e3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2321,6 +2321,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Sep 14 2012 Dave Jones <davej@redhat.com>
+- Enable CONFIG_DRM_LOAD_EDID_FIRMWARE (rhbz 857511)
+
 * Fri Sep 14 2012 Dave Jones <davej@redhat.com>
 - Reenable UBIFS (rhbz 823238)