diff --git a/firmware/crt0.S b/firmware/crt0.S
index 4459f2eb15..e903bc9ddf 100644
--- a/firmware/crt0.S
+++ b/firmware/crt0.S
@@ -148,9 +148,9 @@ irq_handler:
     /* Chip select 0 - Flash ROM */
     moveq.l #0x00,%d0      /* CSAR0 - Base = 0x00000000 */
     move.l  %d0,(0x080,%a0)
-    move.l  #0x001f0101,%d0 /* CSMR0 - 2M, All access, write protect */
+    move.l  #0x001f0001,%d0 /* CSMR0 - 2M, All access */
     move.l  %d0,(0x084,%a0)
-    move.l  #0x00000d80,%d0 /* CSCR0 - 3 wait states, 16 bits, no bursts */
+    move.l  #0x00000180,%d0 /* CSCR0 - no wait states, 16 bits, no bursts */
     move.l  %d0,(0x088,%a0)
         
     /* Chip select 1 - LCD controller */
@@ -158,7 +158,7 @@ irq_handler:
     move.l  %d0,(0x08c,%a0)
     moveq.l #0x75,%d0      /* CSMR1 - 64K, Only data access */
     move.l  %d0,(0x090,%a0)
-    move.l  #0x00000180,%d0 /* CSCR1 - 0 wait states, 16 bits, no bursts */
+    move.l  #0x00000180,%d0 /* CSCR1 - no wait states, 16 bits, no bursts */
     move.l  %d0,(0x094,%a0)
         
     /* Chip select 2 - ATA controller */
diff --git a/firmware/system.c b/firmware/system.c
index a1c48347d4..2eddc49a77 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -592,7 +592,7 @@ void set_cpu_frequency(long frequency)
         PLLCR &= ~1;  /* Bypass mode */
         timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
         PLLCR = 0x11856005;
-        CSCR0 = 0x00000980; /* Flash: 2 wait state */
+        CSCR0 = 0x00001180; /* Flash: 4 wait states */
         CSCR1 = 0x00000980; /* LCD: 2 wait states */
         while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked.
                                             This may take up to 10ms! */
@@ -609,7 +609,7 @@ void set_cpu_frequency(long frequency)
         PLLCR &= ~1;  /* Bypass mode */
         timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
         PLLCR = 0x1385e005;
-        CSCR0 = 0x00000180; /* Flash: 0 wait states */
+        CSCR0 = 0x00000580; /* Flash: 1 wait state */
         CSCR1 = 0x00000180; /* LCD: 0 wait states */
         while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked.
                                             This may take up to 10ms! */