diff --git a/config-x86-generic b/config-x86-generic
index e920346f5..d3fe36502 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -34,7 +34,7 @@ CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
 
 CONFIG_EFI=y
-# CONFIG_EFI_STUB is not set
+CONFIG_EFI_STUB=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
diff --git a/kernel.spec b/kernel.spec
index d9f072d2d..5f324c66e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2274,6 +2274,7 @@ fi
 %changelog
 * Thu Jan 26 2012 Josh Boyer <jwboyer@redhat.com>
 - Drop revert-efi-rtclock.patch.  Issue was fixed by upstream commit 47997d75
+- Enable CONFIG_EFI_STUB per Matthew Garrett
 
 * Wed Jan 25 2012 Peter Robinson <pbrobinson@fedoraproject.org>
 - Build perf/tools on ARM sfp/hfp not just sfp