diff --git a/CHANGELOG b/CHANGELOG
index d483e057a2f37ba44cdaf29abbeec96b987ce7cc..01ee7846c34bab8fde40d467e08697a0b34b045c 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 b8a19c51317ad6f71ba76973473a1f3a1730bf62..725b62e373c6bd4fea6061db53d1bd65bdab6ce1 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 317f16d0779d2209e8d4dbdfd2d491b5410aea1d..e6a255f0afdb05bd745c2b394a258923826fd7e2 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