diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config
index fbad37804..a841563e8 100644
--- a/debian/arch/alpha/config
+++ b/debian/arch/alpha/config
@@ -898,7 +898,7 @@ CONFIG_STALDRV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config
index ee1c8b235..5e03ed4ac 100644
--- a/debian/arch/amd64/config
+++ b/debian/arch/amd64/config
@@ -834,7 +834,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=4
+CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config
index 2999680f8..38315aa7e 100644
--- a/debian/arch/hppa/config
+++ b/debian/arch/hppa/config
@@ -501,7 +501,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index 758974ca4..7daf9f62a 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -1001,7 +1001,7 @@ CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_8250_PNP=m
 CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config
index 8197899a2..b31f95ee7 100644
--- a/debian/arch/ia64/config
+++ b/debian/arch/ia64/config
@@ -674,7 +674,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=4
+CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config
index 4b8bf0ced..0b9c60d6c 100644
--- a/debian/arch/powerpc/config
+++ b/debian/arch/powerpc/config
@@ -658,7 +658,7 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_CORE=y
diff --git a/debian/changelog b/debian/changelog
index d22611138..ea5896fa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,11 +35,13 @@ linux-2.6 (2.6.17-3) UNRELEASED; urgency=low
     AMD 768 erratum 10, it was solved in 2.6.12. Add wording corrections.
   * Add 686-bigmem flavour with CONFIG_HIGHMEM64G=y and CONFIG_X86_PAE=y.
     Set deadline as default iosched and CONFIG_NR_CPUS=32. (closes: 295680)
+  * Set CONFIG_SERIAL_8250_RN_UARTS=16 for all archs beside mips/m68k unless
+    explicitly set on a specific value. (closes: 377151)
 
   [ Sven Luther ]
   * Re-enabled fs-asfs patch.
 
- -- maximilian attems <maks@sternwelten.at>  Fri,  7 Jul 2006 02:03:12 +0200
+ -- maximilian attems <maks@sternwelten.at>  Fri,  7 Jul 2006 12:37:43 +0200
 
 linux-2.6 (2.6.17-2) unstable; urgency=low