diff --git a/config-generic b/config-generic
index 4afa51a..6c775dc 100644
--- a/config-generic
+++ b/config-generic
@@ -1393,7 +1393,10 @@ CONFIG_IPPP_FILTER=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPPOE=m
 CONFIG_PPP_MPPE=m
-# CONFIG_SLIP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
 # Wireless LAN
diff --git a/kernel.spec b/kernel.spec
index faa105d..6b60133 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2421,6 +2421,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Thu May 03 2012 Justin M. Forbes <jforbes@redhat.com>
+- Reenable slip and add to module-extras (rhbz 818308)
+
 * Wed May 02 2012 Josh Boyer <jwboyer@redhat.com>
 - Disable PCIEPORTBUS on ppc64 per IBM request
 
diff --git a/mod-extra.list b/mod-extra.list
index 7176a73..a996033 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -175,3 +175,4 @@ tpm_atmel.ko
 tpm_infineon.ko
 tpm_nsc.ko
 tpm_tis.ko
+slip.ko