diff --git a/ChangeLog.csl b/ChangeLog.csl
index eff1a9282..7b2a91b0a 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,7 @@
 2006-03-29  Nathan Sidwell  <nathan@codesourcery.com>
 
+	* libgloss/m68k/bdm-isv.c (software_init_hook): Fix trap numbering.
+
 	* libgloss/m68k/Makefile.in (CF_SCRIPTS): Add m5329 board.
 	Reorder.
 	(*-dbug.ld, *-bdm.ld): Add appropriate IO definition.
diff --git a/libgloss/m68k/bdm-isv.c b/libgloss/m68k/bdm-isv.c
index 2f70e3243..daa481a55 100644
--- a/libgloss/m68k/bdm-isv.c
+++ b/libgloss/m68k/bdm-isv.c
@@ -118,21 +118,21 @@ void  software_init_hook (void)
   __interrupt_vector[14] = &__format_error;
   __interrupt_vector[24] = &__spurious_interrupt;
   __interrupt_vector[32] = &__trap0;
-  __interrupt_vector[32] = &__trap1;
-  __interrupt_vector[32] = &__trap2;
-  __interrupt_vector[32] = &__trap3;
-  __interrupt_vector[32] = &__trap4;
-  __interrupt_vector[32] = &__trap5;
-  __interrupt_vector[32] = &__trap6;
-  __interrupt_vector[32] = &__trap7;
-  __interrupt_vector[32] = &__trap8;
-  __interrupt_vector[32] = &__trap9;
-  __interrupt_vector[32] = &__trap10;
-  __interrupt_vector[32] = &__trap11;
-  __interrupt_vector[32] = &__trap12;
-  __interrupt_vector[32] = &__trap13;
-  __interrupt_vector[32] = &__trap14;
-  __interrupt_vector[32] = &__trap15;
+  __interrupt_vector[33] = &__trap1;
+  __interrupt_vector[34] = &__trap2;
+  __interrupt_vector[35] = &__trap3;
+  __interrupt_vector[36] = &__trap4;
+  __interrupt_vector[37] = &__trap5;
+  __interrupt_vector[38] = &__trap6;
+  __interrupt_vector[39] = &__trap7;
+  __interrupt_vector[40] = &__trap8;
+  __interrupt_vector[41] = &__trap9;
+  __interrupt_vector[42] = &__trap10;
+  __interrupt_vector[43] = &__trap11;
+  __interrupt_vector[44] = &__trap12;
+  __interrupt_vector[45] = &__trap13;
+  __interrupt_vector[46] = &__trap14;
+  __interrupt_vector[47] = &__trap15;
   __interrupt_vector[48] = &__fp_branch_unordered;
   __interrupt_vector[49] = &__fp_inexact_result;
   __interrupt_vector[50] = &__fp_divide_by_zero;