diff --git a/debian/changelog b/debian/changelog
index 0680d63d5..8479cc24d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ linux-2.6 (2.6.24~rc7-1~experimental.1) UNRELEASED; urgency=low
   * Add and enable at76.patch wireless driver for Atmel USB cards.
   * Add and enable ath5k.patch wireless driver for Atheros 5xxx cards.
   * Unify VLAN_8021Q setting, needed also on r5k-cobalt.
+  * Double max SERIAL_8250_NR_UARTS to 32. (closes: #440807)
 
   [ Bastian Blank ]
   * [amd64, i386]: Set kernel architecture to x86.
@@ -62,7 +63,7 @@ linux-2.6 (2.6.24~rc7-1~experimental.1) UNRELEASED; urgency=low
   [ Christian T. Steigies ]
   * [m68k]: Update patches from linux-m68k CVS
 
- -- maximilian attems <maks@debian.org>  Wed, 09 Jan 2008 00:34:19 +0100
+ -- maximilian attems <maks@debian.org>  Wed, 09 Jan 2008 17:17:56 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 362b84661..7878a8286 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -773,7 +773,7 @@ CONFIG_STALDRV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index b2b45357e..b4b859c82 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -720,7 +720,7 @@ CONFIG_STALDRV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge
index 65147c09c..cb500d95b 100644
--- a/debian/config/arm/config.footbridge
+++ b/debian/config/arm/config.footbridge
@@ -783,7 +783,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 9dd122e62..7339e8af5 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -408,7 +408,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 6a500cd7e..ed0a13c44 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -875,7 +875,7 @@ CONFIG_STALDRV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index d61a979af..70d1d361c 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -214,7 +214,7 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_ACPI=y
-CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index d21e9d300..ea12aa9d1 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -546,7 +546,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_CORE=y