diff --git a/debian/changelog b/debian/changelog
index 82a48d6b6..6baa8fccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,7 @@ linux-2.6 (2.6.30-1~experimental.1) UNRELEASED; urgency=low
   * Centralize Power Management options.
   * Centralize CPU Frequency scaling options.
   * [sparc] Enable CPU Frequency scaling.
+  * Enable Network console logging support.
 
   [ dann frazier ]
   * Enable bnx2x, using firmware-split patches from net-next and mirroring
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 407d0b94f..7984f1362 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -725,7 +725,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 CONFIG_NETPOLL_TRAP=y
 
 ##
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 70621e0c4..837bc80e6 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -692,7 +692,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge
index 703bf2dc6..a15ee6690 100644
--- a/debian/config/arm/config.footbridge
+++ b/debian/config/arm/config.footbridge
@@ -645,7 +645,6 @@ CONFIG_NE2K_PCI=m
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx
index 4e1dad8f7..6464ec7b4 100644
--- a/debian/config/arm/config.ixp4xx
+++ b/debian/config/arm/config.ixp4xx
@@ -489,7 +489,6 @@ CONFIG_ENC28J60=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x
index 79f780bf1..54a9ec60e 100644
--- a/debian/config/arm/config.orion5x
+++ b/debian/config/arm/config.orion5x
@@ -327,7 +327,6 @@ CONFIG_MV643XX_ETH=m
 # CONFIG_ATL1 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_BNX2X is not set
-CONFIG_NETCONSOLE=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile
index 9c6ffb1f3..0359fe676 100644
--- a/debian/config/arm/config.versatile
+++ b/debian/config/arm/config.versatile
@@ -280,8 +280,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-# CONFIG_NETCONSOLE_DYNAMIC is not set
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index f25186f78..862625214 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -344,7 +344,6 @@ CONFIG_MV643XX_ETH=m
 # CONFIG_ATL1 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_BNX2X is not set
-CONFIG_NETCONSOLE=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
diff --git a/debian/config/config b/debian/config/config
index e18939e54..7e7f19e30 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1339,6 +1339,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VIRTIO_NET=m
 
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index a90e045fe..43c7e73d2 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -293,7 +293,6 @@ CONFIG_VIA_RHINE=m
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m
 # CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index b6d812a07..22a4a3f9e 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -811,7 +811,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 3338527e2..d09d83067 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -436,7 +436,6 @@ CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index c5d21f7ce..9eafd165d 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -113,7 +113,6 @@ CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 CONFIG_EQUALIZER=m
 # CONFIG_TUN is not set
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index 1955d2d4c..97a06aa0a 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -896,7 +896,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index f88623834..16991a433 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -1105,7 +1105,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a
index e1724a053..edde4f6ba 100644
--- a/debian/config/mips/config.sb1-bcm91250a
+++ b/debian/config/mips/config.sb1-bcm91250a
@@ -520,7 +520,6 @@ CONFIG_SB1250_MAC=y
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
-# CONFIG_NETCONSOLE is not set
 
 ##
 ## file: drivers/net/appletalk/Kconfig
diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b
index 44019ee08..a1201287f 100644
--- a/debian/config/mips/config.sb1a-bcm91480b
+++ b/debian/config/mips/config.sb1a-bcm91480b
@@ -550,7 +550,6 @@ CONFIG_SB1250_MAC=y
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
-# CONFIG_NETCONSOLE is not set
 
 ##
 ## file: drivers/net/appletalk/Kconfig
diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta
index 9edb369ce..b3af1ed7a 100644
--- a/debian/config/mipsel/config.4kc-malta
+++ b/debian/config/mipsel/config.4kc-malta
@@ -895,7 +895,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta
index 1cc97eeca..4b2819094 100644
--- a/debian/config/mipsel/config.5kc-malta
+++ b/debian/config/mipsel/config.5kc-malta
@@ -1105,7 +1105,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt
index a645cac1a..7d9c50294 100644
--- a/debian/config/mipsel/config.r5k-cobalt
+++ b/debian/config/mipsel/config.r5k-cobalt
@@ -512,7 +512,6 @@ CONFIG_VIA_RHINE=m
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m
 # CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##
diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a
index 3fbccb22f..6c0e1ef69 100644
--- a/debian/config/mipsel/config.sb1-bcm91250a
+++ b/debian/config/mipsel/config.sb1-bcm91250a
@@ -520,7 +520,6 @@ CONFIG_SB1250_MAC=y
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
-# CONFIG_NETCONSOLE is not set
 
 ##
 ## file: drivers/net/appletalk/Kconfig
diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b
index 43ca1d3eb..903ebd5bc 100644
--- a/debian/config/mipsel/config.sb1a-bcm91480b
+++ b/debian/config/mipsel/config.sb1a-bcm91480b
@@ -549,7 +549,6 @@ CONFIG_SB1250_MAC=y
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
 # CONFIG_NET_FC is not set
-# CONFIG_NETCONSOLE is not set
 
 ##
 ## file: drivers/net/appletalk/Kconfig
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index 6c53861a7..fe6c5cbef 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -516,7 +516,6 @@ CONFIG_SKFP=m
 CONFIG_HIPPI=y
 # CONFIG_ROADRUNNER is not set
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 CONFIG_NETPOLL_TRAP=y
 
 ##
diff --git a/debian/config/s390/config b/debian/config/s390/config
index 4f1ccce69..15c62d91e 100644
--- a/debian/config/s390/config
+++ b/debian/config/s390/config
@@ -66,7 +66,6 @@ CONFIG_S390_PRNG=m
 # CONFIG_DUMMY is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-# CONFIG_NETCONSOLE is not set
 
 ##
 ## file: drivers/net/appletalk/Kconfig
diff --git a/debian/config/sparc/config b/debian/config/sparc/config
index 8c182833c..60dd0c3ab 100644
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@@ -127,7 +127,6 @@ CONFIG_MYRI_SBUS=m
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
-CONFIG_NETCONSOLE=m
 # CONFIG_NETPOLL_TRAP is not set
 
 ##