diff --git a/kernel.spec b/kernel.spec
index b410d04..d38e89f 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 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2292,6 +2292,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Jul 05 2012 Josh Boyer <jwboyer@redhat.com>
+- Move sch_htb module into main kernel package (rhbz 836185)
+
 * Thu Jul 05 2012 Dennis Gilmore <dennis@ausil.us>
 - enable cpu frequency scaling on omap systems
 
diff --git a/mod-extra.list b/mod-extra.list
index d4aefed..b046aff 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -46,7 +46,6 @@ sch_drr.ko
 sch_dsmark.ko
 sch_gred.ko
 sch_hfsc.ko
-sch_htb.ko
 sch_ingress.ko
 sch_mqprio.ko
 sch_multiq.ko