diff --git a/src/m68040/startup_m68040.s b/src/m68040/startup_m68040.s
index d646b56..6db3999 100644
--- a/src/m68040/startup_m68040.s
+++ b/src/m68040/startup_m68040.s
@@ -295,8 +295,8 @@ _handle_bus_err:
                     lea _panic_pc,a1
                     lea _panic_address,a2
                     move.w #2,(a0)
-                    move.l (10,a7),(a1)
-                    move.l (2,a7),(a2)
+                    move.l (2,a7),(a1)
+                    move.l (8,a7),(a2)
                     bra call_panic
 
 _handle_addr_err:
@@ -304,8 +304,8 @@ _handle_addr_err:
                     lea _panic_pc,a1
                     lea _panic_address,a2
                     move.w #3,(a0)
-                    move.l (10,a7),(a1)
-                    move.l (2,a7),(a2)
+                    move.l (2,a7),(a1)
+                    move.l (8,a7),(a2)
                     bra call_panic
 
 _handle_inst_err:
diff --git a/src/version.h b/src/version.h
index 5c10093..f11f98e 100644
--- a/src/version.h
+++ b/src/version.h
@@ -7,6 +7,6 @@
 
 #define VER_MAJOR 0
 #define VER_MINOR 2
-#define VER_BUILD 5
+#define VER_BUILD 6
 
 #endif