diff --git a/config-generic b/config-generic
index 34cbf5e77..0e5b3b903 100644
--- a/config-generic
+++ b/config-generic
@@ -299,7 +299,7 @@ CONFIG_VMXNET3=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VHOST_NET=m
-# CONFIG_TCM_VHOST is not set
+CONFIG_TCM_VHOST=m
 
 #
 # SCSI device support
diff --git a/kernel.spec b/kernel.spec
index 14e7a9efe..d5508c9f3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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 4
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2309,6 +2309,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Wed Oct 17 2012 Josh Boyer <jwboyer@redhat.com>
+- Enable TCM_VHOST module (rhbz 866984)
+
 * Mon Oct 15 2012 Mauro Carvalho Chehab <mchehab@redhat.com> - 3.6.2-4
 - Fix i82975x_edac driver by rewriting most of the logic there