diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/main.c b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/main.c
index 52da4617..fcd404b2 100644
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/main.c
+++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Boot/main.c
@@ -132,11 +132,11 @@ static void Init(void)
    *   Fcclk <  20 MHz: 1 clock cycle
    */
   MAMCR   = 0x0;
-#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60)
+#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60000)
   MAMTIM  = 4;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40000)  
   MAMTIM  = 3;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20000)  
   MAMTIM  = 2;
 #else
   MAMTIM  = 1;
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c
index 1c4b590a..59f19aa4 100644
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c
+++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_Crossworks/Prog/main.c
@@ -127,11 +127,11 @@ static void Init(void)
    *   Fcclk <  20 MHz: 1 clock cycle
    */
   MAMCR   = 0x0;
-#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60)
+#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60000)
   MAMTIM  = 4;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40000)  
   MAMTIM  = 3;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20000)  
   MAMTIM  = 2;
 #else
   MAMTIM  = 1;
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/main.c b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/main.c
index bd9c8bab..60596f77 100644
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/main.c
+++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Boot/main.c
@@ -132,11 +132,11 @@ static void Init(void)
    *   Fcclk <  20 MHz: 1 clock cycle
    */
   MAMCR   = 0x0;
-#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60)
+#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60000)
   MAMTIM  = 4;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40000)  
   MAMTIM  = 3;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20000)  
   MAMTIM  = 2;
 #else
   MAMTIM  = 1;
diff --git a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/main.c b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/main.c
index 1c4b590a..59f19aa4 100644
--- a/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/main.c
+++ b/Target/Demo/ARM7_LPC2000_Olimex_LPC_L2294_GCC/Prog/main.c
@@ -127,11 +127,11 @@ static void Init(void)
    *   Fcclk <  20 MHz: 1 clock cycle
    */
   MAMCR   = 0x0;
-#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60)
+#if (BOOT_CPU_SYSTEM_SPEED_KHZ >= 60000)
   MAMTIM  = 4;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 40000)  
   MAMTIM  = 3;
-#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20)  
+#elif (BOOT_CPU_SYSTEM_SPEED_KHZ >= 20000)  
   MAMTIM  = 2;
 #else
   MAMTIM  = 1;