diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c
index dd026db..6ea0d19 100644
--- a/arch/ppc/qemu/init.c
+++ b/arch/ppc/qemu/init.c
@@ -148,7 +148,7 @@ entry( void )
 
 	isa_io_base = arch->io_base;
 
-	uart_init(0x80013000ULL + CONFIG_SERIAL_PORT * 0x20,
+	uart_init(0x80013000ULL + (CONFIG_SERIAL_PORT ? 0 : 0x20),
 		  CONFIG_SERIAL_SPEED);
 
 	printk("\n");
diff --git a/drivers/escc.c b/drivers/escc.c
index a426bcc..6da9a8f 100644
--- a/drivers/escc.c
+++ b/drivers/escc.c
@@ -443,6 +443,6 @@ escc_init(const char *path, unsigned long addr)
     escc_add_channel(buf, "b", addr, 0);
 
     serial_dev = (unsigned char *)addr + IO_ESCC_OFFSET +
-                 0x20 * CONFIG_SERIAL_PORT;
+                 (CONFIG_SERIAL_PORT ? 0 : 0x20);
 }
 #endif