diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index a34f1251c9..8f70794c79 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -40,7 +40,7 @@
 #define COP_REPLY        (*(volatile unsigned long *)(0x6000100c))
 
 /* Interrupts */
-#define CPU_INT_STAT        (*(volatile unsigned long*)(0x64004000))
+#define CPU_INT_STAT        (*(volatile unsigned long*)(0x60004000))
 #define COP_INT_STAT        (*(volatile unsigned long*)(0x60004004))
 #define CPU_FIQ_STAT        (*(volatile unsigned long*)(0x60004008))
 #define COP_FIQ_STAT        (*(volatile unsigned long*)(0x6000400c))
@@ -60,7 +60,7 @@
 #define COP_INT_CLR         (*(volatile unsigned long*)(0x60004038))
 #define COP_INT_PRIORITY    (*(volatile unsigned long*)(0x6000403c))
 
-#define CPU_HI_INT_STAT     (*(volatile unsigned long*)(0x64004100))
+#define CPU_HI_INT_STAT     (*(volatile unsigned long*)(0x60004100))
 #define COP_HI_INT_STAT     (*(volatile unsigned long*)(0x60004104))
 #define CPU_HI_FIQ_STAT     (*(volatile unsigned long*)(0x60004108))
 #define COP_HI_FIQ_STAT     (*(volatile unsigned long*)(0x6000410c))
diff --git a/firmware/system.c b/firmware/system.c
index 921a7d2314..e4b11e8b79 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -395,13 +395,13 @@ void system_init(void)
         ipod_hw_rev = (*((volatile unsigned long*)(0x01fffffc)));
 
         /* disable all irqs */
-        outl(-1, 0x60001138);
-        outl(-1, 0x60001128);
-        outl(-1, 0x6000111c);
-
-        outl(-1, 0x60001038);
-        outl(-1, 0x60001028);
-        outl(-1, 0x6000101c);
+        COP_HI_INT_CLR      = -1;
+        CPU_HI_INT_CLR      = -1;
+        HI_INT_FORCED_CLR   = -1;
+        
+        COP_INT_CLR         = -1;
+        CPU_INT_CLR         = -1;
+        INT_FORCED_CLR      = -1;
         
 # if NUM_CORES > 1 && defined(HAVE_ADJUSTABLE_CPU_FREQ)
         spinlock_init(&boostctrl_mtx);