diff --git a/config-generic b/config-generic
index 6b1c651df..4022d3e5f 100644
--- a/config-generic
+++ b/config-generic
@@ -2984,7 +2984,7 @@ CONFIG_USB_HID=y
 
 CONFIG_HID_SUPPORT=y
 
-CONFIG_HID=m
+CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 # debugging default is y upstream now
 CONFIG_HIDRAW=y
@@ -3050,7 +3050,7 @@ CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_KYE=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_TIVO=m
-CONFIG_HID_GENERIC=m
+CONFIG_HID_GENERIC=y
 CONFIG_HID_AUREAL=m
 
 
diff --git a/kernel.spec b/kernel.spec
index c2766915f..f370b1e47 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
@@ -2300,6 +2300,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jul 13 2012 Josh Boyer <jwboyer@redhat.com>
+- Build CONFIG_HID and CONFIG_HID_GENERIC in
+
 * Thu Jul 12 2012 Justin M. Forbes <jforbes@redhat.com> - 3.5.0-0.rc6.git3.1
 - Linux v3.5-rc6-117-g918227b