diff --git a/config-x86-generic b/config-x86-generic
index ac134cfed..eb2b15a49 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -40,10 +40,10 @@ CONFIG_X86_PM_TIMER=y
 
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-CONFIG_EFI_VARS=y
+# CONFIG_EFI_VARS is not set
 CONFIG_EFIVAR_FS=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS_PSTORE is not set
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
 CONFIG_EARLY_PRINTK_EFI=y
diff --git a/kernel.spec b/kernel.spec
index c699b7fa5..fc1a62a54 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2252,6 +2252,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Aug 21 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable EFI_VARS (rhbz 1252137)
+
 * Thu Aug 20 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - Fix incorrect ext4 freezing behavior on non-journaled fs (rhbz 1250717)