diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 2dd3c2a3..34ba3c79 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-26  Kolja Waschk <kawk>
+
+   * src/flash/amd.c: Fix address shift (Jeff Wittrock)
+
 2008-03-15  Jie Zhang  <jie.zhang@analog.com>
 
    * include/jtag.h (jtag_parse_line): Declare.
diff --git a/jtag/src/flash/amd.c b/jtag/src/flash/amd.c
index 814a84ed..49c7d9fc 100644
--- a/jtag/src/flash/amd.c
+++ b/jtag/src/flash/amd.c
@@ -74,7 +74,7 @@ amd_flash_address_shift( cfi_array_t *cfi_array )
 
 	/* else: cfi_array->bus_width is 2 (16 bit) or 1 (8 bit): */
 
-	switch( cfi_array->cfi_chips[0]->cfi.device_geometry.device_size )
+	switch( cfi_array->cfi_chips[0]->cfi.device_geometry.device_interface )
 	{
 		case CFI_INTERFACE_X8_X16:  /* regardless whether 8 or 16 bit mode */
 		case CFI_INTERFACE_X16:     /* native */