diff --git a/CHANGELOG b/CHANGELOG
index d483e057a..01ee7846c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Patch by Steven Scholz, 12 Dec 2004:
+  Fix typo in AT91 memory setup.
+
 * Patch by Martin Krause, 27 Oct 2004:
   - add support for "STK52xx" board (including PS/2 multiplexer)
   - add hardware detection for TQM5200
diff --git a/board/at91rm9200dk/memsetup.S b/board/at91rm9200dk/memsetup.S
index b8a19c513..725b62e37 100644
--- a/board/at91rm9200dk/memsetup.S
+++ b/board/at91rm9200dk/memsetup.S
@@ -66,7 +66,7 @@
 /* sdram */
 #define PIOC_ASR 0xFFFFF870
 #define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-#define PIOC_BSR 0xFFFFF804
+#define PIOC_BSR 0xFFFFF874
 #define PIOC_BSR_VAL 0x00000000
 #define PIOC_PDR 0xFFFFF804
 #define PIOC_PDR_VAL 0xFFFF0000
diff --git a/board/cmc_pu2/memsetup.S b/board/cmc_pu2/memsetup.S
index 317f16d07..e6a255f0a 100644
--- a/board/cmc_pu2/memsetup.S
+++ b/board/cmc_pu2/memsetup.S
@@ -66,7 +66,7 @@
 /* sdram */
 #define PIOC_ASR 0xFFFFF870
 #define PIOC_ASR_VAL 0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-#define PIOC_BSR 0xFFFFF804
+#define PIOC_BSR 0xFFFFF874
 #define PIOC_BSR_VAL 0x00000000
 #define PIOC_PDR 0xFFFFF804
 #define PIOC_PDR_VAL 0xFFFF0000