diff --git a/CHANGELOG b/CHANGELOG
index 25d1a6fb9b05c3b75464ff9bc365f0cb128a84d1..4263dcd374839c5aea1a2f0e5ca0cdf1696f8093 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix the machine-id of the Cogent csb637 board
+  Patch by Anders Larsen, 05 Oct 2005
+
 * Complete support for the KwikByte KB920x boards
   Patch by Anders Larsen, 05 Oct 2005
 
diff --git a/README b/README
index 81197dc2079e97225b61f07a67a527b6590b9bb4..419ae0df459c7f03f646e940d00ef38f987ea836 100644
--- a/README
+++ b/README
@@ -303,13 +303,13 @@ The following options need to be configured:
 		-----------------
 
 		CONFIG_ARMADILLO,	CONFIG_AT91RM9200DK,	CONFIG_CERF250,
-		CONFIG_DNP1110, 	CONFIG_EP7312,		CONFIG_H2_OMAP1610,
-		CONFIG_HHP_CRADLE,	CONFIG_IMPA7,		CONFIG_INNOVATOROMAP1510,
-		CONFIG_INNOVATOROMAP1610, CONFIG_KB9202,	CONFIG_LART,
-		CONFIG_LPD7A400,	CONFIG_LUBBOCK,		CONFIG_OSK_OMAP5912,
-		CONFIG_OMAP2420H4,	CONFIG_SHANNON,		CONFIG_P2_OMAP730,
-		CONFIG_SMDK2400,	CONFIG_SMDK2410,	CONFIG_TRAB,
-		CONFIG_VCMA9
+		CONFIG_CSB637,		CONFIG_DNP1110, 	CONFIG_EP7312,
+		CONFIG_H2_OMAP1610,	CONFIG_HHP_CRADLE,	CONFIG_IMPA7,
+		CONFIG_INNOVATOROMAP1510, CONFIG_INNOVATOROMAP1610, CONFIG_KB9202,
+		CONFIG_LART,		CONFIG_LPD7A400,	CONFIG_LUBBOCK,
+		CONFIG_OSK_OMAP5912,	CONFIG_OMAP2420H4,	CONFIG_SHANNON,
+		CONFIG_P2_OMAP730,	CONFIG_SMDK2400,	CONFIG_SMDK2410,
+		CONFIG_TRAB,		CONFIG_VCMA9
 
 		MicroBlaze based boards:
 		------------------------
diff --git a/board/csb637/csb637.c b/board/csb637/csb637.c
index 2356d23b089b1e1760eb7e3acdb87712ddf02276..6100a53fb7763d00f1df394ee1ea5ddc7394e868 100644
--- a/board/csb637/csb637.c
+++ b/board/csb637/csb637.c
@@ -41,8 +41,8 @@ int board_init (void)
 	/* memory and cpu-speed are setup before relocation */
 	/* so we do _nothing_ here */
 
-	/* arch number of AT91RM9200DK-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_AT91RM9200;
+	/* arch number of CSB637-Board */
+	gd->bd->bi_arch_number = MACH_TYPE_CSB637;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index d2c305dafdd35c42db01726bf25c4a166b8c0db0..071d5b7f36c5646581660f89c1225a30ff2c8fc0 100644
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -34,6 +34,7 @@
 
 #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
 #define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
+#define CONFIG_CSB637		1	/* on a CSB637 board		*/
 #undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define USE_920T_MMU		1
 
@@ -78,7 +79,7 @@
 #define CFG_MALLOC_LEN	(CFG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 
-#define CONFIG_BAUDRATE 38400
+#define CONFIG_BAUDRATE 115200
 
 #define CFG_AT91C_BRGR_DIVISOR	75	/* hardcode so no __divsi3 : AT91C_MASTER_CLOCK / baudrate / 16 */