diff --git a/CHANGELOG b/CHANGELOG
index 48049dad92821ad07bdccdb0a479c21f89cdef99..25d1a6fb9b05c3b75464ff9bc365f0cb128a84d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Complete support for the KwikByte KB920x boards
+  Patch by Anders Larsen, 05 Oct 2005
+
 * Set the AT91RM9200 clock to asynchronous mode
   Patch by Anders Larsen, 03 May 2005
 
diff --git a/cpu/arm920t/at91rm9200/i2c.c b/cpu/arm920t/at91rm9200/i2c.c
index 569274082f2afbe3e5ef86daefed4abac8b3116a..2565998e484d7ed0f70a1ad2ee7ce762220990dd 100644
--- a/cpu/arm920t/at91rm9200/i2c.c
+++ b/cpu/arm920t/at91rm9200/i2c.c
@@ -65,9 +65,8 @@ at91_xfer(unsigned char chip, unsigned int addr, int alen,
 		| ((rw == 1) ? AT91C_TWI_MREAD : 0);
 
 	/* Set TWI Internal Address Register with first messages data field */
-	/* only one address byte is supported  */
 	if (alen > 0)
-		twi->TWI_IADR = addr & 0xff;
+		twi->TWI_IADR = addr;
 
 	length = len;
 	buf = buffer;
diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index a5302429c646f0866debca7f0bce609d006dc29a..6590f6f5f0dc641efff675fa0ef04efb200bfbe0 100644
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -116,8 +116,8 @@
 #define	CFG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_KB9202
-#define CFG_ENV_OFFSET			0x3000
-#define CFG_ENV_SIZE			0x1000
+#define CFG_ENV_OFFSET			0x3E00
+#define CFG_ENV_SIZE			0x0200
 #else
 #define CFG_ENV_OFFSET			0x1000
 #define CFG_ENV_SIZE			0x1000