diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index e0c877e0d4..25541fe80e 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-14	Arnout Vandecappelle <arnout@mind.be>
+
+	PR 1557/misc
+	* libchip/i2c/spi-sd-card.c: Fixed low capacity special case.
+
 2010-06-09	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* aclocal/rtems-cpu-subdirs.m4: Remove nios2.
diff --git a/c/src/libchip/i2c/spi-sd-card.c b/c/src/libchip/i2c/spi-sd-card.c
index b1a736d3c7..71d307d5c2 100644
--- a/c/src/libchip/i2c/spi-sd-card.c
+++ b/c/src/libchip/i2c/spi-sd-card.c
@@ -914,6 +914,7 @@ static rtems_status_code sd_card_init( sd_card_driver_entry *e)
 		 */
 		e->block_size_shift = 9;
 		e->block_size = 512;
+		e->block_number *= 2;
 	}
 
 	/* Set read block size */