diff --git a/kernel.spec b/kernel.spec
index f563d95a0..7acce7119 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,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
@@ -2205,6 +2205,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Nov 21 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Move TPM drivers to main kernel package (rhbz 1164937)
+
 * Wed Nov 19 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Disable SERIAL_8250 on s390x (rhbz 1158848)
 
diff --git a/mod-extra.list b/mod-extra.list
index 2803a4325..6e980f6aa 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -164,10 +164,6 @@ ksdazzle-sir.ko
 ma600-sir.ko
 mcp2120-sir.ko
 toim3232-sir.ko
-tpm_atmel.ko
-tpm_infineon.ko
-tpm_nsc.ko
-tpm_tis.ko
 slip.ko
 nilfs2.ko
 batman-adv.ko