diff --git a/CHANGELOG b/CHANGELOG
index 1f74ebae3ce0ad59b85e7d921f4a078a22e00727..1ed2fb77a02eaed4bd261b5fd7eba3f547a040d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix ethernet timeouts on dbau1550 and other au1x00 systems
+  Patch by Leif Lindholm, 29 Dec 2004
+
 * Cleanup: fix broken builds
 
 * Fix PHY address argument passing with mii info command
diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
index b8219bf05b39d62ef570044385652fa2d21918e7..35c07b1461cf30b1e9755ca7a97af97906b7ae4d 100644
--- a/cpu/mips/au1x00_eth.c
+++ b/cpu/mips/au1x00_eth.c
@@ -172,8 +172,8 @@ static int au1x00_init(struct eth_device* dev, bd_t * bd){
 		(volatile mac_fifo_t*)(MAC0_RX_DMA_ADDR+MAC_RX_BUFF0_STATUS);
 	int i;
 
-	next_tx = 0;
-	next_rx = 0;
+	next_tx = TX_GET_DMA_BUFFER(fifo_tx[0].addr);
+	next_rx = RX_GET_DMA_BUFFER(fifo_rx[0].addr);
 
 	/* We have to enable clocks before releasing reset */
 	*macen = MAC_EN_CLOCK_ENABLE;