diff --git a/fix-oldnoconfig-to-dtrt.patch b/fix-oldnoconfig-to-dtrt.patch
index 1c49bef6f..99b1022b6 100644
--- a/fix-oldnoconfig-to-dtrt.patch
+++ b/fix-oldnoconfig-to-dtrt.patch
@@ -1,29 +1,13 @@
-From 726a550e84ab288ddc8f0be7645997326884206e Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle@dreadnought.i.jkkm.org>
-Date: Tue, 17 Aug 2010 17:13:48 -0400
-Subject: fix oldnoconfig to do what i want
-
----
- scripts/kconfig/conf.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index 5b7c86e..dd09320 100644
+index 5b7c86e..7ef429c 100644
 --- a/scripts/kconfig/conf.c
 +++ b/scripts/kconfig/conf.c
-@@ -423,8 +423,10 @@ static void check_conf(struct menu *menu)
- 	if (sym && !sym_has_value(sym)) {
- 		if (sym_is_changable(sym) ||
- 		    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
--			if (input_mode == listnewconfig) {
--				if (sym->name && !sym_is_choice_value(sym)) {
-+			if (input_mode == listnewconfig ||
-+			    input_mode == oldnoconfig) {
-+				if (input_mode == listnewconfig &&
-+				    sym->name && !sym_is_choice_value(sym)) {
+@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu)
+ 				if (sym->name && !sym_is_choice_value(sym)) {
  					printf("CONFIG_%s\n", sym->name);
  				}
- 			} else {
--- 
-1.7.2.1
-
+-			} else {
++			} else if (input_mode != oldnoconfig) {
+ 				if (!conf_cnt++)
+ 					printf(_("*\n* Restart config...\n*\n"));
+ 				rootEntry = menu_get_parent_menu(menu);
diff --git a/kernel.spec b/kernel.spec
index 3873b6d34..0499699b8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 3
+%global baserelease 4
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -1297,6 +1297,7 @@ do
   fi
 %endif
   rm -f .newoptions
+  make ARCH=$Arch oldnoconfig
   echo "# $Arch" > configs/$i
   cat .config >> configs/$i
 done
@@ -1864,6 +1865,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Thu Aug 19 2010 Kyle McMartin <kmcmartin@redhat.com> - 2.6.36-0.4.rc1.git1
+- Run oldnoconfig on the configs during make prep.
+- Make the fix oldnoconfig patch a one liner.
+
 * Wed Aug 18 2010 Chuck Ebbert <cebbert@redhat.com> - 2.6.36-0.3.rc1.git1
 - Fix hangs on boot with some AMD processors
   (x86-cpu-fix-regression-in-amd-errata-checking-code.patch)