diff --git a/config-generic b/config-generic
index 9c722719f..779415bcc 100644
--- a/config-generic
+++ b/config-generic
@@ -3292,7 +3292,7 @@ CONFIG_USB_USS720=m
 #
 # USB Serial Converter support
 #
-CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -3358,6 +3358,8 @@ CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_SAMBA=m
 
+CONFIG_USB_SERIAL_CONSOLE=y
+
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
 CONFIG_USB_LED=m
diff --git a/kernel.spec b/kernel.spec
index dcd1fa9f3..a8cb14b15 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1941,6 +1941,10 @@ fi
 # and build.
 
 %changelog
+* Tue Apr 19 2011 Dave Jones <davej@redhat.com>
+- Build USB_SERIAL in instead of modular.
+  Enable USB_SERIAL_CONSOLE.
+
 * Wed Apr 13 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc3.git2.0
 - Update to snapshot 2.6.39-rc3-git2