diff --git a/Makefile.release b/Makefile.release
index d580634..ef0d66b 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -85,3 +85,7 @@ config-release:
 
 	@# Disable UAS for release until it's ready. (#717633, #744099)
 	@perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
+
+	@perl -pi -e 's/CONFIG_SCHEDSTATS=y/# CONFIG_SCHEDSTATS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_LATENCYTOP=y/# CONFIG_LATENCYTOP is not set/' config-nodebug
+
diff --git a/config-debug b/config-debug
index 450c05f..fb7df3e 100644
--- a/config-debug
+++ b/config-debug
@@ -123,3 +123,5 @@ CONFIG_MAC80211_MESSAGE_TRACING=y
 CONFIG_EDAC_DEBUG=y
 
 CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
+CONFIG_LATENCYTOP=y
+CONFIG_SCHEDSTATS=y
diff --git a/config-generic b/config-generic
index 2fbeda4..341ef2b 100644
--- a/config-generic
+++ b/config-generic
@@ -4048,7 +4048,6 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_LATENCYTOP=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_DEBUG_VIRTUAL is not set
@@ -4221,7 +4220,6 @@ CONFIG_BACKLIGHT_LP855X=m
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
 
-CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
diff --git a/config-nodebug b/config-nodebug
index e61216b..5be9a94 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -125,3 +125,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_SPI_DEBUG is not set
 
 CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
+
+CONFIG_SCHEDSTATS=y
+CONFIG_LATENCYTOP=y
+
diff --git a/kernel.spec b/kernel.spec
index ca7f627..cc0867b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2264,6 +2264,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jul 12 2013 Dave Jones <davej@redhat.com> - 3.11.0-0.rc0.git6.4
+- Disable LATENCYTOP/SCHEDSTATS in non-debug builds.
+
 * Fri Jul 12 2013 Josh Boyer <jwboyer@redhat.com>
 - Add iwlwifi fix for connection issue (rhbz 885407)