diff --git a/config-local b/config-local
new file mode 100644
index 000000000..8c32be5be
--- /dev/null
+++ b/config-local
@@ -0,0 +1,2 @@
+# This file is intentionally left empty in the stock kernel. Its a nicety
+# added for those wanting to do custom rebuilds with altered config opts.
diff --git a/kernel.spec b/kernel.spec
index 2724d743d..43803731c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -548,6 +548,10 @@ Source90: config-sparc64-generic
 
 Source100: config-arm
 
+# This file is intentionally left empty in the stock kernel. Its a nicety
+# added for those wanting to do custom rebuilds with altered config opts.
+Source1000: config-local
+
 # Here should be only the patches up to the upstream canonical Linus tree.
 
 # For a stable release kernel
@@ -1201,6 +1205,14 @@ make -f %{SOURCE20} VERSION=%{version} configs
   done
 %endif
 
+# Merge in any user-provided local config option changes
+for i in %{all_arch_configs}
+do
+  mv $i $i.tmp
+  ./merge.pl %{SOURCE1000} $i.tmp > $i
+  rm $i.tmp
+done
+
 ApplyOptionalPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
@@ -2096,6 +2108,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jan 10 2011 Jarod Wilson <jarod@redhat.com>
+- Add support for local rebuild config option overrides
+
 * Mon Jan 10 2011 Chuck Ebbert <cebbert@redhat.com>
 - CVE-2010-4668: kernel panic with 0-length IOV